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
crypto, internal mcp, ai quant tabs update
tilakpatel22ee4e946e5ac1
diff --git a/README.md b/README.mdindex ea768ec3b..ac9ad73a9 100644--- a/README.md+++ b/README.md@@ -16,11 +16,11 @@[](https://github.com/Fincept-Corporation/FinceptTerminal/releases)[](https://github.com/Fincept-Corporation/FinceptTerminal/issues)-[](https://twitter.com/intent/tweet?text=Check%20out%20FinceptTerminal&url=https%3A//github.com/Fincept-Corporation/FinceptTerminal/) [](https://www.linkedin.com/sharing/share-offsite/?url=https%3A//github.com/Fincept-Corporation/FinceptTerminal/) [](https://www.facebook.com/sharer/sharer.php?u=https%3A//github.com/Fincept-Corporation/FinceptTerminal/) [](https://www.reddit.com/submit?url=https%3A//github.com/Fincept-Corporation/FinceptTerminal/&title=FinceptTerminal) [](https://api.whatsapp.com/send?text=Check%20out%20FinceptTerminal%3A%20https%3A//github.com/Fincept-Corporation/FinceptTerminal/)+[](https://x.com/finceptcorp) [](https://twitter.com/intent/tweet?text=Check%20out%20FinceptTerminal&url=https%3A//github.com/Fincept-Corporation/FinceptTerminal/) [](https://www.linkedin.com/sharing/share-offsite/?url=https%3A//github.com/Fincept-Corporation/FinceptTerminal/) [](https://www.facebook.com/sharer/sharer.php?u=https%3A//github.com/Fincept-Corporation/FinceptTerminal/) [](https://www.reddit.com/r/finceptTerminal/) [](https://api.whatsapp.com/send?text=Check%20out%20FinceptTerminal%3A%20https%3A//github.com/Fincept-Corporation/FinceptTerminal/)### **Your Thinking is the Only Limit. The Data Isn't.**-State-of-the-art financial intelligence platform with CFA-level analytics, AI automation, and unlimited data connectivity.+State-of-the-art financial intelligence platform with institutional-grade financial analytics, AI automation, and unlimited data connectivity.[📥 Download](https://github.com/Fincept-Corporation/FinceptTerminal/releases) · [⚖️ License](https://github.com/Fincept-Corporation/FinceptTerminal/blob/main/docs/COMMERCIAL_LICENSE.md) · [💬 Discussions](https://github.com/Fincept-Corporation/FinceptTerminal/discussions) · [💬 Discord](https://discord.gg/ae87a8ygbN) · [🤝 Partner](https://github.com/Fincept-Corporation/FinceptTerminal/blob/main/docs/COMMERCIAL_LICENSE.md)@@ -49,7 +49,7 @@ State-of-the-art financial intelligence platform with CFA-level analytics, AI au| **Feature** | **Description** ||-------------|-----------------|-| 📊 **CFA-Level Analytics** | DCF models, portfolio optimization, risk metrics (VaR, Sharpe), derivatives pricing via embedded Python |+| 📊 **Multi-Asset Analytics** | DCF models, portfolio optimization, risk metrics (VaR, Sharpe), derivatives pricing across equity, fixed income, derivatives, portfolio, and alternatives via embedded Python || 🤖 **AI Agents** | 37 agents across Trader/Investor (Buffett, Graham, Lynch, Munger, Klarman, Marks…), Economic, and Geopolitics frameworks; local LLM support; multi-provider (OpenAI, Anthropic, Gemini, Groq, DeepSeek, MiniMax, OpenRouter, Ollama) || 🌐 **100+ Data Connectors** | DBnomics, Polygon, Kraken, Yahoo Finance, FRED, IMF, World Bank, AkShare, government APIs, plus optional alternative-data overlays such as Adanos market sentiment for equity research || 📈 **Real-Time Trading** | Crypto (Kraken/HyperLiquid WebSocket), equity, algo trading, paper trading engine, 16 broker integrations (Zerodha, Angel One, Upstox, Fyers, Dhan, Groww, Kotak, IIFL, 5paisa, AliceBlue, Shoonya, Motilal, IBKR, Alpaca, Tradier, Saxo) |@@ -205,7 +205,7 @@ Recent builds also support optional **Adanos Market Sentiment** connectivity in- **Native performance** — C++20 with Qt6, no Electron/web overhead- **Single binary** — no Node.js, no browser runtime, no JavaScript bundler-- **CFA-level analytics** — complete curriculum coverage via Python modules+- **Full buy-side analyst toolkit** — equity, portfolio, derivatives, fixed income, corporate finance, alternatives- **100+ data connectors** — from Yahoo Finance to government databases- **Free & Open Source** (AGPL-3.0) with commercial licenses available@@ -267,7 +267,7 @@ We're thinking long-term — and we hope you are too. That said, please only par- **$799/month** for 20 accounts- Full access to Fincept Data & APIs- Perfect for finance, economics, and data science courses-- CFA curriculum analytics built-in+- Equity, portfolio, derivatives, fixed income, and economics analytics built-in**Interested?** Email **[email protected]** with your institution name.diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.mdindex ce55ab707..c472ada26 100644--- a/docs/CONTRIBUTING.md+++ b/docs/CONTRIBUTING.md@@ -159,7 +159,7 @@ src/```scripts/-├── Analytics/ # CFA-level quant modules — equity, portfolio, derivatives,+├── Analytics/ # Analytics modules — equity, portfolio, derivatives,│ # fixed income, economics, corporate finance├── agents/ # AI agent frameworks (finagent_core, Geopolitics, HedgeFund, …)├── ai_quant_lab/ # ML, factor discovery, HFT, RL trading, vision quantdiff --git a/docs/GETTING_STARTED.md b/docs/GETTING_STARTED.mdindex 8dad57172..06e098c4f 100644--- a/docs/GETTING_STARTED.md+++ b/docs/GETTING_STARTED.md@@ -156,7 +156,7 @@ FinceptTerminal/│ │ └── ...│ ││ ├── scripts/ ← Python analytics scripts-│ │ ├── Analytics/ ← CFA-level analytics modules+│ │ ├── Analytics/ ← Analytics modules│ │ ├── agents/ ← AI agent frameworks│ │ └── *.py ← 100+ data fetchers│ │diff --git a/docs/translations/README.de.md b/docs/translations/README.de.mdindex 87639d248..7efedb11d 100644--- a/docs/translations/README.de.md+++ b/docs/translations/README.de.md@@ -8,7 +8,7 @@### **Ihr Denken ist die einzige Grenze. Die Daten sind es nicht.**-Hochmoderne Financial-Intelligence-Plattform mit Analysen auf CFA-Ebene, KI-Automatisierung und unbegrenzter Datenkonnektivität.+Hochmoderne Financial-Intelligence-Plattform mit Finanzanalysen auf institutionellem Niveau, KI-Automatisierung und unbegrenzter Datenkonnektivität.[📥 Herunterladen](https://github.com/Fincept-Corporation/FinceptTerminal/releases)·[📚 Dokumente](https://github.com/Fincept-Corporation/FinceptTerminal/tree/main/docs)·[💬 Diskussionen](https://github.com/Fincept-Corporation/FinceptTerminal/discussions)·[💬 Zwietracht](https://discord.gg/ae87a8ygbN)·[🤝Partner](https://github.com/Fincept-Corporation/FinceptTerminal/blob/main/docs/COMMERCIAL_LICENSE.md)@@ -28,7 +28,7 @@ Hochmoderne Financial-Intelligence-Plattform mit Analysen auf CFA-Ebene, KI-Auto| **Besonderheit** | **Beschreibung** || ------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |-| 📊**Analysen auf CFA-Ebene** | DCF-Modelle, Portfoliooptimierung, Risikometriken (VaR, Sharpe), Derivatpreisgestaltung über eingebettetes Python |+| 📊**Multi-Asset-Analyse** | DCF-Modelle, Portfoliooptimierung, Risikometriken (VaR, Sharpe), Derivatpreisgestaltung über Aktien, Anleihen, Derivate, Portfolio und Alternativen via eingebettetes Python || 🤖**KI-Agenten** | Über 20 Investorenpersönlichkeiten (Buffett, Dalio, Graham), Hedgefonds-Strategien, lokale LLM-Unterstützung, Multi-Provider (OpenAI, Anthropic, Gemini, Groq, DeepSeek, MiniMax, OpenRouter, Ollama) || 🌐**Über 100 Datenanschlüsse** | DBnomics, Polygon, Kraken, Yahoo Finance, FRED, IWF, Weltbank, AkShare, Regierungs-APIs sowie optionale alternative Daten-Overlays wie Adanos-Marktstimmung für Aktienanalysen || 📈**Echtzeithandel** | Krypto (Kraken/HyperLiquid WebSocket), Aktien, Algo-Handel, Papierhandelsmaschine |@@ -125,7 +125,7 @@ Aktuelle Builds unterstützen auch optional**Adanos-Marktstimmung**Konnektivitä- **Native Leistung**– C++20 mit Qt6, kein Electron/Web-Overhead- **Einzelne Binärdatei**– kein Node.js, keine Browser-Laufzeitumgebung, kein JavaScript-Bundler-- **Analysen auf CFA-Ebene**— Vollständige Lehrplanabdeckung über Python-Module+- **Vollständiges Buy-Side-Analyst-Toolkit**— Aktien, Portfolio, Derivate, Anleihen, Corporate Finance, Alternativen- **Über 100 Datenanschlüsse**– von Yahoo Finance bis hin zu Regierungsdatenbanken- **Kostenlos und Open Source**(AGPL-3.0) mit kommerziellen Lizenzen verfügbar@@ -163,7 +163,7 @@ Wir gestalten die Zukunft der Finanzanalyse – gemeinsam.- **799 $/Monat**für 20 Konten- Voller Zugriff auf Fincept-Daten und APIs- Perfekt für Finanz-, Wirtschafts- und Datenwissenschaftskurse-- Integrierte CFA-Lehrplananalyse+- Integrierte Analytik für Aktien, Portfolio, Derivate, Anleihen und Wirtschaft**Interessiert?**E-Mail**[[email protected]](mailto:[email protected])**mit dem Namen Ihrer Institution.diff --git a/docs/translations/README.es.md b/docs/translations/README.es.mdindex e4cb89144..ba910524d 100644--- a/docs/translations/README.es.md+++ b/docs/translations/README.es.md@@ -8,7 +8,7 @@### **Tu pensamiento es el único límite. Los datos no lo son.**-Plataforma de inteligencia financiera de última generación con análisis de nivel CFA, automatización de IA y conectividad de datos ilimitada.+Plataforma de inteligencia financiera de última generación con análisis financiero de nivel institucional, automatización de IA y conectividad de datos ilimitada.[📥 Descargar](https://github.com/Fincept-Corporation/FinceptTerminal/releases)·[📚 Documentos](https://github.com/Fincept-Corporation/FinceptTerminal/tree/main/docs)·[💬 Discusiones](https://github.com/Fincept-Corporation/FinceptTerminal/discussions)·[💬 Discordia](https://discord.gg/ae87a8ygbN)·[🤝 Socio](https://github.com/Fincept-Corporation/FinceptTerminal/blob/main/docs/COMMERCIAL_LICENSE.md)@@ -28,7 +28,7 @@ Plataforma de inteligencia financiera de última generación con análisis de ni| **Característica** | **Descripción** || ------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |-| 📊**Análisis a nivel CFA** | Modelos DCF, optimización de cartera, métricas de riesgo (VaR, Sharpe), precios de derivados a través de Python integrado |+| 📊**Análisis multiactivo** | Modelos DCF, optimización de cartera, métricas de riesgo (VaR, Sharpe), valoración de derivados en renta variable, renta fija, derivados, cartera y alternativos a través de Python integrado || 🤖**Agentes de IA** | Más de 20 personas de inversores (Buffett, Dalio, Graham), estrategias de fondos de cobertura, soporte de LLM local, múltiples proveedores (OpenAI, Anthropic, Gemini, Groq, DeepSeek, MiniMax, OpenRouter, Ollama) || 🌐**Más de 100 conectores de datos** | DBnomics, Polygon, Kraken, Yahoo Finance, FRED, FMI, Banco Mundial, AkShare, API gubernamentales, además de superposiciones de datos alternativos opcionales, como el sentimiento del mercado de Adanos para la investigación de acciones. || 📈**Comercio en tiempo real** | Cripto (Kraken/HyperLiquid WebSocket), acciones, comercio algorítmico, motor de comercio de papel |@@ -125,7 +125,7 @@ Las versiones recientes también admiten opciones opcionales.**Sentimiento del m- **Rendimiento nativo**— C++20 con Qt6, sin sobrecarga de Electron/web- **binario único**— sin Node.js, sin tiempo de ejecución del navegador, sin paquete de JavaScript-- **Análisis a nivel CFA**— cobertura curricular completa a través de módulos de Python+- **Kit completo de analista buy-side**— renta variable, cartera, derivados, renta fija, finanzas corporativas, alternativos- **Más de 100 conectores de datos**— desde Yahoo Finance hasta las bases de datos gubernamentales- **Gratis y de código abierto**(AGPL-3.0) con licencias comerciales disponibles@@ -163,7 +163,7 @@ Estamos construyendo juntos el futuro del análisis financiero.- **$799/mes**por 20 cuentas- Acceso completo a los datos y API de Fincept- Perfecto para cursos de finanzas, economía y ciencia de datos-- Análisis curricular CFA integrado+- Análisis integrado de renta variable, cartera, derivados, renta fija y economía**¿Interesado?**Correo electrónico**[[email protected]](mailto:[email protected])**con el nombre de su institución.diff --git a/docs/translations/README.fr.md b/docs/translations/README.fr.mdindex f8957dac3..a0027e501 100644--- a/docs/translations/README.fr.md+++ b/docs/translations/README.fr.md@@ -8,7 +8,7 @@### **Votre réflexion est la seule limite. Les données ne le sont pas.**-Plateforme de renseignement financier de pointe avec analyses de niveau CFA, automatisation de l'IA et connectivité de données illimitée.+Plateforme de renseignement financier de pointe avec analyses financières de niveau institutionnel, automatisation de l'IA et connectivité de données illimitée.[📥 Télécharger](https://github.com/Fincept-Corporation/FinceptTerminal/releases)·[📚 Documents](https://github.com/Fincept-Corporation/FinceptTerminal/tree/main/docs)·[💬 Discussions](https://github.com/Fincept-Corporation/FinceptTerminal/discussions)·[💬 Discorde](https://discord.gg/ae87a8ygbN)·[🤝 Partenaire](https://github.com/Fincept-Corporation/FinceptTerminal/blob/main/docs/COMMERCIAL_LICENSE.md)@@ -28,7 +28,7 @@ Plateforme de renseignement financier de pointe avec analyses de niveau CFA, aut| **Fonctionnalité** | **Description** || ---------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |-| 📊**Analyses de niveau CFA** | Modèles DCF, optimisation de portefeuille, mesures de risque (VaR, Sharpe), tarification des produits dérivés via Python intégré |+| 📊**Analyses multi-actifs** | Modèles DCF, optimisation de portefeuille, mesures de risque (VaR, Sharpe), tarification des produits dérivés sur actions, taux, dérivés, portefeuille et alternatifs via Python intégré || 🤖**AI Agents** | Plus de 20 personnalités d'investisseurs (Buffett, Dalio, Graham), stratégies de hedge funds, support LLM local, multi-fournisseurs (OpenAI, Anthropic, Gemini, Groq, DeepSeek, MiniMax, OpenRouter, Ollama) || 🌐**Plus de 100 connecteurs de données** | DBnomics, Polygon, Kraken, Yahoo Finance, FRED, FMI, Banque mondiale, AkShare, API gouvernementales, ainsi que des superpositions de données alternatives facultatives telles que le sentiment du marché Adanos pour la recherche sur les actions. || 📈**Trading en temps réel** | Crypto (Kraken/HyperLiquid WebSocket), actions, trading algo, moteur de trading papier |@@ -190,7 +190,7 @@ Les versions récentes prennent également en charge les options facultatives**A- **Performances natives**— C++20 avec Qt6, pas de surcharge Electron/Web- **Binaire simple**- pas de Node.js, pas d'exécution de navigateur, pas de bundle JavaScript-- **Analyses de niveau CFA**— couverture complète du programme via les modules Python+- **Boîte à outils complète d'analyste buy-side**— actions, portefeuille, dérivés, taux, finance d'entreprise, alternatifs- **Plus de 100 connecteurs de données**— de Yahoo Finance aux bases de données gouvernementales- **Gratuit et open source**(AGPL-3.0) avec licences commerciales disponibles@@ -228,7 +228,7 @@ Nous construisons l’avenir de l’analyse financière – ensemble.- **799 $/mois**pour 20 comptes- Accès complet aux données et API Fincept- Parfait pour les cours de finance, d'économie et de science des données-- Analyse du programme CFA intégrée+- Analyses intégrées actions, portefeuille, dérivés, taux et économie**Intéressé?**E-mail**[[email protected]](mailto:[email protected])**avec le nom de votre établissement.diff --git a/docs/translations/README.ja.md b/docs/translations/README.ja.mdindex 8db4daf97..ea7d00efe 100644--- a/docs/translations/README.ja.md+++ b/docs/translations/README.ja.md@@ -8,7 +8,7 @@### **あなたの思考だけが限界です。データはそうではありません。**-CFA レベルの分析、AI 自動化、無制限のデータ接続を備えた最先端の金融インテリジェンス プラットフォーム。+機関投資家グレードの財務分析、AI 自動化、無制限のデータ接続を備えた最先端の金融インテリジェンス プラットフォーム。[📥 ダウンロード](https://github.com/Fincept-Corporation/FinceptTerminal/releases)·[📚 ドキュメント](https://github.com/Fincept-Corporation/FinceptTerminal/tree/main/docs)·[💬 ディスカッション](https://github.com/Fincept-Corporation/FinceptTerminal/discussions)·[💬不協和音](https://discord.gg/ae87a8ygbN)·[🤝パートナー](https://github.com/Fincept-Corporation/FinceptTerminal/blob/main/docs/COMMERCIAL_LICENSE.md)@@ -28,7 +28,7 @@ CFA レベルの分析、AI 自動化、無制限のデータ接続を備えた| **特徴** | **説明** || ------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |-| 📊**CFAレベルの分析** | DCF モデル、ポートフォリオの最適化、リスク指標 (VaR、Sharpe)、組み込み Python によるデリバティブ価格設定 |+| 📊**マルチアセット分析** | DCF モデル、ポートフォリオの最適化、リスク指標 (VaR、Sharpe)、株式・債券・デリバティブ・ポートフォリオ・オルタナティブ全般のデリバティブ価格設定を組み込み Python により提供 || 🤖**AIエージェント** | 20 人以上の投資家ペルソナ (バフェット、ダリオ、グラハム)、ヘッジファンド戦略、ローカル LLM サポート、マルチプロバイダー (OpenAI、Anthropic、Gemini、Groq、DeepSeek、MiniMax、OpenRouter、Ollama) || 🌐**100以上のデータコネクタ** | DBnomics、Polygon、Kraken、Yahoo Finance、FRED、IMF、世界銀行、AkShare、政府 API、さらに株式調査のための Adanos 市場センチメントなどのオプションの代替データ オーバーレイ || 📈**リアルタイム取引** | 暗号 (Kraken/HyperLiquid WebSocket)、株式、アルゴ取引、ペーパー取引エンジン |@@ -176,7 +176,7 @@ cmake --build build --config Release --parallel- **ネイティブパフォーマンス**— Qt6 を使用した C++20、Electron/Web オーバーヘッドなし- **単一バイナリ**— Node.js、ブラウザ ランタイム、JavaScript バンドラーなし-- **CFAレベルの分析**— Python モジュールを介してカリキュラムを完全にカバー+- **完全なバイサイド アナリスト ツールキット**— 株式、ポートフォリオ、デリバティブ、債券、コーポレート ファイナンス、オルタナティブ- **100以上のデータコネクタ**— Yahoo Financeから政府データベースまで- **無料&オープンソース**(AGPL-3.0) 商用ライセンスも利用可能@@ -214,7 +214,7 @@ cmake --build build --config Release --parallel- **$799/月**20アカウントの場合- Fincept データと API へのフルアクセス- 金融、経済、データ サイエンスのコースに最適-- CFA カリキュラム分析の組み込み+- 株式・ポートフォリオ・デリバティブ・債券・経済学の分析を標準搭載**興味がある?**電子メール**[[email protected]](mailto:[email protected])**あなたの機関名を付けてください。diff --git a/docs/translations/README.ko.md b/docs/translations/README.ko.mdindex 51e55e68c..e8742320f 100644--- a/docs/translations/README.ko.md+++ b/docs/translations/README.ko.md@@ -8,7 +8,7 @@### **당신의 생각이 유일한 한계입니다. 데이터는 그렇지 않습니다.**-CFA 수준 분석, AI 자동화 및 무제한 데이터 연결을 갖춘 최첨단 금융 인텔리전스 플랫폼입니다.+기관급 금융 분석, AI 자동화 및 무제한 데이터 연결을 갖춘 최첨단 금융 인텔리전스 플랫폼입니다.[📥 다운로드](https://github.com/Fincept-Corporation/FinceptTerminal/releases)·[📚 문서](https://github.com/Fincept-Corporation/FinceptTerminal/tree/main/docs)·[💬 토론](https://github.com/Fincept-Corporation/FinceptTerminal/discussions)·[💬 불화](https://discord.gg/ae87a8ygbN)·[🤝 파트너](https://github.com/Fincept-Corporation/FinceptTerminal/blob/main/docs/COMMERCIAL_LICENSE.md)@@ -28,7 +28,7 @@ CFA 수준 분석, AI 자동화 및 무제한 데이터 연결을 갖춘 최첨| **특징** | **설명** || ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |-| 📊**CFA 수준 분석** | DCF 모델, 포트폴리오 최적화, 위험 지표(VaR, Sharpe), 내장된 Python을 통한 파생 상품 가격 책정 |+| 📊**멀티 자산 분석** | DCF 모델, 포트폴리오 최적화, 위험 지표(VaR, Sharpe), 주식·채권·파생상품·포트폴리오·대체투자 전반의 파생 상품 가격을 내장된 Python을 통해 제공 || 🤖**AI 에이전트** | 20명 이상의 투자자 페르소나(Buffett, Dalio, Graham), 헤지 펀드 전략, 현지 LLM 지원, 다중 제공자(OpenAI, Anthropic, Gemini, Groq, DeepSeek, MiniMax, OpenRouter, Ollama) || 🌐**100개 이상의 데이터 커넥터** | DBnomics, Polygon, Kraken, Yahoo Finance, FRED, IMF, World Bank, AkShare, 정부 API 및 주식 조사를 위한 Adanos 시장 심리와 같은 선택적 대체 데이터 오버레이 || 📈**실시간 거래** | 암호화폐(Kraken/HyperLiquid WebSocket), 주식, 알고 트레이딩, 종이 트레이딩 엔진 |@@ -176,7 +176,7 @@ cmake --build build --config Release --parallel- **기본 성능**— Qt6이 포함된 C++20, 전자/웹 오버헤드 없음- **단일 바이너리**— Node.js 없음, 브라우저 런타임 없음, JavaScript 번들러 없음-- **CFA 수준 분석**— Python 모듈을 통한 완전한 커리큘럼 적용+- **완전한 바이사이드 애널리스트 툴킷**— 주식, 포트폴리오, 파생상품, 채권, 기업금융, 대체투자- **100개 이상의 데이터 커넥터**— Yahoo Finance에서 정부 데이터베이스까지- **무료 및 오픈 소스**(AGPL-3.0) 상용 라이센스 사용 가능@@ -214,7 +214,7 @@ cmake --build build --config Release --parallel- **$799/월**20개 계정용- Fincept 데이터 및 API에 대한 전체 액세스- 금융, 경제, 데이터 과학 과정에 적합-- CFA 커리큘럼 분석 내장+- 주식·포트폴리오·파생상품·채권·경제학 분석 내장**관심 있는?**이메일**[[email protected]](mailto:[email protected])**귀하의 기관 이름으로.diff --git a/docs/translations/README.zh-CN.md b/docs/translations/README.zh-CN.mdindex 73d83d212..d25075681 100644--- a/docs/translations/README.zh-CN.md+++ b/docs/translations/README.zh-CN.md@@ -8,7 +8,7 @@### **你的思维是唯一的限制。数据不是。**-最先进的金融情报平台,具有 CFA 级分析、人工智能自动化和无限数据连接。+最先进的金融情报平台,具有机构级金融分析、人工智能自动化和无限数据连接。[📥 下载](https://github.com/Fincept-Corporation/FinceptTerminal/releases)·[📚 文档](https://github.com/Fincept-Corporation/FinceptTerminal/tree/main/docs)·[💬 讨论](https://github.com/Fincept-Corporation/FinceptTerminal/discussions)·[💬 不和谐](https://discord.gg/ae87a8ygbN)·[🤝 合作伙伴](https://github.com/Fincept-Corporation/FinceptTerminal/blob/main/docs/COMMERCIAL_LICENSE.md)@@ -28,7 +28,7 @@| **特征** | **描述** || ----------------- | -------------------------------------------------------------------------------------------------------------- |-| 📊**CFA 级别分析** | DCF 模型、投资组合优化、风险指标(VaR、夏普)、通过嵌入式 Python 进行衍生品定价 |+| 📊**多资产分析** | DCF 模型、投资组合优化、风险指标(VaR、夏普)、跨股票、固定收益、衍生品、投资组合及另类投资的衍生品定价,通过嵌入式 Python 实现 || 🤖**人工智能代理** | 20 多个投资者角色(巴菲特、戴利奥、格雷厄姆)、对冲基金策略、本地法学硕士支持、多提供商(OpenAI、Anthropic、Gemini、Groq、DeepSeek、MiniMax、OpenRouter、Ollama) || 🌐**100 多个数据连接器** | DBnomics、Polygon、Kraken、雅虎财经、FRED、IMF、世界银行、AkShare、政府 API,以及可选的替代数据叠加,例如用于股票研究的 Adanos 市场情绪 || 📈**实时交易** | 加密货币(Kraken/HyperLiquid WebSocket)、股权、算法交易、纸质交易引擎 |@@ -190,7 +190,7 @@ cmake --build build --config Release --parallel- **原生性能**— 使用 Qt6 的 C++20,无 Electron/web 开销- **单一二进制**— 没有 Node.js,没有浏览器运行时,没有 JavaScript 捆绑器-- **CFA级别分析**— 通过 Python 模块完成完整的课程覆盖+- **完整的买方分析师工具包**— 股票、投资组合、衍生品、固定收益、企业金融、另类投资- **100 多个数据连接器**— 从雅虎财经到政府数据库- **免费和开源**(AGPL-3.0) 提供商业许可证@@ -228,7 +228,7 @@ cmake --build build --config Release --parallel- **$799/月**20 个帐户- 完全访问 Fincept 数据和 API- 非常适合金融、经济学和数据科学课程-- 内置 CFA 课程分析+- 内置股票、投资组合、衍生品、固定收益和经济学分析**感兴趣的?**电子邮件**[[email protected]](mailto:[email protected])**与您的机构名称。diff --git a/fincept-qt/CMakeLists.txt b/fincept-qt/CMakeLists.txtindex c771a86b5..6ef425886 100644--- a/fincept-qt/CMakeLists.txt+++ b/fincept-qt/CMakeLists.txt@@ -580,11 +580,26 @@ set(CMAKE_SKIP_INSTALL_RULES FALSE CACHE BOOL "" FORCE)# Coreset(CORE_SOURCES+ src/core/actions/ActionRegistry.cpp+ src/core/actions/builtin_actions.cppsrc/core/config/AppConfig.cppsrc/core/config/AppPaths.cppsrc/core/config/ProfileManager.cppsrc/core/logging/Logger.cppsrc/core/events/EventBus.cpp+ src/core/layout/LayoutTypes.cpp+ src/core/layout/LayoutCatalog.cpp+ src/core/layout/WorkspaceMatcher.cpp+ src/core/layout/WorkspaceShell.cpp+ src/core/panel/PanelHandle.cpp+ src/core/panel/PanelMaterialiser.cpp+ src/core/panel/PanelRegistry.cpp+ src/core/profile/ProfilePaths.cpp+ src/core/screen/MonitorTopology.cpp+ src/core/screen/MonitorWatcher.cpp+ src/core/telemetry/TelemetryProvider.cpp+ src/core/telemetry/LocalTelemetrySink.cpp+ src/core/debug/StressLoad.cppsrc/core/session/SessionManager.cppsrc/core/session/ScreenStateManager.cppsrc/core/keys/KeyConfigManager.cpp@@ -597,6 +612,7 @@ set(CORE_SOURCESsrc/core/components/ComponentCatalog.cppsrc/core/components/PopularityTracker.cppsrc/core/crash/CrashHandler.cpp+ src/core/window/WindowRegistry.cpp)# Network@@ -623,6 +639,7 @@ set(AUTH_SOURCESsrc/auth/PinManager.cppsrc/auth/InactivityGuard.cppsrc/auth/SecurityAuditLog.cpp+ src/auth/lock/LockOverlayController.cpp)# Storage@@ -631,6 +648,11 @@ set(STORAGE_SOURCESsrc/storage/sqlite/Database.cppsrc/storage/sqlite/CacheDatabase.cpp+ # Workspace persistence (Phase 2 — multi-window refactor)+ src/storage/workspace/WorkspaceDb.cpp+ src/storage/workspace/WorkspaceSnapshotRing.cpp+ src/storage/workspace/CrashRecovery.cpp+# Migration systemsrc/storage/sqlite/migrations/MigrationRunner.cppsrc/storage/sqlite/migrations/v001_initial.cpp@@ -650,6 +672,11 @@ set(STORAGE_SOURCES# Secure storage (unchanged)src/storage/secure/SecureStorage.cpp+ # Workspace persistence (multi-window refactor Phase 2/4/10)+ src/storage/workspace/WorkspaceDb.cpp+ src/storage/workspace/WorkspaceSnapshotRing.cpp+ src/storage/workspace/CrashRecovery.cpp+# Repositoriessrc/storage/repositories/SettingsRepository.cppsrc/storage/repositories/WatchlistRepository.cpp@@ -716,8 +743,10 @@ set(PYTHON_SOURCESset(AI_CHAT_SOURCESsrc/ai_chat/LlmService.cppsrc/ai_chat/ModelCatalog.cpp+ src/ai_chat/ChatBubbleFactory.cppsrc/ai_chat/AiChatScreen.cppsrc/ai_chat/AiChatBubble.cpp+ src/ai_chat/ChatBubbleController.cpp)# MCP — Model Context Protocol system@@ -729,7 +758,7 @@ set(MCP_SOURCESsrc/mcp/McpManager.cppsrc/mcp/McpInit.cppsrc/mcp/SchemaValidator.cpp- src/mcp/ToolFilterPolicy.cpp+ src/mcp/ToolRetriever.cpp# Phase 5 — provider-neutral tool-call dispatcher + adapters.src/mcp/dispatch/ToolDispatcher.cpp@@ -774,6 +803,10 @@ set(TRADING_SOURCESsrc/trading/ExchangeSession.cppsrc/trading/ExchangeSessionManager.cppsrc/trading/ExchangeDaemonPool.cpp+ # Native Kraken WebSocket v2 client+ src/trading/exchanges/kraken/KrakenSymbolMapper.cpp+ src/trading/exchanges/kraken/KrakenBook.cpp+ src/trading/exchanges/kraken/KrakenWsClient.cppsrc/trading/brokers/BrokerHttp.cpp# Trading WebSocketsrc/trading/websocket/ZerodhaWebSocket.cpp@@ -830,6 +863,7 @@ set(SERVICE_SOURCESsrc/services/ma_analytics/MAAnalyticsService.cppsrc/services/geopolitics/GeopoliticsService.cppsrc/services/maritime/MaritimeService.cpp+ src/services/maritime/PortsCatalog.cppsrc/services/ai_quant_lab/AIQuantLabService.cppsrc/services/backtesting/BacktestingService.cppsrc/services/algo_trading/AlgoTradingService.cpp@@ -859,6 +893,14 @@ set(SERVICE_SOURCESsrc/services/wallet/WalletActivityProducer.cpp# Billing (Phase 2 Stage 2C — fee discount eligibility)src/services/billing/FeeDiscountService.cpp+ # Wallet (Phase 5 — buyback & burn dashboard producers)+ src/services/wallet/BuybackBurnService.cpp+ src/services/wallet/TreasuryService.cpp+ # Wallet (Phase 3 — STAKE / veFNCPT / real-yield)+ src/services/wallet/StakingService.cpp+ src/services/wallet/RealYieldService.cpp+ # Billing (Phase 3 — tier service driving cross-screen gating)+ src/services/billing/TierService.cppsrc/services/sectors/SectorResolver.cppsrc/services/workflow/NodeRegistry.cppsrc/services/workflow/WorkflowService.cpp@@ -903,6 +945,9 @@ set(SERVICE_SOURCESsrc/services/prediction/kalshi/KalshiRestClient.cppsrc/services/prediction/kalshi/KalshiWsClient.cppsrc/services/prediction/kalshi/KalshiAdapter.cpp+ # Phase 4 — Fincept Internal prediction-market adapter (demo mode until+ # `fincept.markets_endpoint` is configured and `fincept_market` lands).+ src/services/prediction/fincept_internal/FinceptInternalAdapter.cpp# Speech-to-text service (Python speech_recognition + Google API)src/services/stt/SpeechService.cpp@@ -962,6 +1007,13 @@ set(UI_SOURCESsrc/ui/navigation/CommandBar.cppsrc/ui/navigation/DockToolBar.cppsrc/ui/navigation/DockStatusBar.cpp+ src/ui/debug/DebugOverlay.cpp+ src/ui/command/CommandParser.cpp+ src/ui/command/SuggestionIndex.cpp+ src/ui/command/QuickCommandBar.cpp+ src/ui/command/CommandPalette.cpp+ src/ui/notifications/NotificationService.cpp+ src/ui/error/ErrorPipeline.cppsrc/ui/workspace/WorkspaceNewDialog.cppsrc/ui/workspace/WorkspaceOpenDialog.cpp@@ -1000,6 +1052,8 @@ set(SCREEN_SOURCESsrc/screens/chat_mode/ChatModeScreen.cppsrc/screens/chat_mode/TerminalToolBridge.cppsrc/screens/setup/SetupScreen.cpp+ src/screens/launchpad/LaunchpadScreen.cpp+ src/screens/recovery/CrashRecoveryDialog.cppsrc/screens/info/ContactScreen.cppsrc/screens/info/TermsScreen.cppsrc/screens/info/PrivacyScreen.cpp@@ -1056,6 +1110,9 @@ set(SCREEN_SOURCESsrc/screens/dashboard/widgets/RecentFilesWidget.cppsrc/screens/dashboard/widgets/VideoPlayerWidget.cppsrc/screens/dashboard/widgets/WebScraperWidget.cpp+ src/screens/dashboard/widgets/GeopoliticsEventsWidget.cpp+ src/screens/dashboard/widgets/MaritimeVesselsWidget.cpp+ src/screens/dashboard/widgets/NotesWidget.cppsrc/screens/report_builder/ReportBuilderScreen.cppsrc/screens/report_builder/ComponentToolbar.cppsrc/screens/report_builder/DocumentCanvas.cpp@@ -1160,6 +1217,17 @@ set(SCREEN_SOURCES# AI Quant Labsrc/screens/ai_quant_lab/AIQuantLabScreen.cppsrc/screens/ai_quant_lab/QuantModulePanel.cpp+ src/screens/ai_quant_lab/QuantModulePanel_GS.cpp+ src/screens/ai_quant_lab/QuantModulePanel_Functime.cpp+ src/screens/ai_quant_lab/QuantModulePanel_Statsmodels.cpp+ src/screens/ai_quant_lab/QuantModulePanel_Fortitudo.cpp+ src/screens/ai_quant_lab/QuantModulePanel_Gluonts.cpp+ src/screens/ai_quant_lab/QuantModulePanel_CFA.cpp+ src/screens/ai_quant_lab/QuantModulePanel_Backtesting.cpp+ src/screens/ai_quant_lab/QuantModulePanel_RL.cpp+ src/screens/ai_quant_lab/QuantModulePanel_DeepAgent.cpp+ src/screens/ai_quant_lab/QuantModulePanel_QuantReporting.cpp+ src/screens/ai_quant_lab/QuantModulePanel_Misc.cpp# Backtestingsrc/screens/backtesting/BacktestingScreen.cpp@@ -1314,14 +1382,27 @@ set(SCREEN_SOURCESsrc/screens/crypto_center/panels/SwapPanel.cppsrc/screens/crypto_center/panels/HoldingsTable.cppsrc/screens/crypto_center/panels/FeeDiscountPanel.cpp+ # Crypto Center — Phase 5 (buyback & burn dashboard)+ src/screens/crypto_center/tabs/RoadmapTab.cpp+ src/screens/crypto_center/panels/BuybackBurnPanel.cpp+ src/screens/crypto_center/panels/SupplyChartPanel.cpp+ src/screens/crypto_center/panels/TreasuryPanel.cpp+ src/screens/crypto_center/tabs/StakeTab.cpp+ src/screens/crypto_center/panels/ActiveLocksPanel.cpp+ src/screens/crypto_center/panels/LockPanel.cpp+ src/screens/crypto_center/panels/TierPanel.cpp+ # Crypto Center — Phase 4 (MARKETS tab — internal prediction markets)+ src/screens/crypto_center/tabs/MarketsTab.cpp+ src/screens/crypto_center/panels/MarketsListPanel.cpp)# Appset(APP_SOURCESsrc/app/main.cpp- src/app/MainWindow.cpp+ src/app/WindowFrame.cppsrc/app/ScreenRouter.cppsrc/app/DockScreenRouter.cpp+ src/app/TerminalShell.cpp)# All screen files compiled individually — they have local statics/functions that@@ -1341,6 +1422,17 @@ set_source_files_properties(src/screens/agent_config/WorkflowsViewPanel.cppsrc/screens/ai_quant_lab/AIQuantLabScreen.cppsrc/screens/ai_quant_lab/QuantModulePanel.cpp+ src/screens/ai_quant_lab/QuantModulePanel_GS.cpp+ src/screens/ai_quant_lab/QuantModulePanel_Functime.cpp+ src/screens/ai_quant_lab/QuantModulePanel_Statsmodels.cpp+ src/screens/ai_quant_lab/QuantModulePanel_Fortitudo.cpp+ src/screens/ai_quant_lab/QuantModulePanel_Gluonts.cpp+ src/screens/ai_quant_lab/QuantModulePanel_CFA.cpp+ src/screens/ai_quant_lab/QuantModulePanel_Backtesting.cpp+ src/screens/ai_quant_lab/QuantModulePanel_RL.cpp+ src/screens/ai_quant_lab/QuantModulePanel_DeepAgent.cpp+ src/screens/ai_quant_lab/QuantModulePanel_QuantReporting.cpp+ src/screens/ai_quant_lab/QuantModulePanel_Misc.cppsrc/screens/akshare/AkShareScreen.cppsrc/screens/algo_trading/AlgoTradingScreen.cppsrc/screens/algo_trading/DeploymentDashboard.cpp@@ -1430,6 +1522,9 @@ set_source_files_properties(src/screens/dashboard/widgets/VideoPlayerWidget.cppsrc/screens/dashboard/widgets/WatchlistWidget.cppsrc/screens/dashboard/widgets/WebScraperWidget.cpp+ src/screens/dashboard/widgets/GeopoliticsEventsWidget.cpp+ src/screens/dashboard/widgets/MaritimeVesselsWidget.cpp+ src/screens/dashboard/widgets/NotesWidget.cppsrc/screens/data_mapping/DataMappingScreen.cppsrc/screens/crypto_center/CryptoCenterScreen.cppsrc/screens/crypto_center/HoldingsBar.cpp@@ -1442,6 +1537,16 @@ set_source_files_properties(src/screens/crypto_center/panels/SwapPanel.cppsrc/screens/crypto_center/panels/HoldingsTable.cppsrc/screens/crypto_center/panels/FeeDiscountPanel.cpp+ src/screens/crypto_center/tabs/RoadmapTab.cpp+ src/screens/crypto_center/panels/BuybackBurnPanel.cpp+ src/screens/crypto_center/panels/SupplyChartPanel.cpp+ src/screens/crypto_center/panels/TreasuryPanel.cpp+ src/screens/crypto_center/tabs/StakeTab.cpp+ src/screens/crypto_center/panels/ActiveLocksPanel.cpp+ src/screens/crypto_center/panels/LockPanel.cpp+ src/screens/crypto_center/panels/TierPanel.cpp+ src/screens/crypto_center/tabs/MarketsTab.cpp+ src/screens/crypto_center/panels/MarketsListPanel.cppsrc/screens/dbnomics/DBnomicsChartWidget.cppsrc/screens/dbnomics/DBnomicsDataTable.cppsrc/screens/dbnomics/DBnomicsScreen.cpp@@ -1553,6 +1658,8 @@ set_source_files_properties(src/screens/settings/McpServersSection.cppsrc/screens/settings/SettingsScreen.cppsrc/screens/setup/SetupScreen.cpp+ src/screens/launchpad/LaunchpadScreen.cpp+ src/screens/recovery/CrashRecoveryDialog.cppsrc/screens/support/SupportScreen.cppsrc/screens/surface_analytics/Surface3DWidget.cppsrc/screens/surface_analytics/SurfaceAnalyticsScreen.cpp@@ -1646,8 +1753,9 @@ set_source_files_properties(# ADS files use anonymous namespaces and heavy Qt meta-object includes —# exclude from unity to avoid ODR / symbol clashes in large batchesset_source_files_properties(- src/app/MainWindow.cpp+ src/app/WindowFrame.cppsrc/app/DockScreenRouter.cpp+ src/app/TerminalShell.cppPROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)@@ -1660,7 +1768,7 @@ set_source_files_properties(src/mcp/McpManager.cppsrc/mcp/McpInit.cppsrc/mcp/SchemaValidator.cpp- src/mcp/ToolFilterPolicy.cpp+ src/mcp/ToolRetriever.cppsrc/mcp/dispatch/ToolDispatcher.cppsrc/mcp/dispatch/OpenAiAdapter.cppsrc/mcp/dispatch/AdapterFactory.cpp@@ -2513,7 +2621,7 @@ if(FINCEPT_BUILD_INSTALLER)cpack_add_component(scriptsDISPLAY_NAME "Python Analytics Scripts"- DESCRIPTION "1300+ CFA-level Python analytics scripts (equity, derivatives, portfolio, quant)"+ DESCRIPTION "1300+ Python analytics scripts (equity, derivatives, portfolio, quant)"DEPENDS core)# ── CPackIFW component configuration ─────────────────────────────────────diff --git a/fincept-qt/docs/DATAHUB_TOPICS.md b/fincept-qt/docs/DATAHUB_TOPICS.mdindex 55ebe6f66..10b350647 100644--- a/fincept-qt/docs/DATAHUB_TOPICS.md+++ b/fincept-qt/docs/DATAHUB_TOPICS.md@@ -162,6 +162,40 @@ The Crypto Center owns a small set of topics for the user's connected Solana wal> **Burn deferred to Phase 5.** Phase 2 ships BUY and SELL only. Real burns (with on-chain receipt) move into Phase 5 alongside the buyback-worker design. No `wallet:burn_receipt:*` topic in Phase 2.+### Buyback & burn dashboard (Phase 5)++Terminal-wide topics — same numbers shown to every user, no `<pubkey>` segment. Driven by the Fincept-operated buyback worker (`services/buyback-worker/`) which tallies revenue, executes Jupiter buys, and burns the bought $FNCPT via SPL Token `burn_checked` from the treasury account, then publishes per-epoch summaries to a Fincept HTTP endpoint configured via SecureStorage `fincept.treasury_endpoint`. Until the endpoint is configured, the producers ship a built-in mock payload (each POD carries `is_mock=true`); the dashboard reads "DEMO" in the head pill.++| Pattern | Producer | TTL | Min interval | Notes |+|---|---|---|---|---|+| `treasury:buyback_epoch` | `BuybackBurnService` | 60 s | 30 s | Current epoch summary. Shape: `BuybackEpoch{epoch_no, start/end_ts_ms, revenue_total/subs/predmkt/misc_usd, buyback_usd, staker_yield_usd, treasury_topup_usd, fncpt_bought/burned_raw, fncpt_decimals, avg_buy_price_usd, burn_signature, is_mock}`. The three USD splits (`buyback`, `staker_yield`, `treasury_topup`) implement the plan §5.4 50/25/25 distribution; the worker chooses the actual percentages per epoch. `burn_signature` is base58 — `BuybackBurnPanel` opens it on Solscan. |+| `treasury:burn_total` | `BuybackBurnService` | 5 min | 60 s | All-time totals. Shape: `BurnTotal{total_burned_raw, supply_remaining_raw, decimals, spent_on_buyback_usd, is_mock}`. |+| `treasury:supply_history` | `BuybackBurnService` | 1 h | 5 min | 12-month time-series for the supply chart. Shape: `QVector<SupplyHistoryPoint{ts_ms, total_raw, circulating_raw, burned_raw, decimals}>`. Producer publishes the whole vector on every refresh; subscribers (`SupplyChartPanel`) replace the series wholesale. |+| `treasury:reserves` | `TreasuryService` | 5 min | 60 s | Current SOL + USDC holdings of the treasury multisig. Source: `SolanaRpcClient::get_sol_balance` + `get_token_balance(USDC mint)` against the pubkey in SecureStorage `fincept.treasury_pubkey`. SOL→USD price is peeked from `market:price:token:<wSOL>` so we don't double-fetch. Shape: `TreasuryReserves{pubkey_b58, sol_lamports, usdc_amount, sol_usd_price, total_usd, multisig_label, multisig_url, is_mock}`. |+| `treasury:runway` | `TreasuryService` | 5 min | 60 s | Months of runway at current burn. Computed as `total_usd / monthly_opex_usd`; opex from SecureStorage `fincept.treasury_monthly_opex_usd` (default $100k). Shape: `TreasuryRunway{total_usd, monthly_opex_usd, months, is_mock}`. Re-derived in lock-step with `treasury:reserves`. |++### STAKE / veFNCPT / tier system (Phase 3)++veFNCPT lock surface for the STAKE tab. All four producers ship in **mock mode** until `fincept.lock_program_id` (Anchor program) and `fincept.yield_endpoint` are configured in SecureStorage. Each payload carries `is_mock=true` so panels can surface the state explicitly.++| Pattern | Producer | TTL | Min interval | Notes |+|---|---|---|---|---|+| `wallet:locks:<pubkey>` | `StakingService` | 60 s | 30 s | Vector of `LockPosition{position_id, amount_raw, decimals, lock_start_ts, unlock_ts, duration_secs, weight_raw, lifetime_yield_usdc, is_mock}`. Real path: `getProgramAccounts` against `fincept.lock_program_id`, filter by owner. Mock path: 3 demo positions (2,000 @ 4yr / 1,000 @ 1yr / 500 @ 6mo) per plan §3.2. |+| `wallet:vefncpt:<pubkey>` | `StakingService` | 60 s | 30 s | Aggregate weight + projected next-period yield. Shape: `VeFncptAggregate{pubkey_b58, total_weight_raw, decimals, position_count, projected_next_period_yield_usdc, is_mock}`. Computed by summing `LockPosition.weight_raw` and applying §3.4 25 %-of-revenue staker-share. |+| `wallet:yield:<pubkey>` | `RealYieldService` | 5 min | 60 s | Realised USDC yield. Shape: `YieldSnapshot{pubkey_b58, lifetime_usdc, last_period_usdc, last_period_end_ts, is_mock}`. Real path: `<endpoint>/yield/<pubkey>`. Mock path derives numbers from `treasury:revenue × 25 % / weight share` so demo numbers stay internally consistent with the buyback dashboard. |+| `treasury:revenue` | `RealYieldService` | 1 h | 5 min | Terminal-wide weekly revenue bucket. Shape: `TreasuryRevenue{period_start_ts, period_end_ts, total_usd, is_mock}`. Used by `LockPanel` for "EST. YIELD" before lock-creation; also feeds the Phase 5 dashboard's revenue breakdown. Bucketed weekly to match the buyback worker's epoch cadence. |+| `billing:tier:<pubkey>` | `TierService` | 60 s | 15 s | Derived from `wallet:vefncpt:<pubkey>`; service subscribes to vefncpt internally and republishes whenever weight changes. Shape: `TierStatus{pubkey_b58, tier (Free/Bronze/Silver/Gold), weight_raw, next_threshold_raw, decimals, is_mock}`. Thresholds in `services/billing/TierConfig.h` (100 / 1k / 10k veFNCPT). Drives cross-screen gating (AI Quant Lab, Alpha Arena) via the `tier_changed` Qt signal. |++### Internal prediction markets (Phase 4)++Reserved topic family for the `FinceptInternalAdapter` matching engine. Topics are policy-registered at adapter startup, but **no producer publishes to them yet**: the adapter ships in **demo mode** (curated 3-market dataset emitted via Qt signals only) until `fincept.markets_endpoint` is configured *and* the `fincept_market` Anchor program (`solana/programs/fincept_market/`, separate repo) is deployed.++| Pattern | Producer | TTL | Min interval | Notes |+|---|---|---|---|---|+| `prediction:fincept:markets` | `FinceptInternalAdapter` (planned) | 30 s | 10 s | Curated/live market list. Shape: `QVector<PredictionMarket>` (same shape as `prediction:polymarket:markets`). Fields: `key`, `question`, `category`, `volume`, `outcomes` (binary YES/NO with prices in [0,1]), `end_date_iso`. Demo dataset emitted via `markets_ready` signal; topic publishing waits on the matching engine. |+| `prediction:fincept:orderbook:<asset_id>` | `FinceptInternalAdapter` (planned) | 5 s | 1 s | Per-asset order book. Shape: `PredictionOrderBook{asset_id, bids[], asks[]}` matching the Polymarket/Kalshi shape. WebSocket-driven once live. |+| `prediction:fincept:price:<asset_id>` | `FinceptInternalAdapter` (planned) | 5 s | 1 s | Last-trade price scalar. Same shape as `prediction:polymarket:price:*`. |+## Force refresh`DataHub::request(topic, force=true)` bypasses `min_interval_ms` (so user-driven refresh buttons work inside the interval gate). Per-producer `max_requests_per_sec()` is still honoured — rage-clicking cannot hammer upstream.diff --git a/fincept-qt/packaging/linux/fincept-terminal.appdata.xml b/fincept-qt/packaging/linux/fincept-terminal.appdata.xmlindex ad8832e0b..43b9838f6 100644--- a/fincept-qt/packaging/linux/fincept-terminal.appdata.xml+++ b/fincept-qt/packaging/linux/fincept-terminal.appdata.xml@@ -14,7 +14,7 @@<ul><li>Real-time crypto and equity trading (Kraken, HyperLiquid, 18+ brokers)</li><li>AI chat with multiple LLM providers (OpenAI, Anthropic, Groq, Ollama)</li>- <li>CFA-level Python analytics (equity, derivatives, fixed income, quant)</li>+ <li>Python analytics (equity, derivatives, fixed income, quant)</li><li>Voice commands via offline Whisper speech recognition</li><li>Visual workflow node editor with risk management</li><li>Geopolitics, prediction markets (Polymarket), maritime tracking</li>diff --git a/fincept-qt/plans/crypto-center-future-phases.md b/fincept-qt/plans/crypto-center-future-phases.mdindex 00005273b..3b92e036b 100644--- a/fincept-qt/plans/crypto-center-future-phases.md+++ b/fincept-qt/plans/crypto-center-future-phases.md@@ -1,8 +1,8 @@# Crypto Center — Future Phases (2–5)-**Status**: design draft+**Status**: terminal-side shipped — Phases 2, 3, 4, 5 all have UI + service surfaces in `main`. Phases 3, 4 and the buyback worker (5) ship in demo / mock mode pending external infrastructure. See "Shipped state" table at the bottom of this document.**Owner**: tilakpatel22-**Last updated**: 2026-04-27+**Last updated**: 2026-05-01**Predecessor**: `plans/crypto-center-wallet-connect.md` (Phase 1, shipped); Phase 1.5 hardening shipped 2026-04-27 — see §1.5 below.**Scope**: everything that lands inside `screens/crypto_center/CryptoCenterScreen` after the wallet-connect MVP — all subsequent capability that uses the same screen as its home.@@ -405,6 +405,8 @@ This is a **policy decision** outside the scope of this doc — the engineering## 5. Phase 5 — Buyback & Burn dashboard (ROADMAP tab)+**Status**: shipped (2026-05-01) — terminal-side dashboard is live; buyback worker endpoint is **not yet deployed**, so the producers ship in mock mode (`is_mock=true` on every payload, "DEMO" pill on every panel head). Configure SecureStorage keys `fincept.treasury_endpoint` and `fincept.treasury_pubkey` to flip to live data. See `docs/CRYPTO_CENTER_PHASE_5.md`.+**Goal**: make the value loop visible. Every user can see exactly how much terminal revenue has been spent buying $FNCPT off the market and burning it. This is the **demand engine** that justifies the token long-term.### 5.1 Capabilities@@ -581,3 +583,24 @@ If any of these is < 30 % of target after the corresponding phase, **stop** and- Update this doc at each phase kickoff with refined estimates and any scope deltas.- When a phase ships, **archive** its section into `plans/crypto-center-phase<N>-shipped.md` with the actual implementation diffs from the plan, so future phases inherit verified patterns rather than design speculation.- Topic catalogue (`docs/DATAHUB_TOPICS.md`) is the source of truth for all hub topics; this doc is the user-story-level map. Discrepancies → fix `DATAHUB_TOPICS.md` first.++---++## 12. Shipped state (2026-05-01)++Snapshot of what is wired in `main` vs. what still requires off-tree infrastructure (Anchor programs, Fincept-operated workers, hosted matching engine). Each phase below has a fully connected UI + service surface; the right-hand column lists what has to land before the demo / mock chips disappear.++| Phase | UI tab | Services / producers | Hub topics | Ships in mock mode? | Unblocks live mode |+|---|---|---|---|---|---|+| **1 + 1.5** | HOME | `WalletService`, `WalletBalanceProducer`, `TokenPriceProducer`, `TokenMetadataService` | `wallet:balance:*`, `market:price:token:*`, `market:price:fncpt` (deprecated alias) | No — fully live | — |+| **2** | TRADE, ACTIVITY | `PumpFunSwapService`, `WalletActivityProducer`, `FeeDiscountService` | `wallet:activity:*`, `billing:fncpt_discount:*` | No — fully live (PumpPortal) | — |+| **3** | STAKE | `StakingService`, `RealYieldService`, `TierService`, `TierConfig` | `wallet:locks:*`, `wallet:vefncpt:*`, `wallet:yield:*`, `treasury:revenue`, `billing:tier:*` | **Yes** — `is_mock=true` on every payload | Deploy `fincept_lock` Anchor program; configure `fincept.lock_program_id`, `fincept.yield_endpoint` |+| **4** | MARKETS | `FinceptInternalAdapter` (joins `PredictionExchangeRegistry`); panel reads via Qt signals | `prediction:fincept:markets`, `prediction:fincept:orderbook:*`, `prediction:fincept:price:*` (policies registered, no producer publishing yet) | **Yes** — curated 3-market dataset emitted via `markets_ready` signal | Deploy `fincept_market` Anchor program; stand up `markets.fincept.in`; configure `fincept.markets_endpoint`, `fincept.market_program_id` |+| **5** | ROADMAP | `BuybackBurnService`, `TreasuryService` | `treasury:buyback_epoch`, `treasury:burn_total`, `treasury:supply_history`, `treasury:reserves`, `treasury:runway` | **Yes** — `is_mock=true` on every payload | Deploy buyback worker (Python or TS, off-tree) that POSTs per-epoch summaries; configure `fincept.treasury_endpoint`, `fincept.treasury_pubkey` |++**No on-chain code in this tree.** Phases 3 and 4 require Solana programs written in Rust (`solana/programs/fincept_lock/` and `solana/programs/fincept_market/`), maintained in a separate repo. The C++ side stays pure Qt + DataHub.++**Cross-screen tier gating** (Phase 3 §3.6) is wired via `TierService::tier_changed`. Paid screens that connect to that signal will react when a user's tier transitions, even though the producer is currently in mock mode (the mock returns `Tier::Free`, so no screens light up until the program ships and real veFNCPT weight is observable).++**User-facing docs** corresponding to each phase live in `docs/CRYPTO_CENTER_PHASE_<N>.md` — written for Fincept Terminal users, not engineers. The walkthroughs in this directory are the engineering-side decision records.+diff --git a/fincept-qt/scripts/Analytics/README.md b/fincept-qt/scripts/Analytics/README.mdindex fee1b91be..bd3fe769f 100644--- a/fincept-qt/scripts/Analytics/README.md+++ b/fincept-qt/scripts/Analytics/README.md@@ -1,6 +1,6 @@# Analytics Modules-> CFA-level financial analytics, portfolio optimization, and quantitative models+> Financial analytics, portfolio optimization, and risk models — equity, fixed income, derivatives, alternatives## Overviewdiff --git a/fincept-qt/scripts/Analytics/backtesting/backtestingpy/backtestingpy_provider.py b/fincept-qt/scripts/Analytics/backtesting/backtestingpy/backtestingpy_provider.pyindex 37d060a8f..265a74d9a 100644--- a/fincept-qt/scripts/Analytics/backtesting/backtestingpy/backtestingpy_provider.py+++ b/fincept-qt/scripts/Analytics/backtesting/backtestingpy/backtestingpy_provider.py@@ -191,14 +191,19 @@ class BacktestingPyProvider(BacktestingProviderBase):start_date = request.get('startDate')end_date = request.get('endDate')initial_capital = request.get('initialCapital', 10000)- assets = request.get('assets', [])- if not assets:- return self._create_error_result('No assets specified')+ # Canonical input is `symbols: [str]` (sent by the C++ screen).+ # `assets: [{symbol, ...}]` is accepted as a fallback for legacy+ # callers that pass per-asset metadata.+ symbols = request.get('symbols', [])+ if not symbols:+ assets = request.get('assets', [])+ symbols = [a.get('symbol') for a in assets if isinstance(a, dict) and a.get('symbol')]++ if not symbols:+ return self._create_error_result('No symbols specified')- # Get primary asset- primary_asset = assets[0]- symbol = primary_asset.get('symbol', 'SPY')+ symbol = symbols[0]# Load or generate datadata = self._load_data(symbol, start_date, end_date)@@ -325,98 +330,303 @@ class BacktestingPyProvider(BacktestingProviderBase):# ========================================================================def optimize(self, request: Dict[str, Any]) -> Dict[str, Any]:- """- Run parameter optimization+ """Run parameter optimization via backtesting.py's `bt.optimize`.- Args:- request: Optimization configuration with parameters and constraints+ The frontend sweeps strategy params under their *frontend* names (e.g.+ `fastPeriod`); backtesting.py optimizes class-level attribute names+ (e.g. `n1`). `btp_strategies.STRATEGY_OPTIMIZE_PARAM_MAP` translates.- Returns:- OptimizationResult with best parameters and performance+ Returns the same shape as run_backtest (`data.performance`, `data.trades`,+ `data.equity`) so the existing screen renderer works unchanged, plus+ optimization-specific fields under `data.optimization`."""try:self._log('Starting parameter optimization')- # Extract request parametersstrategy_def = request.get('strategy', {})- parameters = request.get('parameters', {})- metric = request.get('metric', 'Sharpe Ratio')+ strategy_type = strategy_def.get('type', 'sma_crossover')+ # Frontend canonical name is `paramRanges`; legacy callers used `parameters`.+ param_ranges = request.get('paramRanges', {}) or request.get('parameters', {})+ objective = request.get('optimizeObjective') or request.get('metric', 'sharpe')start_date = request.get('startDate')end_date = request.get('endDate')initial_capital = request.get('initialCapital', 10000)- assets = request.get('assets', [])+ max_iterations = int(request.get('maxIterations', 500) or 500)- if not parameters:- return self._create_error_result('No parameters to optimize')+ # Canonical: `symbols: [str]`. Fallback: `assets: [{symbol, ...}]`.+ symbols = request.get('symbols', [])+ if not symbols:+ assets = request.get('assets', [])+ symbols = [a.get('symbol') for a in assets if isinstance(a, dict) and a.get('symbol')]- # Get primary asset- primary_asset = assets[0] if assets else {'symbol': 'SPY'}- symbol = primary_asset.get('symbol', 'SPY')+ if not param_ranges:+ return self._create_error_result('No parameter ranges supplied (expected paramRanges)')- # Load data+ symbol = symbols[0] if symbols else 'SPY'data = self._load_data(symbol, start_date, end_date)+ if data is None or len(data) == 0:+ return self._create_error_result(f'No data available for {symbol}')- # Create strategy class- strategy_class = self._create_strategy_class(strategy_def, parameters)+ # Build the strategy class with default params; bt.optimize will+ # sweep class-level attributes from there.+ strategy_class = self._create_strategy_class(strategy_def)- # Configure backtest- from backtesting import Backtest+ # Translate frontend param names -> class attribute names per strategy.+ import btp_strategies as _strat+ mapped_ranges = _strat.map_optimize_params(strategy_type, param_ranges)++ # Build python ranges. Drop any range that targets an attribute the+ # strategy class doesn't declare — backtesting.py would reject it+ # otherwise and we'd get the cryptic "missing parameter X" error.+ opt_kwargs = {}+ skipped: List[str] = []+ for cattr, cfg in mapped_ranges.items():+ if not hasattr(strategy_class, cattr):+ skipped.append(cattr)+ continue+ try:+ lo = int(cfg.get('min', 1))+ hi = int(cfg.get('max', 100))+ step = max(1, int(cfg.get('step', 1)))+ except Exception:+ continue+ if hi < lo:+ lo, hi = hi, lo+ opt_kwargs[cattr] = range(lo, hi + 1, step)++ if not opt_kwargs:+ return self._create_error_result(+ f"No optimizable parameters for strategy '{strategy_type}'. "+ f"Mapped attrs not present on class: {skipped}"+ )++ if skipped:+ self._log(f'Skipped non-class attrs during optimize: {skipped}')+ from backtesting import Backtestbt = Backtest(- data,- strategy_class,+ data, strategy_class,cash=initial_capital,- commission=request.get('commission', 0.0)+ commission=request.get('commission', 0.0),)- # Convert parameter ranges- opt_params = {}- for param_name, param_config in parameters.items():- min_val = param_config.get('min', 1)- max_val = param_config.get('max', 100)- step = param_config.get('step', 1)- opt_params[param_name] = range(min_val, max_val + 1, step)-- # Map metric name+ # Map frontend objective to backtesting.py stat key.metric_map = {+ 'sharpe': 'Sharpe Ratio',+ 'sortino': 'Sortino Ratio',+ 'calmar': 'Calmar Ratio',+ 'return': 'Return [%]',+ # Tolerate human-readable variants for callers outside the screen.'Sharpe Ratio': 'Sharpe Ratio',- 'Return': 'Return [%]',+ 'Sortino Ratio': 'Sortino Ratio',+ 'Calmar Ratio': 'Calmar Ratio','Total Return': 'Return [%]',- 'Win Rate': 'Win Rate [%]',- 'Profit Factor': 'Profit Factor'}- maximize_metric = metric_map.get(metric, 'Sharpe Ratio')-- # Run optimization- self._log(f'Optimizing {len(opt_params)} parameters')- stats = bt.optimize(**opt_params, maximize=maximize_metric, max_tries=500)-- # Extract optimal parameters- optimal_params = {}- for param_name in parameters.keys():- if hasattr(stats._strategy, param_name):- optimal_params[param_name] = getattr(stats._strategy, param_name)-- # Create result- result = OptimizationResult(- optimal_parameters=optimal_params,- performance=self._extract_performance_metrics(stats),- iterations=500,- best_iteration=0,- metric_name=metric,- metric_value=float(stats.get(maximize_metric, 0))- )+ maximize_metric = metric_map.get(objective, 'Sharpe Ratio')++ self._log(f'Optimizing {len(opt_kwargs)} attrs (max_tries={max_iterations}) maximize={maximize_metric}')+ stats = bt.optimize(**opt_kwargs, maximize=maximize_metric, max_tries=max_iterations)++ # Extract chosen optimal params back under frontend names.+ inverse_map = {cattr: fname for fname, cattr in+ _strat.STRATEGY_OPTIMIZE_PARAM_MAP.get(strategy_type, {}).items()}+ optimal_params: Dict[str, Any] = {}+ for cattr in opt_kwargs.keys():+ if not hasattr(stats._strategy, cattr):+ continue+ fname = inverse_map.get(cattr, cattr)+ val = getattr(stats._strategy, cattr)+ optimal_params[fname] = int(val) if hasattr(val, '__int__') else val++ # Wire shape: same as run_backtest so display_result() renders performance/trades.+ result_dict = self._convert_results(+ stats, symbol, start_date, end_date, initial_capital+ ).to_dict()- self._log(f'Optimization completed. Best {metric}: {result.metric_value:.4f}')- return {- 'success': True,- 'message': 'Optimization completed',- 'data': asdict(result)+ using_synthetic = not self._has_real_data(symbol)+ result_dict['using_synthetic_data'] = using_synthetic+ result_dict['optimization'] = {+ 'objective': objective,+ 'objective_value': float(stats.get(maximize_metric, 0)),+ 'best_params': optimal_params,+ 'iterations': int(max_iterations),+ 'attrs_optimized': list(opt_kwargs.keys()),+ 'attrs_skipped': skipped,}+ self._log(+ f"Optimization done: best {maximize_metric} = "+ f"{result_dict['optimization']['objective_value']:.4f} with {optimal_params}"+ )+ return {'success': True, 'message': 'Optimization completed', 'data': result_dict}+except Exception as e:self._error('Optimization failed', e)- return self._create_error_result(f'Optimization failed: {str(e)}')+ import traceback+ return self._create_error_result(f'Optimization failed: {str(e)}\n{traceback.format_exc()}')++ def walk_forward(self, request: Dict[str, Any]) -> Dict[str, Any]:+ """Anchored walk-forward optimization.++ Split the price history into N folds. For each fold:+ - Train segment = first `trainRatio` portion of the fold's window.+ - Test segment = the remainder.+ - Optimize on train, then run a single backtest on test using the+ best params found on train (genuine out-of-sample evaluation).++ Aggregate metric = mean Sharpe Ratio across the test segments. The+ returned shape mirrors run_backtest (`performance`, `trades`, `equity`)+ on the final fold's test run, so the screen renders without changes.+ Per-fold detail goes into `data.walkForward.folds`.+ """+ try:+ self._log('Starting walk-forward optimization')++ strategy_def = request.get('strategy', {})+ strategy_type = strategy_def.get('type', 'sma_crossover')+ param_ranges = request.get('paramRanges', {}) or request.get('parameters', {})+ objective = request.get('optimizeObjective') or request.get('metric', 'sharpe')+ n_splits = int(request.get('wfSplits', request.get('nSplits', 5)) or 5)+ train_ratio = float(request.get('wfTrainRatio', request.get('trainRatio', 0.7)) or 0.7)+ start_date = request.get('startDate')+ end_date = request.get('endDate')+ initial_capital = request.get('initialCapital', 10000)+ commission = request.get('commission', 0.0)++ symbols = request.get('symbols', [])+ if not symbols:+ assets = request.get('assets', [])+ symbols = [a.get('symbol') for a in assets if isinstance(a, dict) and a.get('symbol')]+ if not param_ranges:+ return self._create_error_result('No parameter ranges supplied (expected paramRanges)')+ if not (1 <= n_splits <= 20):+ return self._create_error_result(f'wfSplits must be between 1 and 20 (got {n_splits})')+ if not (0.1 <= train_ratio <= 0.95):+ return self._create_error_result(f'wfTrainRatio must be between 0.1 and 0.95 (got {train_ratio})')++ symbol = symbols[0] if symbols else 'SPY'+ full_data = self._load_data(symbol, start_date, end_date)+ if full_data is None or len(full_data) < n_splits * 20:+ return self._create_error_result(+ f'Need at least {n_splits * 20} bars for {n_splits} folds; got {0 if full_data is None else len(full_data)}'+ )++ import btp_strategies as _strat+ from backtesting import Backtest++ metric_map = {+ 'sharpe': 'Sharpe Ratio', 'sortino': 'Sortino Ratio',+ 'calmar': 'Calmar Ratio', 'return': 'Return [%]',+ }+ maximize_metric = metric_map.get(objective, 'Sharpe Ratio')++ n = len(full_data)+ fold_size = n // n_splits+ folds: List[Dict[str, Any]] = []+ test_returns: List[float] = []+ test_sharpes: List[float] = []+ last_test_stats = None+ last_test_data = None++ for i in range(n_splits):+ fold_start = i * fold_size+ fold_end = (i + 1) * fold_size if i < n_splits - 1 else n+ window = full_data.iloc[fold_start:fold_end]+ if len(window) < 20:+ continue+ split = int(len(window) * train_ratio)+ train, test = window.iloc[:split], window.iloc[split:]+ if len(train) < 10 or len(test) < 5:+ continue++ # Train: optimize on this slice.+ train_class = self._create_strategy_class(strategy_def)+ mapped = _strat.map_optimize_params(strategy_type, param_ranges)+ opt_kwargs: Dict[str, Any] = {}+ for cattr, cfg in mapped.items():+ if not hasattr(train_class, cattr):+ continue+ try:+ lo, hi = int(cfg.get('min', 1)), int(cfg.get('max', 100))+ step = max(1, int(cfg.get('step', 1)))+ except Exception:+ continue+ if hi < lo:+ lo, hi = hi, lo+ opt_kwargs[cattr] = range(lo, hi + 1, step)++ if not opt_kwargs:+ continue++ bt_train = Backtest(train, train_class, cash=initial_capital, commission=commission)+ train_stats = bt_train.optimize(**opt_kwargs, maximize=maximize_metric, max_tries=100)++ # Best params back -> frontend names.+ inverse = {c: f for f, c in _strat.STRATEGY_OPTIMIZE_PARAM_MAP.get(strategy_type, {}).items()}+ best_params: Dict[str, Any] = {}+ for cattr in opt_kwargs.keys():+ if hasattr(train_stats._strategy, cattr):+ v = getattr(train_stats._strategy, cattr)+ best_params[inverse.get(cattr, cattr)] = int(v) if hasattr(v, '__int__') else v++ # Test: backtest the *test* slice with those params.+ test_strategy_def = dict(strategy_def)+ test_strategy_def['params'] = {**(strategy_def.get('params') or {}), **best_params}+ test_class = self._create_strategy_class(test_strategy_def)+ bt_test = Backtest(test, test_class, cash=initial_capital, commission=commission)+ test_stats = bt_test.run()+ last_test_stats = test_stats+ last_test_data = test++ test_ret = float(test_stats.get('Return [%]', 0))+ test_sharpe = float(test_stats.get('Sharpe Ratio', 0))+ test_returns.append(test_ret)+ test_sharpes.append(test_sharpe)++ folds.append({+ 'fold': i,+ 'trainStart': str(train.index[0]),+ 'trainEnd': str(train.index[-1]),+ 'trainBars': len(train),+ 'testStart': str(test.index[0]),+ 'testEnd': str(test.index[-1]),+ 'testBars': len(test),+ 'bestParams': best_params,+ 'trainObjective': float(train_stats.get(maximize_metric, 0)),+ 'testReturnPct': test_ret,+ 'testSharpe': test_sharpe,+ })++ if not folds or last_test_stats is None:+ return self._create_error_result('No usable folds — try fewer splits or a longer date range')++ # Surface the LAST fold's test result via the standard+ # run_backtest shape so display_result() renders something useful.+ result_dict = self._convert_results(+ last_test_stats, symbol,+ str(last_test_data.index[0]), str(last_test_data.index[-1]),+ initial_capital,+ ).to_dict()+ result_dict['using_synthetic_data'] = not self._has_real_data(symbol)+ result_dict['walk_forward'] = {+ 'objective': objective,+ 'n_splits': n_splits,+ 'train_ratio': train_ratio,+ 'folds': folds,+ 'mean_test_return_pct': sum(test_returns) / len(test_returns),+ 'mean_test_sharpe': sum(test_sharpes) / len(test_sharpes),+ }++ self._log(+ f'Walk-forward done: {len(folds)} folds, mean test Sharpe = '+ f'{result_dict["walk_forward"]["mean_test_sharpe"]:.4f}'+ )+ return {'success': True, 'message': 'Walk-forward completed', 'data': result_dict}++ except Exception as e:+ self._error('Walk-forward failed', e)+ import traceback+ return self._create_error_result(f'Walk-forward failed: {str(e)}\n{traceback.format_exc()}')# ========================================================================# Data and Indicators (Required Abstract Methods)@@ -461,8 +671,14 @@ class BacktestingPyProvider(BacktestingProviderBase):def calculate_indicator(self, indicator_type: str, params: Dict[str, Any]) -> Dict[str, Any]:"""Calculate technical indicator"""try:- symbol = params.get('symbol', 'SPY')- period = params.get('period', 20)+ # Accept both `symbol: str` (legacy) and `symbols: [str]` (canonical).+ symbol = params.get('symbol')+ if not symbol:+ syms = params.get('symbols') or []+ symbol = syms[0] if syms else 'SPY'+ # Support nested params dict (legacy) and flat top-level args (canonical).+ inner = params.get('params') if isinstance(params.get('params'), dict) else params+ period = inner.get('period', 20)start_date = params.get('startDate')end_date = params.get('endDate')@@ -705,517 +921,63 @@ class BacktestingPyProvider(BacktestingProviderBase):return Nonedef _create_strategy_class(self, strategy_def: Dict[str, Any], opt_params: Dict = None):- """Create a backtesting.py Strategy class from strategy definition"""+ """Build a backtesting.py Strategy class.++ For registered strategy ids (the 26 in btp_strategies.STRATEGY_BUILDERS)+ the builder lives in btp_strategies and uses class-level attributes that+ the optimize path can sweep. Frontend params (e.g. `fastPeriod`) are+ consumed by the builder; class-level names (e.g. `n1`, `n2`) are what+ backtesting.py's `bt.optimize(**ranges)` operates on.++ For custom user code we keep the existing sandboxed exec path.+ """from backtesting import Strategy- from backtesting.lib import crossover+ from backtesting.lib import crossover # noqa: F401 (used by user code)- # Extract strategy code or type- code = strategy_def.get('code', '')strategy_type = strategy_def.get('type', 'sma_crossover')+ # Frontend sends `params`; legacy callers used `parameters`.+ params = strategy_def.get('params') or strategy_def.get('parameters') or {}+ code = strategy_def.get('code', '')- # Default parameters- params = strategy_def.get('parameters', {})-- # Create dynamic strategy class- class_name = strategy_def.get('name', 'CustomStrategy').replace(' ', '')-- # EMA Crossover strategy- if strategy_type == 'ema_crossover':- class EMAStrategy(Strategy):- n1 = opt_params.get('n1', params.get('fast_period', params.get('fastPeriod', 12))) if opt_params else params.get('fast_period', params.get('fastPeriod', 12))- n2 = opt_params.get('n2', params.get('slow_period', params.get('slowPeriod', 26))) if opt_params else params.get('slow_period', params.get('slowPeriod', 26))-- def init(self):- close = self.data.Close- self.ema1 = self.I(self._ema, close, self.n1)- self.ema2 = self.I(self._ema, close, self.n2)-- def next(self):- if crossover(self.ema1, self.ema2):- if self.position.is_short:- self.position.close()- self.buy()- elif crossover(self.ema2, self.ema1):- if self.position.is_long:- self.position.close()- self.sell()-- @staticmethod- def _ema(values, n):- return pd.Series(values).ewm(span=n, adjust=False).mean()-- return EMAStrategy-- # RSI Strategy- if strategy_type == 'rsi':- class RSIStrategy(Strategy):- period = params.get('period', 14)- oversold = params.get('oversold', 30)- overbought = params.get('overbought', 70)-- def init(self):- close = self.data.Close- self.rsi = self.I(self._rsi, close, self.period)-- def next(self):- if self.rsi[-1] < self.oversold:- if not self.position.is_long:- if self.position.is_short:- self.position.close()- self.buy()- elif self.rsi[-1] > self.overbought:- if not self.position.is_short:- if self.position.is_long:- self.position.close()- self.sell()-- @staticmethod- def _rsi(values, period):- s = pd.Series(values)- delta = s.diff()- gain = delta.where(delta > 0, 0).rolling(window=period).mean()- loss = (-delta.where(delta < 0, 0)).rolling(window=period).mean()- rs = gain / loss- return 100 - (100 / (1 + rs))-- return RSIStrategy-- # MACD Strategy- if strategy_type == 'macd':- class MACDStrategy(Strategy):- fast_period = params.get('fast_period', params.get('fastPeriod', 12))- slow_period = params.get('slow_period', params.get('slowPeriod', 26))- signal_period = params.get('signal_period', params.get('signalPeriod', 9))-- def init(self):- close = self.data.Close- self.macd_line = self.I(self._macd_line, close, self.fast_period, self.slow_period)- self.signal_line = self.I(self._signal_line, close, self.fast_period, self.slow_period, self.signal_period)-- def next(self):- if crossover(self.macd_line, self.signal_line):- if self.position.is_short:- self.position.close()- self.buy()- elif crossover(self.signal_line, self.macd_line):- if self.position.is_long:- self.position.close()- self.sell()-- @staticmethod- def _macd_line(values, fast, slow):- s = pd.Series(values)- fast_ema = s.ewm(span=fast, adjust=False).mean()- slow_ema = s.ewm(span=slow, adjust=False).mean()- return fast_ema - slow_ema-- @staticmethod- def _signal_line(values, fast, slow, signal):- s = pd.Series(values)- fast_ema = s.ewm(span=fast, adjust=False).mean()- slow_ema = s.ewm(span=slow, adjust=False).mean()- macd = fast_ema - slow_ema- return macd.ewm(span=signal, adjust=False).mean()-- return MACDStrategy-- # Bollinger Bands Strategy- if strategy_type == 'bollinger_bands':- class BollingerBandsStrategy(Strategy):- period = params.get('period', 20)- std_dev = params.get('std_dev', params.get('stdDev', 2.0))-- def init(self):- close = self.data.Close- self.sma = self.I(self._sma, close, self.period)- self.upper = self.I(self._upper_band, close, self.period, self.std_dev)- self.lower = self.I(self._lower_band, close, self.period, self.std_dev)-- def next(self):- price = self.data.Close[-1]- # Buy when price crosses below lower band (oversold)- if price < self.lower[-1]:- if not self.position.is_long:- if self.position.is_short:- self.position.close()- self.buy()- # Sell when price crosses above upper band (overbought)- elif price > self.upper[-1]:- if not self.position.is_short:- if self.position.is_long:- self.position.close()- self.sell()-- @staticmethod- def _sma(values, n):- return pd.Series(values).rolling(n).mean()-- @staticmethod- def _upper_band(values, n, std_dev):- s = pd.Series(values)- sma = s.rolling(n).mean()- std = s.rolling(n).std()- return sma + (std * std_dev)-- @staticmethod- def _lower_band(values, n, std_dev):- s = pd.Series(values)- sma = s.rolling(n).mean()- std = s.rolling(n).std()- return sma - (std * std_dev)-- return BollingerBandsStrategy-- # Mean Reversion (Z-Score based)- if strategy_type == 'mean_reversion':- class MeanReversionStrategy(Strategy):- period = params.get('period', 20)- z_threshold = params.get('z_threshold', params.get('zThreshold', 2.0))-- def init(self):- close = self.data.Close- self.sma = self.I(self._sma, close, self.period)- self.zscore = self.I(self._zscore, close, self.period)-- def next(self):- if self.zscore[-1] < -self.z_threshold:- if not self.position.is_long:- if self.position.is_short:- self.position.close()- self.buy()- elif self.zscore[-1] > self.z_threshold:- if not self.position.is_short:- if self.position.is_long:- self.position.close()- self.sell()- elif abs(self.zscore[-1]) < 0.5:- if self.position:- self.position.close()-- @staticmethod- def _sma(values, n):- return pd.Series(values).rolling(n).mean()-- @staticmethod- def _zscore(values, n):- s = pd.Series(values)- mean = s.rolling(n).mean()- std = s.rolling(n).std()- return (s - mean) / std.replace(0, 1)-- return MeanReversionStrategy-- # Momentum (N-bar lookback return)- if strategy_type == 'momentum':- class MomentumStrategy(Strategy):- lookback = params.get('lookback', 20)- threshold = params.get('threshold', 0.0) / 100.0 # Convert from pct-- def init(self):- close = self.data.Close- self.returns = self.I(self._lookback_return, close, self.lookback)-- def next(self):- if self.returns[-1] > self.threshold:- if not self.position.is_long:- if self.position.is_short:- self.position.close()- self.buy()- elif self.returns[-1] < -self.threshold:- if not self.position.is_short:- if self.position.is_long:- self.position.close()- self.sell()-- @staticmethod- def _lookback_return(values, n):- s = pd.Series(values)- return s.pct_change(periods=n)-- return MomentumStrategy-- # Breakout (Donchian Channel with ATR filter)- if strategy_type == 'breakout':- class BreakoutStrategy(Strategy):- period = params.get('period', 20)- atr_mult = params.get('atr_mult', params.get('atrMult', 1.5))-- def init(self):- high = self.data.High- low = self.data.Low- close = self.data.Close- self.upper = self.I(self._donchian_upper, high, self.period)- self.lower = self.I(self._donchian_lower, low, self.period)- self.atr = self.I(self._atr, high, low, close, self.period)-- def next(self):- price = self.data.Close[-1]- atr_filter = self.atr[-1] * self.atr_mult- if price > self.upper[-1] and self.atr[-1] > 0:- if not self.position.is_long:- if self.position.is_short:- self.position.close()- self.buy(sl=price - atr_filter)- elif price < self.lower[-1] and self.atr[-1] > 0:- if not self.position.is_short:- if self.position.is_long:- self.position.close()- self.sell(sl=price + atr_filter)-- @staticmethod- def _donchian_upper(values, n):- return pd.Series(values).rolling(n).max()-- @staticmethod- def _donchian_lower(values, n):- return pd.Series(values).rolling(n).min()-- @staticmethod- def _atr(high, low, close, n):- h = pd.Series(high)- l = pd.Series(low)- c = pd.Series(close)- prev_c = c.shift(1)- tr = pd.concat([h - l, (h - prev_c).abs(), (l - prev_c).abs()], axis=1).max(axis=1)- return tr.rolling(n).mean()-- return BreakoutStrategy-- # Stochastic (%K/%D crossover)- if strategy_type == 'stochastic':- class StochasticStrategy(Strategy):- k_period = params.get('k_period', params.get('kPeriod', 14))- d_period = params.get('d_period', params.get('dPeriod', 3))- oversold = params.get('oversold', 20)- overbought = params.get('overbought', 80)-- def init(self):- high = self.data.High- low = self.data.Low- close = self.data.Close- self.k = self.I(self._stoch_k, high, low, close, self.k_period)- self.d = self.I(self._stoch_d, high, low, close, self.k_period, self.d_period)-- def next(self):- if self.k[-1] < self.oversold and crossover(self.k, self.d):- if not self.position.is_long:- if self.position.is_short:- self.position.close()- self.buy()- elif self.k[-1] > self.overbought and crossover(self.d, self.k):- if not self.position.is_short:- if self.position.is_long:- self.position.close()- self.sell()-- @staticmethod- def _stoch_k(high, low, close, period):- h = pd.Series(high)- l = pd.Series(low)- c = pd.Series(close)- lowest = l.rolling(period).min()- highest = h.rolling(period).max()- denom = highest - lowest- return ((c - lowest) / denom.replace(0, 1)) * 100-- @staticmethod- def _stoch_d(high, low, close, k_period, d_period):- h = pd.Series(high)- l = pd.Series(low)- c = pd.Series(close)- lowest = l.rolling(k_period).min()- highest = h.rolling(k_period).max()- denom = highest - lowest- k = ((c - lowest) / denom.replace(0, 1)) * 100- return k.rolling(d_period).mean()-- return StochasticStrategy-- # ADX Trend (trade with trend when ADX > threshold)- if strategy_type == 'adx_trend':- class ADXTrendStrategy(Strategy):- period = params.get('period', 14)- threshold = params.get('threshold', 25)-- def init(self):- high = self.data.High- low = self.data.Low- close = self.data.Close- self.adx = self.I(self._adx, high, low, close, self.period)- self.plus_di = self.I(self._plus_di, high, low, close, self.period)- self.minus_di = self.I(self._minus_di, high, low, close, self.period)-- def next(self):- if self.adx[-1] > self.threshold:- if self.plus_di[-1] > self.minus_di[-1]:- if not self.position.is_long:- if self.position.is_short:- self.position.close()- self.buy()- elif self.minus_di[-1] > self.plus_di[-1]:- if not self.position.is_short:- if self.position.is_long:- self.position.close()- self.sell()- else:- if self.position:- self.position.close()-- @staticmethod- def _adx(high, low, close, period):- h = pd.Series(high)- l = pd.Series(low)- c = pd.Series(close)- prev_h = h.shift(1)- prev_l = l.shift(1)- prev_c = c.shift(1)- tr = pd.concat([h - l, (h - prev_c).abs(), (l - prev_c).abs()], axis=1).max(axis=1)- plus_dm = ((h - prev_h).where((h - prev_h) > (prev_l - l), 0)).clip(lower=0)- minus_dm = ((prev_l - l).where((prev_l - l) > (h - prev_h), 0)).clip(lower=0)- atr = tr.ewm(span=period, adjust=False).mean()- plus_di = 100 * (plus_dm.ewm(span=period, adjust=False).mean() / atr.replace(0, 1))- minus_di = 100 * (minus_dm.ewm(span=period, adjust=False).mean() / atr.replace(0, 1))- dx = (abs(plus_di - minus_di) / (plus_di + minus_di).replace(0, 1)) * 100- return dx.ewm(span=period, adjust=False).mean()-- @staticmethod- def _plus_di(high, low, close, period):- h = pd.Series(high)- l = pd.Series(low)- c = pd.Series(close)- prev_h = h.shift(1)- prev_l = l.shift(1)- prev_c = c.shift(1)- tr = pd.concat([h - l, (h - prev_c).abs(), (l - prev_c).abs()], axis=1).max(axis=1)- plus_dm = ((h - prev_h).where((h - prev_h) > (prev_l - l), 0)).clip(lower=0)- atr = tr.ewm(span=period, adjust=False).mean()- return 100 * (plus_dm.ewm(span=period, adjust=False).mean() / atr.replace(0, 1))-- @staticmethod- def _minus_di(high, low, close, period):- h = pd.Series(high)- l = pd.Series(low)- c = pd.Series(close)- prev_h = h.shift(1)- prev_l = l.shift(1)- prev_c = c.shift(1)- tr = pd.concat([h - l, (h - prev_c).abs(), (l - prev_c).abs()], axis=1).max(axis=1)- minus_dm = ((prev_l - l).where((prev_l - l) > (h - prev_h), 0)).clip(lower=0)- atr = tr.ewm(span=period, adjust=False).mean()- return 100 * (minus_dm.ewm(span=period, adjust=False).mean() / atr.replace(0, 1))-- return ADXTrendStrategy-- # SMA Crossover strategy (default)- if strategy_type == 'sma_crossover' or not code:- class DynamicStrategy(Strategy):- # Class variables for optimization- n1 = opt_params.get('n1', params.get('fast_period', params.get('fastPeriod', 10))) if opt_params else params.get('fast_period', params.get('fastPeriod', 10))- n2 = opt_params.get('n2', params.get('slow_period', params.get('slowPeriod', 20))) if opt_params else params.get('slow_period', params.get('slowPeriod', 20))-- # Risk management parameters- use_sl = params.get('use_stop_loss', False)- use_tp = params.get('use_take_profit', False)- sl_pct = params.get('stop_loss_pct', 0.02) # 2% stop loss- tp_pct = params.get('take_profit_pct', 0.05) # 5% take profit-- def init(self):- # Simple moving averages- close = self.data.Close- self.sma1 = self.I(self._sma, close, self.n1)- self.sma2 = self.I(self._sma, close, self.n2)-- def next(self):- # Get current price- price = self.data.Close[-1]-- # Calculate stop-loss and take-profit levels- sl = price * (1 - self.sl_pct) if self.use_sl else None- tp = price * (1 + self.tp_pct) if self.use_tp else None-- # Trading logic with SL/TP- if crossover(self.sma1, self.sma2):- if self.position.is_short:- self.position.close()- self.buy(sl=sl, tp=tp)- elif crossover(self.sma2, self.sma1):- if self.position.is_long:- self.position.close()- # For short positions, SL and TP are reversed- sl_short = price * (1 + self.sl_pct) if self.use_sl else None- tp_short = price * (1 - self.tp_pct) if self.use_tp else None- self.sell(sl=sl_short, tp=tp_short)-- @staticmethod- def _sma(values, n):- return pd.Series(values).rolling(n).mean()-- return DynamicStrategy-- # Custom code strategy- else:- # Validate custom strategy code with restricted execution- # Only allow safe subset of Python for strategy definitions+ # Registered strategy id -> delegate to btp_strategies builder.+ import btp_strategies as _strat+ if strategy_type in _strat.STRATEGY_BUILDERS:+ return _strat.STRATEGY_BUILDERS[strategy_type](params, opt_params)++ # Custom user-supplied strategy code (sandboxed).+ if code:validation_error = self._validate_strategy_code(code)if validation_error:self._error(f'Strategy code validation failed: {validation_error}')- # Fallback to default strategy- return self._create_strategy_class({'type': 'sma_crossover'}, opt_params)-- # Execute with restricted globals - no access to dangerous modules+ return _strat.STRATEGY_BUILDERS['sma_crossover'](params, opt_params)exec_globals = {'__builtins__': {- 'range': range,- 'len': len,- 'abs': abs,- 'min': min,- 'max': max,- 'sum': sum,- 'round': round,- 'int': int,- 'float': float,- 'bool': bool,- 'str': str,- 'list': list,- 'dict': dict,- 'tuple': tuple,- 'enumerate': enumerate,- 'zip': zip,- 'map': map,- 'filter': filter,- 'sorted': sorted,- 'reversed': reversed,- 'isinstance': isinstance,- 'issubclass': issubclass,- 'hasattr': hasattr,- 'getattr': getattr,- 'setattr': setattr,- 'property': property,- 'staticmethod': staticmethod,- 'classmethod': classmethod,- 'super': super,- 'type': type,- 'True': True,- 'False': False,- 'None': None,+ 'range': range, 'len': len, 'abs': abs, 'min': min, 'max': max,+ 'sum': sum, 'round': round, 'int': int, 'float': float, 'bool': bool,+ 'str': str, 'list': list, 'dict': dict, 'tuple': tuple,+ 'enumerate': enumerate, 'zip': zip, 'map': map, 'filter': filter,+ 'sorted': sorted, 'reversed': reversed, 'isinstance': isinstance,+ 'issubclass': issubclass, 'hasattr': hasattr, 'getattr': getattr,+ 'setattr': setattr, 'property': property, 'staticmethod': staticmethod,+ 'classmethod': classmethod, 'super': super, 'type': type,+ 'True': True, 'False': False, 'None': None,},'Strategy': Strategy,'crossover': crossover,'pd': pd,'np': np,}-try:exec(code, exec_globals)- # Try to find the strategy class- for name, obj in exec_globals.items():- if isinstance(obj, type) and issubclass(obj, Strategy) and obj != Strategy:+ for _name, obj in exec_globals.items():+ if isinstance(obj, type) and issubclass(obj, Strategy) and obj is not Strategy:return objexcept Exception as e:self._error('Failed to execute custom strategy code', e)- # Fallback to default strategy- return self._create_strategy_class({'type': 'sma_crossover'}, opt_params)+ # Unknown id and no code -> sensible default so the run isn't a hard fail.+ return _strat.STRATEGY_BUILDERS['sma_crossover'](params, opt_params)+def _validate_strategy_code(self, code: str) -> Optional[str]:"""@@ -1596,11 +1358,16 @@ def main():elif command == 'get_historical_data':result = provider.get_historical_data(args)elif command == 'calculate_indicator':- indicator_type = args.get('type', '')- params = args.get('params', {})- result = provider.calculate_indicator(indicator_type, params)+ # Frontend sends top-level `indicator` (id), `symbols`, `startDate`,+ # `endDate`, plus a nested `params` dict with indicator-specific+ # tuning (`period`, etc.). Pass the full args through so+ # calculate_indicator can read both kinds.+ indicator_type = args.get('indicator') or args.get('type', '')+ result = provider.calculate_indicator(indicator_type, args)elif command == 'optimize':result = provider.optimize(args)+ elif command == 'walk_forward':+ result = provider.walk_forward(args)elif command == 'get_strategies':result = provider.get_strategies(args)elif command == 'get_indicators':diff --git a/fincept-qt/scripts/Analytics/backtesting/backtestingpy/btp_strategies.py b/fincept-qt/scripts/Analytics/backtesting/backtestingpy/btp_strategies.pyindex a619590f6..19f282715 100644--- a/fincept-qt/scripts/Analytics/backtesting/backtestingpy/btp_strategies.py+++ b/fincept-qt/scripts/Analytics/backtesting/backtestingpy/btp_strategies.py@@ -771,6 +771,292 @@ def get_strategy_class(strategy_type: str, params: Dict[str, Any],return build_sma_crossover(params, opt_params)+# Maps frontend parameter names (sent by the C++ screen as strategy.params)+# to the class-level attribute names declared inside each builder. backtesting.py+# only optimizes over class attributes, so `bt.optimize(**ranges)` must use the+# class attribute names, not the frontend ids. Every entry corresponds to a+# `_STRATEGY_META` entry above; if a strategy is missing here, optimize falls+# back to passing frontend names through unchanged (works for builders whose+# class attrs already equal the frontend names, e.g. RSI's `period`).+STRATEGY_OPTIMIZE_PARAM_MAP: Dict[str, Dict[str, str]] = {+ 'sma_crossover': {'fastPeriod': 'n1', 'slowPeriod': 'n2'},+ 'ema_crossover': {'fastPeriod': 'n1', 'slowPeriod': 'n2'},+ 'macd': {'fastPeriod': 'fast_p', 'slowPeriod': 'slow_p', 'signalPeriod': 'signal_p'},+ 'bollinger_bands':{'period': 'period', 'stdDev': 'std_dev'},+ 'mean_reversion': {'period': 'period', 'zThreshold': 'z_threshold'},+ 'momentum': {'lookback': 'lookback', 'threshold': 'threshold'},+ 'breakout': {'period': 'period'},+ 'stochastic': {'kPeriod': 'k_period', 'dPeriod': 'd_period',+ 'oversold': 'oversold', 'overbought': 'overbought'},+ 'rsi': {'period': 'period', 'oversold': 'oversold', 'overbought': 'overbought'},+ 'adx_trend': {'period': 'period', 'threshold': 'threshold'},+ 'williams_r': {'period': 'period', 'oversold': 'oversold', 'overbought': 'overbought'},+ 'cci': {'period': 'period', 'lower': 'threshold', 'upper': 'threshold'},+ 'obv_trend': {'period': 'ma_period'},+ 'keltner_breakout': {'period': 'ema_period', 'atrPeriod': 'atr_period', 'multiplier': 'mult'},+ 'triple_ma': {'fastPeriod': 'fast', 'mediumPeriod': 'med', 'slowPeriod': 'slow'},+ 'dual_momentum': {'shortLookback': 'abs_period', 'longLookback': 'abs_period',+ 'threshold': 'threshold'},+ 'volatility_breakout': {'period': 'atr_period', 'kMultiplier': 'atr_mult'},+ 'rsi_macd': {'rsiPeriod': 'rsi_period', 'oversold': 'oversold', 'overbought': 'overbought',+ 'fastPeriod': 'fast_p', 'slowPeriod': 'slow_p', 'signalPeriod': 'signal_p'},+ 'macd_adx': {'fastPeriod': 'fast_p', 'slowPeriod': 'slow_p',+ 'adxPeriod': 'adx_period', 'adxThreshold': 'adx_threshold'},+ 'bollinger_rsi': {'bbPeriod': 'bb_period', 'stdDev': 'std_dev',+ 'rsiPeriod': 'rsi_period', 'oversold': 'oversold', 'overbought': 'overbought'},+ 'ichimoku': {'tenkanPeriod': 'tenkan_p', 'kijunPeriod': 'kijun_p'},+ 'psar': {'afStep': 'af_step', 'afMax': 'af_max'},+ 'mfi': {'period': 'period', 'oversold': 'oversold', 'overbought': 'overbought'},+ 'macd_zero_cross':{'fastPeriod': 'fast_p', 'slowPeriod': 'slow_p', 'signalPeriod': 'signal_p'},+ 'atr_trailing_stop': {'atrPeriod': 'atr_period', 'multiplier': 'atr_mult'},+ 'trend_momentum': {'maPeriod': 'ma_period', 'momentumPeriod': 'rsi_period'},+}+++def map_optimize_params(strategy_type: str, frontend_ranges: Dict[str, Any]) -> Dict[str, Any]:+ """Translate frontend param ranges (`fastPeriod`) to class attribute ranges (`n1`).++ Frontend ranges look like {"fastPeriod": {"min": 5, "max": 20, "step": 1}, ...}.+ Returns {"n1": {...}} for strategies whose class attrs differ from frontend names.+ Pass-through for unmapped strategies/keys.+ """+ mapping = STRATEGY_OPTIMIZE_PARAM_MAP.get(strategy_type, {})+ out: Dict[str, Any] = {}+ for fname, cfg in (frontend_ranges or {}).items():+ cattr = mapping.get(fname, fname)+ # If two frontend params map to the same class attr (rare, e.g. dual_momentum),+ # the second one wins — backtesting.py can only optimize one range per attr.+ out[cattr] = cfg+ return out++def list_strategies() -> List[Dict[str, str]]:"""Return list of available strategies for frontend catalog."""return [{'id': k, 'name': k.replace('_', ' ').title()} for k in STRATEGY_BUILDERS]+++# Per-strategy metadata used to build the categorised catalog the frontend+# expects ({strategies: {category: [{id, name, params: [...]}]}}). Every entry+# here corresponds to a key in STRATEGY_BUILDERS — keep them in sync.+_STRATEGY_META: Dict[str, Dict[str, Any]] = {+ 'sma_crossover': {+ 'name': 'SMA Crossover', 'category': 'Trend',+ 'params': [+ {'id': 'fastPeriod', 'name': 'Fast Period', 'default': 10, 'min': 2, 'max': 100, 'step': 1},+ {'id': 'slowPeriod', 'name': 'Slow Period', 'default': 20, 'min': 5, 'max': 200, 'step': 1},+ ],+ },+ 'ema_crossover': {+ 'name': 'EMA Crossover', 'category': 'Trend',+ 'params': [+ {'id': 'fastPeriod', 'name': 'Fast Period', 'default': 12, 'min': 2, 'max': 100, 'step': 1},+ {'id': 'slowPeriod', 'name': 'Slow Period', 'default': 26, 'min': 5, 'max': 200, 'step': 1},+ ],+ },+ 'macd': {+ 'name': 'MACD Crossover', 'category': 'Trend',+ 'params': [+ {'id': 'fastPeriod', 'name': 'Fast Period', 'default': 12, 'min': 2, 'max': 50, 'step': 1},+ {'id': 'slowPeriod', 'name': 'Slow Period', 'default': 26, 'min': 10, 'max': 100, 'step': 1},+ {'id': 'signalPeriod', 'name': 'Signal Period', 'default': 9, 'min': 2, 'max': 30, 'step': 1},+ ],+ },+ 'adx_trend': {+ 'name': 'ADX Trend', 'category': 'Trend',+ 'params': [+ {'id': 'period', 'name': 'ADX Period', 'default': 14, 'min': 5, 'max': 50, 'step': 1},+ {'id': 'threshold', 'name': 'ADX Threshold', 'default': 25, 'min': 10, 'max': 50, 'step': 1},+ ],+ },+ 'keltner_breakout': {+ 'name': 'Keltner Breakout', 'category': 'Trend',+ 'params': [+ {'id': 'period', 'name': 'EMA Period', 'default': 20, 'min': 5, 'max': 100, 'step': 1},+ {'id': 'atrPeriod', 'name': 'ATR Period', 'default': 10, 'min': 5, 'max': 50, 'step': 1},+ {'id': 'multiplier', 'name': 'Multiplier', 'default': 2.0, 'min': 0.5, 'max': 5.0, 'step': 0.1},+ ],+ },+ 'triple_ma': {+ 'name': 'Triple MA', 'category': 'Trend',+ 'params': [+ {'id': 'fastPeriod', 'name': 'Fast', 'default': 5, 'min': 2, 'max': 20, 'step': 1},+ {'id': 'mediumPeriod', 'name': 'Medium', 'default': 20, 'min': 10, 'max': 50, 'step': 1},+ {'id': 'slowPeriod', 'name': 'Slow', 'default': 50, 'min': 30, 'max': 200, 'step': 1},+ ],+ },+ 'ichimoku': {+ 'name': 'Ichimoku Cloud', 'category': 'Trend',+ 'params': [+ {'id': 'tenkanPeriod', 'name': 'Tenkan', 'default': 9, 'min': 2, 'max': 30, 'step': 1},+ {'id': 'kijunPeriod', 'name': 'Kijun', 'default': 26, 'min': 5, 'max': 100, 'step': 1},+ ],+ },+ 'psar': {+ 'name': 'Parabolic SAR', 'category': 'Trend',+ 'params': [+ {'id': 'afStep', 'name': 'AF Step', 'default': 0.02, 'min': 0.005, 'max': 0.1, 'step': 0.005},+ {'id': 'afMax', 'name': 'AF Max', 'default': 0.2, 'min': 0.05, 'max': 0.5, 'step': 0.01},+ ],+ },+ 'macd_zero_cross': {+ 'name': 'MACD Zero Cross', 'category': 'Trend',+ 'params': [+ {'id': 'fastPeriod', 'name': 'Fast', 'default': 12, 'min': 2, 'max': 50, 'step': 1},+ {'id': 'slowPeriod', 'name': 'Slow', 'default': 26, 'min': 10, 'max': 100, 'step': 1},+ {'id': 'signalPeriod', 'name': 'Signal', 'default': 9, 'min': 2, 'max': 30, 'step': 1},+ ],+ },+ 'trend_momentum': {+ 'name': 'Trend + Momentum', 'category': 'Trend',+ 'params': [+ {'id': 'maPeriod', 'name': 'MA Period', 'default': 50, 'min': 10, 'max': 200, 'step': 1},+ {'id': 'momentumPeriod', 'name': 'Momentum Period', 'default': 14, 'min': 5, 'max': 50, 'step': 1},+ ],+ },+ 'mean_reversion': {+ 'name': 'Z-Score Mean Reversion', 'category': 'Mean Reversion',+ 'params': [+ {'id': 'period', 'name': 'Lookback', 'default': 20, 'min': 5, 'max': 100, 'step': 1},+ {'id': 'zThreshold', 'name': 'Z Threshold', 'default': 2.0, 'min': 0.5, 'max': 4.0, 'step': 0.1},+ ],+ },+ 'bollinger_bands': {+ 'name': 'Bollinger Bands', 'category': 'Mean Reversion',+ 'params': [+ {'id': 'period', 'name': 'Period', 'default': 20, 'min': 5, 'max': 100, 'step': 1},+ {'id': 'stdDev', 'name': 'Std Dev', 'default': 2.0, 'min': 0.5, 'max': 4.0, 'step': 0.1},+ ],+ },+ 'rsi': {+ 'name': 'RSI', 'category': 'Mean Reversion',+ 'params': [+ {'id': 'period', 'name': 'Period', 'default': 14, 'min': 2, 'max': 50, 'step': 1},+ {'id': 'oversold', 'name': 'Oversold', 'default': 30, 'min': 10, 'max': 40, 'step': 1},+ {'id': 'overbought', 'name': 'Overbought', 'default': 70, 'min': 60, 'max': 95, 'step': 1},+ ],+ },+ 'stochastic': {+ 'name': 'Stochastic', 'category': 'Mean Reversion',+ 'params': [+ {'id': 'kPeriod', 'name': '%K Period', 'default': 14, 'min': 5, 'max': 30, 'step': 1},+ {'id': 'dPeriod', 'name': '%D Period', 'default': 3, 'min': 2, 'max': 10, 'step': 1},+ {'id': 'oversold', 'name': 'Oversold', 'default': 20, 'min': 5, 'max': 30, 'step': 1},+ {'id': 'overbought', 'name': 'Overbought', 'default': 80, 'min': 70, 'max': 95, 'step': 1},+ ],+ },+ 'williams_r': {+ 'name': 'Williams %R', 'category': 'Mean Reversion',+ 'params': [+ {'id': 'period', 'name': 'Period', 'default': 14, 'min': 5, 'max': 50, 'step': 1},+ {'id': 'oversold', 'name': 'Oversold', 'default': -80, 'min': -95, 'max': -60, 'step': 1},+ {'id': 'overbought', 'name': 'Overbought', 'default': -20, 'min': -40, 'max': -5, 'step': 1},+ ],+ },+ 'momentum': {+ 'name': 'Momentum', 'category': 'Momentum',+ 'params': [+ {'id': 'lookback', 'name': 'Lookback', 'default': 20, 'min': 5, 'max': 100, 'step': 1},+ {'id': 'threshold', 'name': 'Threshold %', 'default': 0, 'min': 0, 'max': 20, 'step': 0.5},+ ],+ },+ 'dual_momentum': {+ 'name': 'Dual Momentum', 'category': 'Momentum',+ 'params': [+ {'id': 'shortLookback', 'name': 'Short Lookback', 'default': 20, 'min': 5, 'max': 60, 'step': 1},+ {'id': 'longLookback', 'name': 'Long Lookback', 'default': 60, 'min': 30, 'max': 200, 'step': 1},+ {'id': 'threshold', 'name': 'Threshold %', 'default': 0, 'min': 0, 'max': 10, 'step': 0.5},+ ],+ },+ 'cci': {+ 'name': 'CCI', 'category': 'Momentum',+ 'params': [+ {'id': 'period', 'name': 'Period', 'default': 20, 'min': 5, 'max': 50, 'step': 1},+ {'id': 'lower', 'name': 'Lower', 'default': -100, 'min': -200, 'max': -50, 'step': 1},+ {'id': 'upper', 'name': 'Upper', 'default': 100, 'min': 50, 'max': 200, 'step': 1},+ ],+ },+ 'breakout': {+ 'name': 'Donchian Breakout', 'category': 'Breakout',+ 'params': [+ {'id': 'period', 'name': 'Channel Period', 'default': 20, 'min': 5, 'max': 100, 'step': 1},+ ],+ },+ 'volatility_breakout': {+ 'name': 'Volatility Breakout', 'category': 'Breakout',+ 'params': [+ {'id': 'period', 'name': 'ATR Period', 'default': 20, 'min': 5, 'max': 50, 'step': 1},+ {'id': 'kMultiplier', 'name': 'K Multiplier', 'default': 1.5, 'min': 0.5, 'max': 4.0, 'step': 0.1},+ ],+ },+ 'rsi_macd': {+ 'name': 'RSI + MACD', 'category': 'Multi-Indicator',+ 'params': [+ {'id': 'rsiPeriod', 'name': 'RSI Period', 'default': 14, 'min': 5, 'max': 30, 'step': 1},+ {'id': 'oversold', 'name': 'Oversold', 'default': 30, 'min': 15, 'max': 40, 'step': 1},+ {'id': 'overbought', 'name': 'Overbought', 'default': 70, 'min': 60, 'max': 90, 'step': 1},+ {'id': 'fastPeriod', 'name': 'MACD Fast', 'default': 12, 'min': 5, 'max': 30, 'step': 1},+ {'id': 'slowPeriod', 'name': 'MACD Slow', 'default': 26, 'min': 15, 'max': 50, 'step': 1},+ {'id': 'signalPeriod', 'name': 'MACD Signal', 'default': 9, 'min': 3, 'max': 20, 'step': 1},+ ],+ },+ 'macd_adx': {+ 'name': 'MACD + ADX', 'category': 'Multi-Indicator',+ 'params': [+ {'id': 'fastPeriod', 'name': 'MACD Fast', 'default': 12, 'min': 5, 'max': 30, 'step': 1},+ {'id': 'slowPeriod', 'name': 'MACD Slow', 'default': 26, 'min': 15, 'max': 50, 'step': 1},+ {'id': 'signalPeriod', 'name': 'MACD Signal', 'default': 9, 'min': 3, 'max': 20, 'step': 1},+ {'id': 'adxPeriod', 'name': 'ADX Period', 'default': 14, 'min': 5, 'max': 30, 'step': 1},+ {'id': 'adxThreshold', 'name': 'ADX Threshold', 'default': 25, 'min': 15, 'max': 50, 'step': 1},+ ],+ },+ 'bollinger_rsi': {+ 'name': 'Bollinger + RSI', 'category': 'Multi-Indicator',+ 'params': [+ {'id': 'bbPeriod', 'name': 'BB Period', 'default': 20, 'min': 5, 'max': 50, 'step': 1},+ {'id': 'stdDev', 'name': 'Std Dev', 'default': 2.0, 'min': 1.0, 'max': 4.0, 'step': 0.1},+ {'id': 'rsiPeriod', 'name': 'RSI Period', 'default': 14, 'min': 5, 'max': 30, 'step': 1},+ {'id': 'oversold', 'name': 'Oversold', 'default': 30, 'min': 15, 'max': 40, 'step': 1},+ {'id': 'overbought', 'name': 'Overbought', 'default': 70, 'min': 60, 'max': 90, 'step': 1},+ ],+ },+ 'obv_trend': {+ 'name': 'OBV Trend', 'category': 'Volume',+ 'params': [+ {'id': 'period', 'name': 'OBV SMA Period', 'default': 20, 'min': 5, 'max': 100, 'step': 1},+ ],+ },+ 'mfi': {+ 'name': 'Money Flow Index', 'category': 'Volume',+ 'params': [+ {'id': 'period', 'name': 'Period', 'default': 14, 'min': 5, 'max': 50, 'step': 1},+ {'id': 'oversold', 'name': 'Oversold', 'default': 20, 'min': 5, 'max': 35, 'step': 1},+ {'id': 'overbought', 'name': 'Overbought', 'default': 80, 'min': 65, 'max': 95, 'step': 1},+ ],+ },+ 'atr_trailing_stop': {+ 'name': 'ATR Trailing Stop', 'category': 'Risk',+ 'params': [+ {'id': 'atrPeriod', 'name': 'ATR Period', 'default': 14, 'min': 5, 'max': 50, 'step': 1},+ {'id': 'multiplier', 'name': 'Multiplier', 'default': 3.0, 'min': 0.5, 'max': 6.0, 'step': 0.1},+ ],+ },+}+++def get_strategy_catalog() -> Dict[str, List[Dict[str, Any]]]:+ """Return strategies grouped by category in BT shape: {category: [{id, name, params: [...]}]}.++ Frontend (BacktestingTypes.h::strategies_from_json) expects this exact shape+ when the provider response is `{success: true, data: {strategies: <catalog>}}`.+ """+ grouped: Dict[str, List[Dict[str, Any]]] = {}+ for sid in STRATEGY_BUILDERS:+ meta = _STRATEGY_META.get(sid, {})+ cat = meta.get('category', 'Other')+ entry = {+ 'id': sid,+ 'name': meta.get('name', sid.replace('_', ' ').title()),+ 'params': meta.get('params', []),+ }+ grouped.setdefault(cat, []).append(entry)+ return groupeddiff --git a/fincept-qt/scripts/Analytics/backtesting/base/base_provider.py b/fincept-qt/scripts/Analytics/backtesting/base/base_provider.pyindex f4275bcbc..012343057 100644--- a/fincept-qt/scripts/Analytics/backtesting/base/base_provider.py+++ b/fincept-qt/scripts/Analytics/backtesting/base/base_provider.py@@ -386,8 +386,15 @@ class BacktestingProviderBase(ABC):}def _log(self, message: str) -> None:- """Log message"""- print(f"[{self.name}] {message}")+ """Log message.++ Routed to stderr so the C++ host's `extract_json` (which scans stdout+ for the first '{' or '[') is never fooled by a leading bracket from+ a log line like "[Backtesting.py] Starting...". Stdout is reserved+ exclusively for the final JSON response.+ """+ import sys+ print(f"[{self.name}] {message}", file=sys.stderr)def _error(self, message: str, exception: Optional[Exception] = None) -> None:"""Log error message"""diff --git a/fincept-qt/scripts/Analytics/backtesting/bt/bt_provider.py b/fincept-qt/scripts/Analytics/backtesting/bt/bt_provider.pyindex d453b2219..d61eccc4e 100644--- a/fincept-qt/scripts/Analytics/backtesting/bt/bt_provider.py+++ b/fincept-qt/scripts/Analytics/backtesting/bt/bt_provider.py@@ -99,14 +99,19 @@ class BtProvider(BacktestingProviderBase):try:strategy_info = request.get('strategy', {})strategy_type = strategy_info.get('type', 'equal_weight')- strategy_params = strategy_info.get('parameters', {})+ # Frontend sends `params`; legacy callers used `parameters`.+ strategy_params = strategy_info.get('params') or strategy_info.get('parameters', {})start_date = request.get('startDate', '2020-01-01')end_date = request.get('endDate', '2024-01-01')initial_capital = float(request.get('initialCapital', 100000))commission = float(request.get('commission', 0.001))- assets = request.get('assets', [])- symbols = [a.get('symbol', 'SPY') for a in assets] if assets else ['SPY']+ # Canonical input: `symbols: [str]` (sent by the C++ screen).+ # `assets: [{symbol}]` accepted as a fallback for legacy callers.+ symbols = request.get('symbols', [])+ if not symbols:+ assets = request.get('assets', [])+ symbols = [a.get('symbol') for a in assets if isinstance(a, dict) and a.get('symbol')]if not symbols:symbols = ['SPY']@@ -216,7 +221,9 @@ class BtProvider(BacktestingProviderBase):'annualizedReturn': annual_return,'sharpeRatio': sharpe,'sortinoRatio': sortino,- 'maxDrawdown': max_dd,+ # Frontend renders maxDrawdown as a positive percentage; align with+ # vectorbt/backtestingpy by emitting its magnitude.+ 'maxDrawdown': abs(max_dd),'winRate': win_rate,'lossRate': 1 - win_rate,'profitFactor': abs(float(daily_rets[daily_rets > 0].sum()) / float(daily_rets[daily_rets < 0].sum())) if losing_days > 0 else 0,@@ -371,7 +378,8 @@ class BtProvider(BacktestingProviderBase):'annualizedReturn': float(annual_return),'sharpeRatio': float(sharpe),'sortinoRatio': float(sortino),- 'maxDrawdown': float(max_dd),+ # Magnitude (positive) — aligns with other providers' convention.+ 'maxDrawdown': abs(float(max_dd)),'winRate': float(win_rate),'lossRate': float(1 - win_rate),'profitFactor': float(profit_factor),@@ -540,66 +548,81 @@ class BtProvider(BacktestingProviderBase):# ========================================================================def optimize(self, request: Dict[str, Any]) -> Dict[str, Any]:- """Grid or random search optimization."""+ """Grid or random search optimization.++ Returns the same wire shape as run_backtest (`data.performance`,+ `data.trades`, `data.equity`) populated from the *winning* iteration,+ plus an `optimization` block with the chosen params and metric.+ """import numpy as nptry:strategy_info = request.get('strategy', {})- strategy_type = strategy_info.get('type', 'sma_crossover')+ strategy_type = strategy_info.get('type', 'equal_weight')start_date = request.get('startDate', '2020-01-01')end_date = request.get('endDate', '2024-01-01')initial_capital = float(request.get('initialCapital', 100000))- objective = request.get('objective', 'sharpe')- method = request.get('method', 'grid')- max_iter = int(request.get('maxIterations', 100))- param_ranges = request.get('parameters', {})+ commission = float(request.get('commission', 0.001))+ # Frontend sends `optimizeObjective` / `optimizeMethod` / `paramRanges`;+ # legacy callers used `objective` / `method` / `parameters`.+ objective = request.get('optimizeObjective') or request.get('objective', 'sharpe')+ method = request.get('optimizeMethod') or request.get('method', 'grid')+ max_iter = int(request.get('maxIterations', 100) or 100)+ param_ranges = request.get('paramRanges', {}) or request.get('parameters', {})++ symbols = request.get('symbols', [])+ if not symbols:+ assets = request.get('assets', [])+ symbols = [a.get('symbol') for a in assets if isinstance(a, dict) and a.get('symbol')]+ if not symbols:+ symbols = ['SPY']- assets = request.get('assets', [])- symbols = [a.get('symbol', 'SPY') for a in assets] if assets else ['SPY']+ if not param_ranges:+ return self._create_error_result('No parameter ranges supplied (expected paramRanges)')combos = self._generate_param_combos(param_ranges, method, max_iter)+ if not combos:+ return self._create_error_result('paramRanges produced zero combinations')best_score = -np.inf- best_params = {}+ best_params: Dict[str, Any] = {}best_result = None- all_results = []+ all_results: List[Dict[str, Any]] = []for i, combo in enumerate(combos):+ # bt_strategies reads frontend param names directly, so no+ # name translation needed. Pass through the trial combo.bt_request = {- 'strategy': {'type': strategy_type, 'parameters': combo},+ 'strategy': {'type': strategy_type, 'params': combo},+ 'symbols': symbols,'startDate': start_date,'endDate': end_date,'initialCapital': initial_capital,- 'commission': 0.001,- 'assets': [{'symbol': s} for s in symbols],+ 'commission': commission,}-result = self.run_backtest(bt_request)-score = self._get_objective_score(result, objective)- all_results.append({- 'parameters': combo,- 'score': score,- 'iteration': i,- })+ all_results.append({'parameters': combo, 'score': score, 'iteration': i})if score > best_score:best_score = scorebest_params = combobest_result = result- return {- 'success': True,- 'data': {- 'id': self._generate_id(),- 'status': 'completed',- 'bestParameters': best_params,- 'bestScore': float(best_score),- 'bestResult': best_result.get('data', {}) if best_result else {},- 'allResults': all_results[:50],- 'iterations': len(combos),- },+ # Use the best iteration's data as the surfaceable result so the+ # screen's display_result() renders performance/trades.+ data = (best_result or {}).get('data') or {}+ data.setdefault('id', self._generate_id())+ data.setdefault('status', 'completed')+ data['optimization'] = {+ 'objective': objective,+ 'method': method,+ 'objective_value': float(best_score) if best_score != -np.inf else 0.0,+ 'best_params': best_params,+ 'iterations': len(combos),+ 'all_results': all_results[:100], # cap to keep payload small}+ return {'success': True, 'message': 'Optimization completed', 'data': data}except Exception as e:return {'success': False, 'error': str(e), 'traceback': traceback.format_exc()}@@ -609,31 +632,48 @@ class BtProvider(BacktestingProviderBase):# ========================================================================def walk_forward(self, request: Dict[str, Any]) -> Dict[str, Any]:- """Walk-forward analysis with train/test splits."""+ """Walk-forward analysis with train/test splits.++ Surfaces the *last fold's test result* in run_backtest shape so the+ screen renders performance/trades, plus per-fold detail in+ `data.walk_forward.folds`.+ """import numpy as np- import pandas as pdtry:strategy_info = request.get('strategy', {})- strategy_type = strategy_info.get('type', 'sma_crossover')- strategy_params = strategy_info.get('parameters', {})+ strategy_type = strategy_info.get('type', 'equal_weight')+ # Frontend sends params under `params`; legacy callers used `parameters`.+ strategy_params = strategy_info.get('params') or strategy_info.get('parameters', {})start_date = request.get('startDate', '2020-01-01')end_date = request.get('endDate', '2024-01-01')initial_capital = float(request.get('initialCapital', 100000))- n_splits = int(request.get('nSplits', 5))- train_ratio = float(request.get('trainRatio', 0.7))+ commission = float(request.get('commission', 0.001))+ # Frontend sends `wfSplits` / `wfTrainRatio`; legacy fallbacks supported.+ n_splits = int(request.get('wfSplits', request.get('nSplits', 5)) or 5)+ train_ratio = float(request.get('wfTrainRatio', request.get('trainRatio', 0.7)) or 0.7)++ symbols = request.get('symbols', [])+ if not symbols:+ assets = request.get('assets', [])+ symbols = [a.get('symbol') for a in assets if isinstance(a, dict) and a.get('symbol')]+ if not symbols:+ symbols = ['SPY']- assets = request.get('assets', [])- symbols = [a.get('symbol', 'SPY') for a in assets] if assets else ['SPY']+ if not (1 <= n_splits <= 20):+ return self._create_error_result(f'wfSplits must be between 1 and 20 (got {n_splits})')+ if not (0.1 <= train_ratio <= 0.95):+ return self._create_error_result(f'wfTrainRatio must be between 0.1 and 0.95 (got {train_ratio})')from bt_data import fetch_datadata = fetch_data(symbols, start_date, end_date)if data.empty:- return {'success': False, 'error': 'No data available'}+ return self._create_error_result('No data available')n = len(data)split_size = n // n_splits- results = []+ folds: List[Dict[str, Any]] = []+ last_result = Nonefor i in range(n_splits):split_start = i * split_size@@ -645,45 +685,46 @@ class BtProvider(BacktestingProviderBase):test_start_date = data.index[min(train_end, n - 1)].strftime('%Y-%m-%d')test_end_date = data.index[min(split_end - 1, n - 1)].strftime('%Y-%m-%d')+ # Run a backtest on the test slice using the supplied params.+ # (bt's portfolio strategies don't optimize per fold here — this+ # measures parameter robustness across periods.)test_request = {- 'strategy': {'type': strategy_type, 'parameters': strategy_params},+ 'strategy': {'type': strategy_type, 'params': strategy_params},+ 'symbols': symbols,'startDate': test_start_date,'endDate': test_end_date,'initialCapital': initial_capital,- 'commission': 0.001,- 'assets': [{'symbol': s} for s in symbols],+ 'commission': commission,}-result = self.run_backtest(test_request)+ last_result = resultperf = result.get('data', {}).get('performance', {})- results.append({- 'split': i + 1,+ folds.append({+ 'fold': i,'trainStart': train_start_date,'trainEnd': train_end_date,'testStart': test_start_date,'testEnd': test_end_date,- 'totalReturn': perf.get('totalReturn', 0),- 'sharpeRatio': perf.get('sharpeRatio', 0),- 'maxDrawdown': perf.get('maxDrawdown', 0),+ 'testReturn': float(perf.get('totalReturn', 0)),+ 'testSharpe': float(perf.get('sharpeRatio', 0)),+ 'testMaxDrawdown': float(perf.get('maxDrawdown', 0)),})- avg_return = np.mean([r['totalReturn'] for r in results])- avg_sharpe = np.mean([r['sharpeRatio'] for r in results])-- return {- 'success': True,- 'data': {- 'id': self._generate_id(),- 'status': 'completed',- 'splits': results,- 'summary': {- 'averageReturn': float(avg_return),- 'averageSharpe': float(avg_sharpe),- 'nSplits': n_splits,- },- },+ if not folds or last_result is None:+ return self._create_error_result('No usable folds')++ data_out = (last_result or {}).get('data') or {}+ data_out.setdefault('id', self._generate_id())+ data_out.setdefault('status', 'completed')+ data_out['walk_forward'] = {+ 'n_splits': n_splits,+ 'train_ratio': train_ratio,+ 'folds': folds,+ 'mean_test_return': float(np.mean([f['testReturn'] for f in folds])),+ 'mean_test_sharpe': float(np.mean([f['testSharpe'] for f in folds])),}+ return {'success': True, 'message': 'Walk-forward completed', 'data': data_out}except Exception as e:return {'success': False, 'error': str(e), 'traceback': traceback.format_exc()}diff --git a/fincept-qt/scripts/Analytics/backtesting/fasttrade/fasttrade_provider.py b/fincept-qt/scripts/Analytics/backtesting/fasttrade/fasttrade_provider.pyindex 688973951..b6cfacb6a 100644--- a/fincept-qt/scripts/Analytics/backtesting/fasttrade/fasttrade_provider.py+++ b/fincept-qt/scripts/Analytics/backtesting/fasttrade/fasttrade_provider.py@@ -236,11 +236,19 @@ class FastTradeProvider(BacktestingProviderBase):start_date = request.get('startDate')end_date = request.get('endDate')initial_capital = request.get('initialCapital', 10000)- assets = request.get('assets', [])- parameters = strategy_def.get('parameters', {})+ # Frontend sends params under `params`; legacy callers used `parameters`.+ parameters = strategy_def.get('params') or strategy_def.get('parameters', {})++ # Canonical input: `symbols: [str]`. Fallback: `assets: [{symbol}]`.+ symbols = request.get('symbols', [])+ if not symbols:+ assets = request.get('assets', [])+ symbols = [a.get('symbol') for a in assets if isinstance(a, dict) and a.get('symbol')]+ # _prepare_data still expects an assets-like list; build a minimal one.+ assets_for_data = [{'symbol': s} for s in symbols] if symbols else []# Generate or load data- data = self._prepare_data(assets, start_date, end_date)+ data = self._prepare_data(assets_for_data, start_date, end_date)# Build fast-trade configuration (without data in config)ft_config = self._build_fasttrade_config(@@ -261,13 +269,33 @@ class FastTradeProvider(BacktestingProviderBase):else:data_ft = data.copy()- # Run backtest using our wrapper (pass data separately)+ # Run backtest using our wrapper (pass data separately).+ #+ # fast-trade 2.0.0 has a bug in build_summary -> calculate_trade_streaks+ # that crashes with IndexError when zero trades are produced. Retry+ # without summary in that case and synthesise the missing summary+ # ourselves so the user still gets a usable empty result instead+ # of an error banner.self._log('Executing fast-trade backtest...')- result = ft_run(backtest=ft_config, df=data_ft, summary=True)+ try:+ result = ft_run(backtest=ft_config, df=data_ft, summary=True)+ except IndexError as ie:+ self._log(f'fast-trade summary crashed (likely zero trades): {ie}; retrying without summary')+ result = ft_run(backtest=ft_config, df=data_ft, summary=False)+ # Provide a minimal empty summary so _convert_result has something to read.+ if isinstance(result, dict) and 'summary' not in result:+ result['summary'] = {+ 'num_trades': 0, 'win_perc': 0, 'loss_perc': 0,+ 'total_return': 0, 'avg_win': 0, 'avg_loss': 0,+ 'best_trade': 0, 'worst_trade': 0, 'sharpe': 0,+ 'sortino': 0, 'max_drawdown': 0, 'calmar': 0,+ }# Convert result to standard format+ symbol_for_trades = symbols[0] if symbols else 'ASSET'backtest_result = self._convert_result(- result, request.get('id', self._generate_id())+ result, request.get('id', self._generate_id()),+ symbol=symbol_for_trades,)result_dict = backtest_result.to_dict()@@ -424,10 +452,12 @@ class FastTradeProvider(BacktestingProviderBase):config['base_balance'] = initial_capitalelse:- # Default to simple buy and hold+ # Default to simple buy and hold. We feed daily yfinance data+ # below ('1d' interval), so the freq must match — '1D' (capital)+ # is fast-trade's accepted form for daily.config = {'base_balance': initial_capital,- 'freq': '1H',+ 'freq': '1D','comission': 0.001,'datapoints': [],'enter': [['close', '>', 0]],@@ -437,9 +467,19 @@ class FastTradeProvider(BacktestingProviderBase):# Do NOT add data to config - it will be passed separately to ft_run(backtest, df=data)# This prevents fast-trade from trying to download data- # Add start_date for validation purposes only (won't trigger download without symbol)+ # The ft_strategies builders default to `freq='1H'`, but our yfinance+ # loader fetches daily bars. Override here so fast-trade's resample+ # step doesn't choke (also note pandas 2.2 deprecated lowercase 'h';+ # fast-trade accepts the capital '1D' form for daily).+ config['freq'] = '1D'++ # fast-trade ≥0.2 requires `start` and `stop` (not the deprecated+ # `start_date`/`end_date`). The dataframe is the source of truth, so+ # use the data's actual range when caller-supplied dates are missing.if start_date:- config['start_date'] = start_date+ config['start'] = start_date+ if end_date:+ config['stop'] = end_datereturn config@@ -447,69 +487,113 @@ class FastTradeProvider(BacktestingProviderBase):# Result Conversion# ========================================================================- def _convert_result(self, ft_result: Dict[str, Any], backtest_id: str) -> BacktestResult:+ def _convert_result(self, ft_result: Dict[str, Any], backtest_id: str, symbol: str = 'ASSET') -> BacktestResult:+ """Convert a fast-trade 2.0 result dict to our standard BacktestResult.++ Fast-trade emits metrics in a few different places:+ - top-level summary (`return_perc`, `sharpe_ratio`, `max_drawdown`+ in DOLLARS, `win_perc`, `loss_perc`, `num_trades`, ...)+ - `summary.risk_metrics` (`sortino_ratio`, `calmar_ratio`,+ `annualized_volatility`)+ - `summary.drawdown_metrics` (`max_drawdown_pct` in PERCENT,+ `max_drawdown_duration` in bars)+ - `summary.trade_quality` (`profit_factor`,+ `largest_winning_trade`, `largest_losing_trade`)++ We translate them all to the canonical PerformanceMetrics dataclass+ whose values are fractions in [-1, 1] (or magnitudes for drawdown),+ matching the convention used by every other provider."""- Convert fast-trade result to standard BacktestResult format- """- summary = ft_result.get('summary', {})+ summary = ft_result.get('summary', {}) or {}df = ft_result.get('df', pd.DataFrame())trade_df = ft_result.get('trade_df', pd.DataFrame())- # Extract performance metrics+ risk = summary.get('risk_metrics') or {}+ dd = summary.get('drawdown_metrics') or {}+ quality = summary.get('trade_quality') or {}++ # Total return: fast-trade emits as a percent (e.g. 10.85 for 10.85%).+ return_perc = float(summary.get('return_perc', 0) or 0)+ total_return = return_perc / 100.0++ # Days in the test: prefer counting bars in df since `total_days`+ # doesn't exist in fast-trade 2.0's summary.+ if not df.empty:+ try:+ first = pd.Timestamp(summary.get('first_tic') or df.index[0])+ last = pd.Timestamp(summary.get('last_tic') or df.index[-1])+ total_days = max(1, (last - first).days)+ except Exception:+ total_days = max(1, len(df))+ else:+ total_days = 365++ win_perc = float(summary.get('win_perc', 0) or 0)+ loss_perc = float(summary.get('loss_perc', 0) or 0)+ num_trades = int(summary.get('num_trades', 0) or 0)++ # max_drawdown: fast-trade reports the dollar magnitude at top level+ # but a percent under drawdown_metrics — we want a positive fraction.+ dd_pct = dd.get('max_drawdown_pct')+ if dd_pct is not None:+ max_drawdown = abs(float(dd_pct)) / 100.0+ else:+ max_drawdown = 0.0+performance = PerformanceMetrics(- total_return=summary.get('return_perc', 0) / 100,- annualized_return=self._calculate_annualized_return(- summary.get('return_perc', 0) / 100,- summary.get('total_days', 365)- ),- sharpe_ratio=summary.get('sharpe_ratio', 0),- sortino_ratio=summary.get('sortino_ratio', 0),- max_drawdown=summary.get('max_drawdown', 0),- win_rate=summary.get('win_perc', 0) / 100,- loss_rate=summary.get('loss_perc', 0) / 100,- profit_factor=self._calculate_profit_factor(summary),- volatility=0.0, # Not directly provided by fast-trade- calmar_ratio=summary.get('calmar_ratio', 0),- total_trades=summary.get('num_trades', 0),- winning_trades=int(summary.get('num_trades', 0) * summary.get('win_perc', 0) / 100),- losing_trades=int(summary.get('num_trades', 0) * summary.get('loss_perc', 0) / 100),- average_win=summary.get('avg_win', 0),- average_loss=summary.get('avg_loss', 0),- largest_win=summary.get('max_win', 0),- largest_loss=summary.get('max_loss', 0),- average_trade_return=summary.get('avg_trade', 0),- expectancy=summary.get('expectancy', 0),+ total_return=total_return,+ annualized_return=self._calculate_annualized_return(total_return, total_days),+ sharpe_ratio=float(summary.get('sharpe_ratio', 0) or 0),+ sortino_ratio=float(risk.get('sortino_ratio', 0) or 0),+ max_drawdown=max_drawdown,+ win_rate=win_perc / 100.0,+ loss_rate=loss_perc / 100.0,+ profit_factor=float(quality.get('profit_factor', 0) or 0),+ volatility=float(risk.get('annualized_volatility', 0) or 0),+ calmar_ratio=float(risk.get('calmar_ratio', 0) or 0),+ total_trades=num_trades,+ winning_trades=int(summary.get('total_num_winning_trades', 0) or 0),+ losing_trades=int(summary.get('total_num_losing_trades', 0) or 0),+ average_win=float(summary.get('avg_win_perc', 0) or 0) / 100.0,+ average_loss=float(summary.get('avg_loss_perc', 0) or 0) / 100.0,+ largest_win=float(quality.get('largest_winning_trade', summary.get('best_trade_perc', 0)) or 0),+ largest_loss=float(quality.get('largest_losing_trade', summary.get('min_trade_perc', 0)) or 0),+ average_trade_return=float(summary.get('mean_trade_perc', 0) or 0),+ expectancy=0.0, # not reported by fast-tradealpha=None,beta=None,- max_drawdown_duration=None,+ max_drawdown_duration=int(dd.get('max_drawdown_duration', 0) or 0),information_ratio=None,- treynor_ratio=None+ treynor_ratio=None,)# Extract trades- trades = self._extract_trades(trade_df)+ trades = self._extract_trades(trade_df, symbol=symbol)# Extract equity curveequity = self._extract_equity_curve(df)# Build statistics+ # Fast-trade 2.0 puts equity at top level: equity_peak/equity_final.+ # Initial capital comes from the config we sent (base_balance).+ initial_capital = float(ft_result.get('backtest', {}).get('base_balance', 10000) or 10000)statistics = BacktestStatistics(- start_date=str(df.index[0]) if len(df) > 0 else '',- end_date=str(df.index[-1]) if len(df) > 0 else '',- initial_capital=summary.get('starting_balance', 10000),- final_capital=summary.get('ending_balance', 10000),- total_fees=summary.get('total_comission', 0),+ start_date=str(summary.get('first_tic', df.index[0] if len(df) else '')),+ end_date=str(summary.get('last_tic', df.index[-1] if len(df) else '')),+ initial_capital=initial_capital,+ final_capital=float(summary.get('equity_final', initial_capital) or initial_capital),+ total_fees=float(summary.get('total_fees', 0) or 0),total_slippage=0.0, # Not tracked by fast-trade- total_trades=summary.get('num_trades', 0),+ total_trades=int(summary.get('num_trades', 0) or 0),winning_days=0, # Not directly providedlosing_days=0,average_daily_return=0.0,best_day=0.0,worst_day=0.0,- consecutive_wins=summary.get('trade_streaks', {}).get('max_win_streak', 0),- consecutive_losses=summary.get('trade_streaks', {}).get('max_loss_streak', 0),+ consecutive_wins=int(summary.get('trade_streaks', {}).get('max_win_streak', 0) or 0),+ consecutive_losses=int(summary.get('trade_streaks', {}).get('max_loss_streak', 0) or 0),max_drawdown_date=None,- recovery_time=None+ recovery_time=None,)# Build result@@ -535,64 +619,85 @@ class FastTradeProvider(BacktestingProviderBase):return result- def _extract_trades(self, trade_df: pd.DataFrame) -> List[Trade]:- """Extract trade list from fast-trade trade dataframe"""- trades = []+ def _extract_trades(self, trade_df: pd.DataFrame, symbol: str = 'ASSET') -> List[Trade]:+ """Extract trade list from fast-trade 2.0's enriched dataframe.- if trade_df.empty:+ fast-trade emits a single dataframe (returned as both `df` and+ `trade_df`) where the `action` column carries one-letter codes:+ 'e' = enter, 'x' = exit, 'h' = hold (no signal).+ Position size is in `aux`, equity in `account_value`/`adj_account_value`.+ We pair each enter with the next subsequent exit to form Trade records.+ """+ trades: List[Trade] = []+ if trade_df.empty or 'action' not in trade_df.columns:return trades- # Fast-trade outputs trades with 'action' column ('enter' or 'exit')- entries = trade_df[trade_df['action'] == 'enter']- exits = trade_df[trade_df['action'] == 'exit']-- for i, (entry_idx, entry) in enumerate(entries.iterrows()):- # Find matching exit- exit_row = None- if i < len(exits):- exit_idx = exits.index[i]- exit_row = exits.loc[exit_idx]-- trade = Trade(- id=f'trade-{i+1}',- symbol='ASSET',- entry_date=str(entry_idx),- side='long',- quantity=entry.get('amount', 0),- entry_price=entry.get('close', 0),- commission=entry.get('comission', 0),- slippage=0.0,- exit_date=str(exit_row.name) if exit_row is not None else None,- exit_price=exit_row.get('close', 0) if exit_row is not None else None,- pnl=exit_row.get('pnl', 0) if exit_row is not None else None,- pnl_percent=None,- holding_period=None,- exit_reason='signal' if exit_row is not None else None- )-- trades.append(trade)-+ # Walk in time order, keeping at most one open position at a time.+ open_entry = None+ for ts, row in trade_df.iterrows():+ action = row.get('action')+ close = float(row.get('close', 0) or 0)+ if action == 'e' and open_entry is None:+ open_entry = (ts, close, float(row.get('aux', 0) or 0), float(row.get('fee', 0) or 0))+ elif action == 'x' and open_entry is not None:+ entry_ts, entry_price, qty, entry_fee = open_entry+ exit_fee = float(row.get('fee', 0) or 0)+ pnl = (close - entry_price) * qty - (entry_fee + exit_fee)+ pnl_pct = ((close / entry_price) - 1.0) if entry_price else 0.0+ try:+ holding = (pd.Timestamp(ts) - pd.Timestamp(entry_ts)).days+ except Exception:+ holding = None+ trades.append(Trade(+ id=f'trade-{len(trades) + 1}',+ symbol=symbol,+ entry_date=str(entry_ts),+ side='long',+ quantity=qty,+ entry_price=entry_price,+ commission=entry_fee + exit_fee,+ slippage=0.0,+ exit_date=str(ts),+ exit_price=close,+ pnl=pnl,+ pnl_percent=pnl_pct,+ holding_period=holding,+ exit_reason='signal',+ ))+ open_entry = Nonereturn tradesdef _extract_equity_curve(self, df: pd.DataFrame) -> List[EquityPoint]:- """Extract equity curve from fast-trade dataframe"""- equity_points = []+ """Extract equity curve from fast-trade 2.0 dataframe.+ Equity column is `adj_account_value` (commission-adjusted) preferred+ over `account_value`. Drawdown is computed from the running maximum.+ """+ equity_points: List[EquityPoint] = []if df.empty:return equity_points- # Fast-trade includes 'total' column for equity- if 'total' in df.columns:- for date, row in df.iterrows():- point = EquityPoint(- date=str(date),- equity=row['total'],- returns=0.0, # Would need to calculate- drawdown=0.0, # Would need to calculate- benchmark=None- )- equity_points.append(point)+ equity_col = 'adj_account_value' if 'adj_account_value' in df.columns else (+ 'account_value' if 'account_value' in df.columns else None+ )+ if equity_col is None:+ return equity_points+ equity_series = df[equity_col].astype(float)+ running_max = equity_series.cummax()+ # Avoid divide-by-zero on the first bar / non-positive equity.+ rm_safe = running_max.where(running_max > 0, 1.0)+ drawdown = (equity_series - running_max) / rm_safe+ returns = equity_series.pct_change().fillna(0.0)++ for date, eq, ret, dd in zip(df.index, equity_series, returns, drawdown):+ equity_points.append(EquityPoint(+ date=str(date),+ equity=float(eq),+ returns=float(ret),+ drawdown=float(dd),+ benchmark=None,+ ))return equity_pointsdef _calculate_annualized_return(self, total_return: float, days: int) -> float:diff --git a/fincept-qt/scripts/Analytics/backtesting/fincept/fincept_provider.py b/fincept-qt/scripts/Analytics/backtesting/fincept/fincept_provider.pyindex b9b5a4949..2dfebb7ff 100644--- a/fincept-qt/scripts/Analytics/backtesting/fincept/fincept_provider.py+++ b/fincept-qt/scripts/Analytics/backtesting/fincept/fincept_provider.py@@ -1,22 +1,177 @@#!/usr/bin/env python3"""Fincept Engine Backtesting Provider-Executes strategies from the 418+ Fincept Terminal strategy registry+Executes strategies from the 418+ Fincept Terminal strategy registry.++Wire shape (matches other providers — see base/base_provider.py::json_response):+ Success: {"success": true, "data": {"performance": {...}, "trades": [...],+ "equity": [...], "statistics": {...}, ...}}+ Failure: {"success": false, "error": "...", "traceback": "..."}++Stdout is reserved exclusively for the final JSON payload — every diagnostic+goes to stderr so the C++ host's `extract_json` never picks up a leading '['+from a log line like "[Fincept Engine] Executing..."."""import sysimport json+import mathfrom pathlib import Pathfrom datetime import datetime, timedelta-from typing import Dict, Any, List+from typing import Dict, Any, List, Optional# Add pathsBASE_DIR = Path(__file__).resolve().parent.parentSTRATEGIES_DIR = BASE_DIR.parent.parent / "strategies"sys.path.insert(0, str(STRATEGIES_DIR))sys.path.insert(0, str(BASE_DIR / "base"))+# For json_response (camelCase conversion + NaN sanitisation, shared with the+# other providers).+sys.path.insert(0, str(BASE_DIR))from fincept_strategy_runner import FinceptStrategyRunner+from base.base_provider import json_response, parse_json_input+++def _log(msg: str) -> None:+ """All provider diagnostics route to stderr to keep stdout JSON-clean."""+ print(f"[Fincept Engine] {msg}", file=sys.stderr)+++def _safe_float(x, default: float = 0.0) -> float:+ """Coerce to float; return default for NaN/Inf/None/non-numeric."""+ try:+ f = float(x)+ if math.isnan(f) or math.isinf(f):+ return default+ return f+ except (TypeError, ValueError):+ return default+++# Frontend's display_result() reads these performance keys (all in fraction+# form, e.g. 0.12 = 12%). Other providers all emit them via _enrich_metrics.+def _enrich_metrics_from_equity(+ runner_perf: Dict[str, Any],+ equity_curve: List[Dict[str, Any]],+ trades: List[Dict[str, Any]],+ initial_capital: float,+) -> Dict[str, Any]:+ """Expand the runner's bare 6-key performance dict into the full set the+ frontend (and every other provider) expects, computing missing metrics+ from the equity curve.+ """+ # Convert equity curve into per-bar returns and drawdowns.+ eq_values = []+ for pt in equity_curve or []:+ v = pt.get('equity') if isinstance(pt, dict) else None+ if v is not None:+ eq_values.append(_safe_float(v))+ if not eq_values:+ eq_values = [initial_capital]++ daily_returns: List[float] = []+ for i in range(1, len(eq_values)):+ prev = eq_values[i - 1]+ if prev > 0:+ daily_returns.append((eq_values[i] - prev) / prev)+ else:+ daily_returns.append(0.0)++ # Drawdown from running max.+ peak = eq_values[0] if eq_values else initial_capital+ max_dd = 0.0+ for v in eq_values:+ if v > peak:+ peak = v+ if peak > 0:+ dd = (peak - v) / peak+ if dd > max_dd:+ max_dd = dd++ # Sharpe / Sortino — annualised (252 trading days).+ sharpe = 0.0+ sortino = 0.0+ volatility = 0.0+ if daily_returns:+ n = len(daily_returns)+ mean_r = sum(daily_returns) / n+ var = sum((r - mean_r) ** 2 for r in daily_returns) / max(1, n - 1)+ std = math.sqrt(var)+ ann_factor = math.sqrt(252)+ if std > 1e-12:+ sharpe = (mean_r * 252) / (std * ann_factor)+ volatility = std * ann_factor++ downside = [r for r in daily_returns if r < 0]+ if downside:+ d_var = sum(r ** 2 for r in downside) / len(downside)+ d_std = math.sqrt(d_var)+ if d_std > 1e-12:+ sortino = (mean_r * 252) / (d_std * ann_factor)++ # Total return / annualised return.+ total_return = _safe_float(runner_perf.get('total_return'))+ if total_return == 0.0 and eq_values:+ first = eq_values[0]+ last = eq_values[-1]+ if first > 0:+ total_return = (last - first) / first+ days = max(1, len(eq_values))+ years = days / 252.0+ annualized_return = ((1 + total_return) ** (1 / years) - 1) if years > 0 else total_return++ calmar = (annualized_return / max_dd) if max_dd > 1e-12 else 0.0++ # Trade-level stats.+ total_trades = int(runner_perf.get('total_trades', len(trades) if trades else 0))+ pnls: List[float] = []+ for t in trades or []:+ # Runner emits trades with quantity/price/type — no direct pnl.+ # Callers may pass pre-computed pnl; otherwise default to 0.+ if isinstance(t, dict) and 'pnl' in t:+ pnls.append(_safe_float(t.get('pnl')))+ wins = [p for p in pnls if p > 0]+ losses = [p for p in pnls if p < 0]+ winning_trades = len(wins)+ losing_trades = len(losses)+ win_rate = (winning_trades / total_trades) if total_trades > 0 else 0.0+ loss_rate = (losing_trades / total_trades) if total_trades > 0 else 0.0+ average_win = (sum(wins) / len(wins)) if wins else 0.0+ average_loss = (sum(losses) / len(losses)) if losses else 0.0+ largest_win = max(wins) if wins else 0.0+ largest_loss = min(losses) if losses else 0.0+ gross_profit = sum(wins) if wins else 0.0+ gross_loss = abs(sum(losses)) if losses else 0.0+ profit_factor = (gross_profit / gross_loss) if gross_loss > 1e-12 else 0.0++ return {+ 'total_return': total_return,+ 'annualized_return': annualized_return,+ 'sharpe_ratio': sharpe,+ 'sortino_ratio': sortino,+ 'max_drawdown': max_dd,+ 'win_rate': win_rate,+ 'loss_rate': loss_rate,+ 'profit_factor': profit_factor,+ 'volatility': volatility,+ 'calmar_ratio': calmar,+ 'total_trades': total_trades,+ 'winning_trades': winning_trades,+ 'losing_trades': losing_trades,+ 'average_win': average_win,+ 'average_loss': average_loss,+ 'largest_win': largest_win,+ 'largest_loss': largest_loss,+ 'average_trade_return': (sum(pnls) / len(pnls)) if pnls else 0.0,+ 'expectancy': win_rate * average_win + loss_rate * average_loss,+ # Strategy metadata kept on the perf dict for parity with the+ # original (lighter) shape.+ 'strategy_id': runner_perf.get('strategy_id'),+ 'strategy_name': runner_perf.get('strategy_name'),+ 'final_equity': _safe_float(runner_perf.get('final_equity', eq_values[-1] if eq_values else initial_capital)),+ 'initial_cash': _safe_float(runner_perf.get('initial_cash', initial_capital)),+ }class FinceptProvider:@@ -46,7 +201,13 @@ class FinceptProvider:return {'indicators': {}}def get_command_options(self, request: Dict[str, Any]) -> Dict[str, Any]:- """Return provider-specific option lists."""+ """Return provider-specific option lists.++ Keys are snake_case here so we don't depend on json_response's camelCase+ conversion — but the C++ frontend's `pick(camel, snake)` helper+ (BacktestingScreen.cpp::on_command_options_loaded) tries both forms,+ so this is a safety belt; either form works.+ """return {'success': True,'data': {@@ -61,102 +222,360 @@ class FinceptProvider:},}- def run_backtest(self, request: Dict[str, Any]) -> Dict[str, Any]:- """- Execute a backtest for a Fincept Engine strategy.-- Request format:- {- "strategy": {- "type": "FCT-XXXXX", # Strategy ID from registry- "name": "Strategy Name",- "parameters": {...} # Strategy-specific params+ # ------------------------------------------------------------------+ # Internal: single backtest execution returning a flattened result_dict+ # in the same shape the other providers emit (`performance`, `trades`,+ # `equity`, `statistics`).+ # ------------------------------------------------------------------+ def _execute_one(+ self,+ strategy_id: str,+ symbols: List[str],+ start_date: str,+ end_date: str,+ initial_capital: float,+ strategy_params: Dict[str, Any],+ ) -> Dict[str, Any]:+ strategy_info = self.runner.get_strategy_info(strategy_id)+ if not strategy_info:+ return {+ 'success': False,+ 'error': f'Strategy {strategy_id} not found in registry',+ }++ _log(f"Executing strategy: {strategy_info['name']}")+ _log(f"ID: {strategy_id}")+ _log(f"Category: {strategy_info.get('category')}")+ _log(f"Symbols: {symbols}")+ _log(f"Period: {start_date} to {end_date}")++ result = self.runner.execute_strategy(+ strategy_id=strategy_id,+ params={+ 'symbols': symbols,+ 'start_date': start_date,+ 'end_date': end_date,+ 'initial_cash': initial_capital,+ 'resolution': 'daily',+ 'strategy_params': strategy_params,+ },+ )++ if not result.get('success'):+ return {+ 'success': False,+ 'error': result.get('error', 'Unknown runner error'),+ 'traceback': result.get('traceback'),+ }++ # Runner returns {success: true, data: {performance, trades, equity}}.+ # Flatten — return just the inner data block plus computed metrics.+ inner = result.get('data') or {}+ runner_perf = inner.get('performance') or {}+ trades = inner.get('trades') or []+ equity = inner.get('equity') or []++ performance = _enrich_metrics_from_equity(runner_perf, equity, trades, initial_capital)++ # Build statistics block matching the dataclass other providers use.+ statistics = {+ 'start_date': start_date,+ 'end_date': end_date,+ 'initial_capital': float(initial_capital),+ 'final_capital': performance.get('final_equity', float(initial_capital)),+ 'total_fees': 0.0,+ 'total_slippage': 0.0,+ 'total_trades': performance['total_trades'],+ 'winning_days': 0,+ 'losing_days': 0,+ 'average_daily_return': 0.0,+ 'best_day': 0.0,+ 'worst_day': 0.0,+ 'consecutive_wins': 0,+ 'consecutive_losses': 0,+ }++ return {+ 'success': True,+ 'data': {+ 'id': strategy_id,+ 'status': 'completed',+ 'performance': performance,+ 'trades': trades,+ 'equity': equity,+ 'statistics': statistics,+ 'logs': [+ f"Fincept Engine backtest of {strategy_info['name']} ({strategy_id})",+ f"Symbols: {symbols}",+ f"Period: {start_date} to {end_date}",+ ],},- "symbols": ["BTC-USD", "ETH-USD"],- "startDate": "2025-01-01",- "endDate": "2026-01-01",- "initialCapital": 100000,- "assets": [{"symbol": "BTC-USD", ...}]}- """++ def _extract_request(self, request: Dict[str, Any]):+ """Pull canonical fields from a backtest/optimize/walk_forward request,+ accepting both new (`params`/`symbols`) and legacy (`parameters`/+ `assets`) names."""+ strategy_def = request.get('strategy', {}) or {}+ strategy_id = strategy_def.get('type')+ # Frontend sends `params`; legacy callers used `parameters`.+ strategy_params = strategy_def.get('params') or strategy_def.get('parameters', {}) or {}++ # Canonical: `symbols: [str]`. Fallback: `assets: [{symbol}]`.+ symbols = request.get('symbols') or []+ if not symbols and 'assets' in request:+ symbols = [a.get('symbol') for a in (request['assets'] or [])+ if isinstance(a, dict) and a.get('symbol')]++ start_date = request.get('startDate', '2025-01-01')+ end_date = request.get('endDate',+ (datetime.now() - timedelta(days=1)).strftime('%Y-%m-%d'))+ initial_capital = float(request.get('initialCapital', 100000) or 100000)+ return strategy_id, symbols, start_date, end_date, initial_capital, strategy_params++ def run_backtest(self, request: Dict[str, Any]) -> Dict[str, Any]:+ """Execute a single Fincept Engine strategy backtest."""try:- strategy_id = request.get("strategy", {}).get("type")+ strategy_id, symbols, start_date, end_date, initial_capital, strategy_params = (+ self._extract_request(request))+if not strategy_id:- return {- "success": False,- "error": "strategy.type (strategy ID) is required"- }-- # Validate strategy exists- strategy_info = self.runner.get_strategy_info(strategy_id)- if not strategy_info:- return {- "success": False,- "error": f"Strategy {strategy_id} not found in registry (418 strategies available)"- }-- # Extract parameters- symbols = request.get("symbols", [])- if not symbols and "assets" in request:- symbols = [asset["symbol"] for asset in request["assets"]]-- start_date = request.get("startDate", "2025-01-01")- end_date = request.get("endDate", (datetime.now() - timedelta(days=1)).strftime("%Y-%m-%d"))- initial_capital = request.get("initialCapital", 100000)- strategy_params = request.get("strategy", {}).get("parameters", {})-- print(f"[Fincept Engine] Executing strategy: {strategy_info['name']}")- print(f"[Fincept Engine] ID: {strategy_id}")- print(f"[Fincept Engine] Category: {strategy_info['category']}")- print(f"[Fincept Engine] Symbols: {symbols}")- print(f"[Fincept Engine] Period: {start_date} to {end_date}")-- # Execute strategy- result = self.runner.execute_strategy(- strategy_id=strategy_id,- params={- "symbols": symbols,- "start_date": start_date,- "end_date": end_date,- "initial_cash": initial_capital,- "resolution": "daily",- "strategy_params": strategy_params- }- )-- # Format response- if result.get("success"):- print(f"[Fincept Engine] Backtest completed successfully")- return {- "success": True,- "message": f"Backtest completed for {strategy_info['name']}",- "data": result- }- else:- return {- "success": False,- "error": result.get("error", "Unknown error"),- "details": result- }+ return {'success': False, 'error': 'strategy.type (strategy ID) is required'}+ if not symbols:+ return {'success': False, 'error': 'No symbols specified'}+ return self._execute_one(strategy_id, symbols, start_date, end_date,+ initial_capital, strategy_params)except Exception as e:import traceback- error_details = traceback.format_exc()- print(f"[Fincept Engine] Error: {e}", file=sys.stderr)- print(error_details, file=sys.stderr)- return {- "success": False,- "error": str(e),- "traceback": error_details+ tb = traceback.format_exc()+ print(f'[Fincept Engine] Error: {e}', file=sys.stderr)+ print(tb, file=sys.stderr)+ return {'success': False, 'error': str(e), 'traceback': tb}++ # ------------------------------------------------------------------+ # Optimize: grid or random search over user-supplied param ranges.+ # Surfaces winning iteration's data at `data.performance` so the screen's+ # display_result() renders, plus `data.optimization` block.+ # ------------------------------------------------------------------+ def optimize(self, request: Dict[str, Any]) -> Dict[str, Any]:+ try:+ import itertools+ import random++ strategy_id, symbols, start_date, end_date, initial_capital, strategy_params = (+ self._extract_request(request))+ if not strategy_id:+ return {'success': False, 'error': 'strategy.type (strategy ID) is required'}+ if not symbols:+ return {'success': False, 'error': 'No symbols specified'}++ # Frontend canonical names (fall back to legacy).+ param_ranges = request.get('paramRanges') or request.get('parameters') or {}+ objective = request.get('optimizeObjective') or request.get('objective', 'sharpe')+ method = request.get('optimizeMethod') or request.get('method', 'grid')+ max_iter = int(request.get('maxIterations', 50) or 50)++ if not param_ranges:+ return {'success': False, 'error': 'No parameter ranges supplied (expected paramRanges)'}++ # Build per-key value lists from {min, max, step} specs.+ def _native(x):+ try:+ fx = float(x)+ return int(fx) if fx.is_integer() else fx+ except (TypeError, ValueError):+ return x++ param_values: Dict[str, List[Any]] = {}+ for key, spec in param_ranges.items():+ if isinstance(spec, dict):+ mn = _native(spec.get('min', 0))+ mx = _native(spec.get('max', 100))+ step = _native(spec.get('step', 1)) or 1+ vals = []+ cur = mn+ while cur <= mx:+ vals.append(_native(cur))+ cur = _native(cur + step)+ param_values[key] = vals or [mn]+ elif isinstance(spec, list):+ param_values[key] = [_native(v) for v in spec]+ else:+ param_values[key] = [_native(spec)]++ keys = list(param_values.keys())+ value_lists = [param_values[k] for k in keys]+ if method == 'random':+ combos = []+ for _ in range(max_iter):+ combos.append({k: random.choice(param_values[k]) for k in keys})+ else: # grid+ combos = [dict(zip(keys, c)) for c in itertools.product(*value_lists)]+ if len(combos) > max_iter:+ random.shuffle(combos)+ combos = combos[:max_iter]++ if not combos:+ return {'success': False, 'error': 'paramRanges produced zero combinations'}++ metric_key = {+ 'sharpe': 'sharpe_ratio',+ 'sortino': 'sortino_ratio',+ 'calmar': 'calmar_ratio',+ 'return': 'total_return',+ }.get(objective, 'sharpe_ratio')++ best_score = -math.inf+ best_combo: Dict[str, Any] = {}+ best_result: Optional[Dict[str, Any]] = None+ all_results: List[Dict[str, Any]] = []++ for i, combo in enumerate(combos):+ merged_params = {**strategy_params, **combo}+ result = self._execute_one(+ strategy_id, symbols, start_date, end_date,+ initial_capital, merged_params,+ )+ if not result.get('success'):+ all_results.append({'parameters': combo, 'score': None, 'error': result.get('error')})+ continue+ perf = result['data']['performance']+ score = _safe_float(perf.get(metric_key, 0))+ all_results.append({+ 'parameters': combo,+ 'score': score,+ 'total_return': perf.get('total_return', 0),+ 'sharpe_ratio': perf.get('sharpe_ratio', 0),+ })+ if score > best_score:+ best_score = score+ best_combo = combo+ best_result = result++ if best_result is None:+ return {'success': False, 'error': 'All optimization iterations failed'}++ data = best_result['data']+ data['optimization'] = {+ 'objective': objective,+ 'method': method,+ 'objective_value': float(best_score) if best_score != -math.inf else 0.0,+ 'best_params': best_combo,+ 'iterations': len(combos),+ 'all_results': all_results[:100],}+ return {'success': True, 'message': 'Optimization completed', 'data': data}++ except Exception as e:+ import traceback+ tb = traceback.format_exc()+ print(f'[Fincept Engine] Optimize error: {e}', file=sys.stderr)+ print(tb, file=sys.stderr)+ return {'success': False, 'error': str(e), 'traceback': tb}++ # ------------------------------------------------------------------+ # Walk-forward: run the supplied params on N rolling test windows,+ # surface the last fold's result + per-fold detail.+ # ------------------------------------------------------------------+ def walk_forward(self, request: Dict[str, Any]) -> Dict[str, Any]:+ try:+ strategy_id, symbols, start_date, end_date, initial_capital, strategy_params = (+ self._extract_request(request))+ if not strategy_id:+ return {'success': False, 'error': 'strategy.type (strategy ID) is required'}+ if not symbols:+ return {'success': False, 'error': 'No symbols specified'}++ n_splits = int(request.get('wfSplits', request.get('nSplits', 5)) or 5)+ train_ratio = float(request.get('wfTrainRatio', request.get('trainRatio', 0.7)) or 0.7)+ if not (1 <= n_splits <= 20):+ return {'success': False, 'error': f'wfSplits must be between 1 and 20 (got {n_splits})'}+ if not (0.1 <= train_ratio <= 0.95):+ return {'success': False, 'error': f'wfTrainRatio must be between 0.1 and 0.95 (got {train_ratio})'}++ sd = datetime.strptime(start_date, '%Y-%m-%d')+ ed = datetime.strptime(end_date, '%Y-%m-%d')+ total_days = (ed - sd).days+ split_days = total_days // n_splits+ if split_days < 5:+ return {'success': False,+ 'error': f'Date range too short for {n_splits} folds ({total_days} days)'}++ folds: List[Dict[str, Any]] = []+ last_result: Optional[Dict[str, Any]] = None++ for i in range(n_splits):+ fold_start = sd + timedelta(days=i * split_days)+ fold_end = fold_start + timedelta(days=split_days)+ train_end = fold_start + timedelta(days=int(split_days * train_ratio))+ test_start = train_end+ test_end = fold_end++ # Fincept strategies are not parameterised per fold (no per-fold+ # optimize step) — this measures parameter robustness across+ # different time windows.+ result = self._execute_one(+ strategy_id, symbols,+ test_start.strftime('%Y-%m-%d'),+ test_end.strftime('%Y-%m-%d'),+ initial_capital, strategy_params,+ )+ if not result.get('success'):+ folds.append({+ 'fold': i,+ 'trainStart': fold_start.strftime('%Y-%m-%d'),+ 'trainEnd': train_end.strftime('%Y-%m-%d'),+ 'testStart': test_start.strftime('%Y-%m-%d'),+ 'testEnd': test_end.strftime('%Y-%m-%d'),+ 'error': result.get('error'),+ 'testReturn': 0.0,+ 'testSharpe': 0.0,+ 'testMaxDrawdown': 0.0,+ })+ continue+ last_result = result+ perf = result['data']['performance']+ folds.append({+ 'fold': i,+ 'trainStart': fold_start.strftime('%Y-%m-%d'),+ 'trainEnd': train_end.strftime('%Y-%m-%d'),+ 'testStart': test_start.strftime('%Y-%m-%d'),+ 'testEnd': test_end.strftime('%Y-%m-%d'),+ 'testReturn': _safe_float(perf.get('total_return')),+ 'testSharpe': _safe_float(perf.get('sharpe_ratio')),+ 'testMaxDrawdown': _safe_float(perf.get('max_drawdown')),+ })++ if last_result is None or not folds:+ return {'success': False, 'error': 'All walk-forward splits failed'}++ data = last_result['data']+ ok_folds = [f for f in folds if 'error' not in f]+ data['walk_forward'] = {+ 'n_splits': n_splits,+ 'train_ratio': train_ratio,+ 'folds': folds,+ 'mean_test_return': (sum(f['testReturn'] for f in ok_folds) / len(ok_folds)) if ok_folds else 0.0,+ 'mean_test_sharpe': (sum(f['testSharpe'] for f in ok_folds) / len(ok_folds)) if ok_folds else 0.0,+ }+ return {'success': True, 'message': 'Walk-forward completed', 'data': data}++ except Exception as e:+ import traceback+ tb = traceback.format_exc()+ print(f'[Fincept Engine] Walk-forward error: {e}', file=sys.stderr)+ print(tb, file=sys.stderr)+ return {'success': False, 'error': str(e), 'traceback': tb}def main():- """CLI entry point"""+ """CLI entry point. Stdout is reserved for the final JSON; everything+ diagnostic must go to stderr (see _log)."""if len(sys.argv) < 3:- print(json.dumps({- "success": False,- "error": "Usage: fincept_provider.py <command> <args_json>"+ print(json_response({+ 'success': False,+ 'error': 'Usage: fincept_provider.py <command> <args_json>',}))sys.exit(1)@@ -164,33 +583,35 @@ def main():args_json = sys.argv[2]try:- args = json.loads(args_json)- except json.JSONDecodeError as e:- print(json.dumps({- "success": False,- "error": f"Invalid JSON: {e}"+ args = parse_json_input(args_json)+ except Exception as e:+ print(json_response({+ 'success': False,+ 'error': f'Invalid JSON: {e}',}))sys.exit(1)provider = FinceptProvider()- # Route command- if command == "run_backtest" or command == "execute_fincept_strategy":+ if command in ('run_backtest', 'execute_fincept_strategy'):result = provider.run_backtest(args)- elif command == "get_strategies":+ elif command == 'optimize':+ result = provider.optimize(args)+ elif command == 'walk_forward':+ result = provider.walk_forward(args)+ elif command == 'get_strategies':result = provider.get_strategies(args)- elif command == "get_indicators":+ elif command == 'get_indicators':result = provider.get_indicators(args)- elif command == "get_command_options":+ elif command == 'get_command_options':result = provider.get_command_options(args)else:- result = {- "success": False,- "error": f"Unknown command: {command}"- }+ result = {'success': False, 'error': f'Unknown command: {command}'}- print(json.dumps(result))+ # json_response handles camelCase conversion + NaN/Inf sanitisation,+ # matching every other provider's wire format.+ print(json_response(result))-if __name__ == "__main__":+if __name__ == '__main__':main()diff --git a/fincept-qt/scripts/Analytics/backtesting/zipline/zipline_provider.py b/fincept-qt/scripts/Analytics/backtesting/zipline/zipline_provider.pyindex 0cf1e2e63..e570ab2d0 100644--- a/fincept-qt/scripts/Analytics/backtesting/zipline/zipline_provider.py+++ b/fincept-qt/scripts/Analytics/backtesting/zipline/zipline_provider.py@@ -28,14 +28,24 @@ import mathfrom typing import Dict, Any, List, Optionalfrom pathlib import Path-# Setup paths for both direct execution and package import+# Setup paths for both direct execution and package import.+#+# IMPORTANT: this folder is named `zipline/` to match the C++ host's path+# convention (Analytics/backtesting/<provider>/<provider>_provider.py), but+# that name shadows the real `zipline-reloaded` package on sys.path. Putting+# _BACKTESTING_DIR at the FRONT of sys.path makes `import zipline` resolve+# to this local folder, breaking every `from zipline.api import ...` call+# below. We therefore APPEND it instead — site-packages remains earlier on+# sys.path so the installed zipline-reloaded wins, while sibling imports+# like `from base.base_provider import ...` still work because nothing else+# on sys.path provides a `base` package._SCRIPT_DIR = Path(__file__).parent_BACKTESTING_DIR = _SCRIPT_DIR.parentif str(_BACKTESTING_DIR) not in sys.path:- sys.path.insert(0, str(_BACKTESTING_DIR))+ sys.path.append(str(_BACKTESTING_DIR))if str(_SCRIPT_DIR) not in sys.path:- sys.path.insert(0, str(_SCRIPT_DIR))+ sys.path.append(str(_SCRIPT_DIR))from base.base_provider import (BacktestingProviderBase,@@ -919,13 +929,13 @@ class ZiplineProvider(BacktestingProviderBase):# Parse requeststrategy_def = request.get('strategy', {})strategy_type = strategy_def.get('type', 'sma_crossover')- strategy_params = strategy_def.get('parameters', {})+ # Frontend sends params under `params`; legacy callers used `parameters`.+ strategy_params = strategy_def.get('params') or strategy_def.get('parameters', {})start_date = request.get('startDate', '2023-01-01')end_date = request.get('endDate', '2024-01-01')initial_capital = float(request.get('initialCapital', 100000))commission_rate = float(request.get('commission', 0.001))slippage_bps = float(request.get('slippage', 0.0))- assets = request.get('assets', [])# Commission/slippage model from requestcommission_model_type = request.get('commissionModel', 'per_dollar')@@ -936,7 +946,13 @@ class ZiplineProvider(BacktestingProviderBase):max_leverage = float(request.get('maxLeverage', 0)) or float('inf')benchmark = request.get('benchmark', None)- symbols = [a.get('symbol', 'SPY') for a in assets] if assets else ['SPY']+ # Canonical input: `symbols: [str]`. Fallback: `assets: [{symbol}]`.+ symbols = request.get('symbols', [])+ if not symbols:+ assets = request.get('assets', [])+ symbols = [a.get('symbol') for a in assets if isinstance(a, dict) and a.get('symbol')]+ if not symbols:+ symbols = ['SPY']primary_symbol = symbols[0]logs.append(f'Strategy: {strategy_type}')@@ -998,6 +1014,9 @@ class ZiplineProvider(BacktestingProviderBase):logs.append(f'Backtest completed: {performance.get("total_trades", 0)} trades')+ from zl_data import was_last_fetch_synthetic+ using_synthetic = was_last_fetch_synthetic()+result_data = {'id': backtest_id,'status': 'completed',@@ -1006,7 +1025,14 @@ class ZiplineProvider(BacktestingProviderBase):'equity': equity,'statistics': statistics,'logs': logs,+ 'using_synthetic_data': using_synthetic,}+ if using_synthetic:+ result_data['synthetic_data_warning'] = (+ 'WARNING: This backtest used SYNTHETIC (fake) data because real market data '+ 'could not be loaded. Install yfinance and ensure internet connectivity for '+ 'real results. These results have NO financial meaning.'+ )if recorded_data:result_data['recorded'] = recorded_data@@ -1294,7 +1320,12 @@ class ZiplineProvider(BacktestingProviderBase):return Truedef optimize(self, request: Dict[str, Any]) -> Dict[str, Any]:- """Parameter optimization via grid/random search."""+ """Parameter optimization via grid/random search.++ Returns the same wire shape as run_backtest (`data.performance`,+ `data.trades`, `data.equity`) populated from the winning iteration,+ plus an `optimization` block with the chosen params and metric.+ """import numpy as npopt_id = self._generate_id()@@ -1303,27 +1334,31 @@ class ZiplineProvider(BacktestingProviderBase):try:strategy_def = request.get('strategy', {})strategy_type = strategy_def.get('type', 'sma_crossover')- param_ranges = request.get('parameters', {})- objective = request.get('objective', 'sharpe')- method = request.get('method', 'grid')- max_iter = int(request.get('maxIterations', 100))+ # Frontend canonical names: paramRanges / optimizeObjective / optimizeMethod.+ # Legacy fallbacks: parameters / objective / method.+ param_ranges = request.get('paramRanges', {}) or request.get('parameters', {})+ objective = request.get('optimizeObjective') or request.get('objective', 'sharpe')+ method = request.get('optimizeMethod') or request.get('method', 'grid')+ max_iter = int(request.get('maxIterations', 100) or 100)if not param_ranges:- return {'success': False, 'error': 'No parameter ranges specified'}+ return self._create_error_result('No parameter ranges supplied (expected paramRanges)')- # Generate parameter combinationscombos = self._generate_param_combos(param_ranges, method, max_iter)+ if not combos:+ return self._create_error_result('paramRanges produced zero combinations')logs.append(f'Testing {len(combos)} parameter combinations')best_score = -np.inf- best_params = {}+ best_params: Dict[str, Any] = {}best_result = None- all_results = []+ all_results: List[Dict[str, Any]] = []for i, params in enumerate(combos):+ # Use canonical `params` (zl_strategies builders read via params dict).bt_request = {**request, 'strategy': {'type': strategy_type,- 'parameters': params,+ 'params': params,}}result = self.run_backtest(bt_request)@@ -1333,10 +1368,12 @@ class ZiplineProvider(BacktestingProviderBase):all_results.append({'parameters': params,'score': score,+ # Inner perf is snake_case here (json_response runs only+ # at dispatcher exit). The dispatcher will camelCase+ # these keys when emitting to stdout.'total_return': perf.get('total_return', 0),'sharpe_ratio': perf.get('sharpe_ratio', 0),})-if score > best_score:best_score = scorebest_params = params@@ -1346,104 +1383,116 @@ class ZiplineProvider(BacktestingProviderBase):print(f'[ZL-OPT] Completed {i + 1}/{len(combos)} iterations', file=sys.stderr)if best_result is None:- return {'success': False, 'error': 'All optimization iterations failed'}+ return self._create_error_result('All optimization iterations failed')logs.append(f'Best {objective}: {best_score:.4f}')logs.append(f'Best params: {best_params}')- return {- 'success': True,- 'data': {- 'id': opt_id,- 'status': 'completed',- 'best_parameters': best_params,- 'best_result': best_result.get('data', {}),- 'all_results': all_results[:100],- 'iterations': len(combos),- 'duration': 0,- 'logs': logs,- }+ # Surface the best iteration's run shape so display_result() renders.+ data = (best_result or {}).get('data') or {}+ data.setdefault('id', opt_id)+ data.setdefault('status', 'completed')+ data['optimization'] = {+ 'objective': objective,+ 'method': method,+ 'objective_value': float(best_score) if best_score != -np.inf else 0.0,+ 'best_params': best_params,+ 'iterations': len(combos),+ 'all_results': all_results[:100],}+ return {'success': True, 'message': 'Optimization completed', 'data': data}except Exception as e:import tracebackprint(f'[ZL-OPT] ERROR: {e}', file=sys.stderr)traceback.print_exc(file=sys.stderr)- return {'success': False, 'error': str(e)}+ return self._create_error_result(f'Optimization failed: {str(e)}')def walk_forward(self, request: Dict[str, Any]) -> Dict[str, Any]:- """Walk-forward analysis with train/test splits."""+ """Walk-forward analysis with train/test splits.++ Surfaces the last fold's test result in run_backtest shape so+ display_result() renders performance/trades, plus per-fold detail+ in `data.walk_forward.folds`.+ """import pandas as pdwf_id = self._generate_id()logs = []try:- n_splits = int(request.get('nSplits', 5))- train_ratio = float(request.get('trainRatio', 0.7))+ # Frontend canonical names: wfSplits / wfTrainRatio. Legacy fallbacks.+ n_splits = int(request.get('wfSplits', request.get('nSplits', 5)) or 5)+ train_ratio = float(request.get('wfTrainRatio', request.get('trainRatio', 0.7)) or 0.7)start_date = request.get('startDate', '2023-01-01')end_date = request.get('endDate', '2024-01-01')+ if not (1 <= n_splits <= 20):+ return self._create_error_result(f'wfSplits must be between 1 and 20 (got {n_splits})')+ if not (0.1 <= train_ratio <= 0.95):+ return self._create_error_result(f'wfTrainRatio must be between 0.1 and 0.95 (got {train_ratio})')+start_dt = pd.Timestamp(start_date)end_dt = pd.Timestamp(end_date)total_days = (end_dt - start_dt).dayssplit_days = total_days // n_splits+ if split_days < 5:+ return self._create_error_result(+ f'Date range too short for {n_splits} folds (got {total_days} days)'+ )++ folds: List[Dict[str, Any]] = []+ last_result = None- split_results = []for i in range(n_splits):split_start = start_dt + pd.Timedelta(days=i * split_days)split_end = split_start + pd.Timedelta(days=split_days)train_end = split_start + pd.Timedelta(days=int(split_days * train_ratio))- # Run test period- test_request = {**request}- test_request['startDate'] = train_end.strftime('%Y-%m-%d')- test_request['endDate'] = split_end.strftime('%Y-%m-%d')-+ # Run test period (zipline run_backtest doesn't optimize per fold;+ # this measures parameter robustness across periods).+ test_request = {**request,+ 'startDate': train_end.strftime('%Y-%m-%d'),+ 'endDate': split_end.strftime('%Y-%m-%d')}result = self.run_backtest(test_request)- if result.get('success') and result.get('data', {}).get('performance'):- perf = result['data']['performance']- split_results.append({- 'split': i + 1,- 'train_start': split_start.strftime('%Y-%m-%d'),- 'train_end': train_end.strftime('%Y-%m-%d'),- 'test_start': train_end.strftime('%Y-%m-%d'),- 'test_end': split_end.strftime('%Y-%m-%d'),- 'total_return': perf.get('total_return', 0),- 'sharpe_ratio': perf.get('sharpe_ratio', 0),- 'max_drawdown': perf.get('max_drawdown', 0),- })- logs.append(f'Split {i + 1}: return={perf.get("total_return", 0):.4f}')+ last_result = result if (result.get('success') and result.get('data')) else last_result+ perf = result.get('data', {}).get('performance', {}) if result.get('success') else {}++ # Inner perf is snake_case (it's the raw extract_performance+ # output before the dispatcher's json_response runs camelCase+ # conversion). Read snake_case here, accept camelCase as a+ # fallback for safety.+ folds.append({+ 'fold': i,+ 'trainStart': split_start.strftime('%Y-%m-%d'),+ 'trainEnd': train_end.strftime('%Y-%m-%d'),+ 'testStart': train_end.strftime('%Y-%m-%d'),+ 'testEnd': split_end.strftime('%Y-%m-%d'),+ 'testReturn': float(perf.get('total_return', perf.get('totalReturn', 0))),+ 'testSharpe': float(perf.get('sharpe_ratio', perf.get('sharpeRatio', 0))),+ 'testMaxDrawdown': float(perf.get('max_drawdown', perf.get('maxDrawdown', 0))),+ })- if not split_results:- return {'success': False, 'error': 'All walk-forward splits failed'}+ if last_result is None or not folds:+ return self._create_error_result('All walk-forward splits failed')import numpy as np- avg_return = float(np.mean([s['total_return'] for s in split_results]))- avg_sharpe = float(np.mean([s['sharpe_ratio'] for s in split_results]))-- logs.append(f'Average return: {avg_return:.4f}')- logs.append(f'Average Sharpe: {avg_sharpe:.4f}')-- return {- 'success': True,- 'data': {- 'id': wf_id,- 'status': 'completed',- 'splits': split_results,- 'summary': {- 'avg_return': avg_return,- 'avg_sharpe': avg_sharpe,- 'n_splits': n_splits,- },- 'logs': logs,- }+ data = (last_result or {}).get('data') or {}+ data.setdefault('id', wf_id)+ data.setdefault('status', 'completed')+ data['walk_forward'] = {+ 'n_splits': n_splits,+ 'train_ratio': train_ratio,+ 'folds': folds,+ 'mean_test_return': float(np.mean([f['testReturn'] for f in folds])),+ 'mean_test_sharpe': float(np.mean([f['testSharpe'] for f in folds])),}+ return {'success': True, 'message': 'Walk-forward completed', 'data': data}except Exception as e:import tracebacktraceback.print_exc(file=sys.stderr)- return {'success': False, 'error': str(e)}+ return self._create_error_result(f'Walk-forward failed: {str(e)}')def get_historical_data(self, request: Dict[str, Any]) -> List[Dict[str, Any]]:"""Get historical price data."""@@ -1685,8 +1734,19 @@ class ZiplineProvider(BacktestingProviderBase):symbols = request.get('symbols', ['SPY'])start_date = request.get('startDate', '2023-01-01')end_date = request.get('endDate', '2024-01-01')- mode = request.get('mode', 'crossover_signals')- params = request.get('parameters', {})+ # The frontend (BacktestingScreen.cpp::gather_args) sends short+ # mode names matching `get_command_options.indicator_signal_modes`.+ # Accept both the short form ('crossover') and the long form+ # ('crossover_signals') so older callers don't break.+ mode = request.get('mode', 'crossover')+ if mode.endswith('_signals'):+ mode = mode[:-len('_signals')]+ # Frontend (BacktestingScreen.cpp::gather_args) puts the indicator id+ # at the top level for the indicator_signals command. Fold it into+ # the params dict so the threshold/filter branches can read it.+ params = dict(request.get('parameters') or {})+ if 'indicator' in request and 'indicator' not in params:+ params['indicator'] = request['indicator']close_series, synthetic = self._load_close_series(symbols, start_date, end_date)close = np.asarray(close_series, dtype=float)@@ -1696,7 +1756,7 @@ class ZiplineProvider(BacktestingProviderBase):entries = np.zeros(n, dtype=bool)exits = np.zeros(n, dtype=bool)- if mode == 'crossover_signals':+ if mode == 'crossover':fast_p = int(params.get('fastPeriod', 10))slow_p = int(params.get('slowPeriod', 20))ma_type = params.get('maType', 'sma')@@ -1713,7 +1773,7 @@ class ZiplineProvider(BacktestingProviderBase):elif fast_ma[i] < slow_ma[i] and fast_ma[i-1] >= slow_ma[i-1]:exits[i] = True- elif mode == 'threshold_signals':+ elif mode == 'threshold':indicator = params.get('indicator', 'rsi')period = int(params.get('period', 14))oversold = float(params.get('oversold', 30))@@ -1733,7 +1793,7 @@ class ZiplineProvider(BacktestingProviderBase):elif vals[i] > overbought and vals[i-1] <= overbought:exits[i] = True- elif mode == 'breakout_signals':+ elif mode == 'breakout':period = int(params.get('period', 20))channel = params.get('channel', 'donchian')if channel == 'keltner':@@ -1748,7 +1808,7 @@ class ZiplineProvider(BacktestingProviderBase):elif close[i] < lower[i-1]:exits[i] = True- elif mode == 'mean_reversion_signals':+ elif mode == 'mean_reversion':period = int(params.get('period', 20))threshold = float(params.get('threshold', 2.0))zscores = _zscore_calc(close, period)@@ -1759,7 +1819,7 @@ class ZiplineProvider(BacktestingProviderBase):elif zscores[i] > threshold and zscores[i-1] <= threshold:exits[i] = True- elif mode == 'signal_filter':+ elif mode == 'filter':# Apply base signals and filter with another indicatorfast_p = int(params.get('fastPeriod', 10))slow_p = int(params.get('slowPeriod', 20))@@ -2630,17 +2690,26 @@ class ZiplineProvider(BacktestingProviderBase):import numpy as npimport itertools+ # Cast to native Python ints/floats up front so the values produced+ # here aren't numpy scalars — json_response uses `default=str` which+ # would render np.int64(5) as the string '5' in the wire output.+ def _native(x):+ try:+ return int(x) if float(x).is_integer() else float(x)+ except (TypeError, ValueError):+ return x+param_values = {}for name, spec in param_ranges.items():if isinstance(spec, dict):mn = spec.get('min', 0)mx = spec.get('max', 100)step = spec.get('step', 1)- param_values[name] = list(np.arange(mn, mx + step, step))+ param_values[name] = [_native(v) for v in np.arange(mn, mx + step, step)]elif isinstance(spec, list):- param_values[name] = spec+ param_values[name] = [_native(v) for v in spec]else:- param_values[name] = [spec]+ param_values[name] = [_native(spec)]if method == 'grid':keys = list(param_values.keys())diff --git a/fincept-qt/scripts/Analytics/backtesting/zipline/zl_data.py b/fincept-qt/scripts/Analytics/backtesting/zipline/zl_data.pyindex 6fba87a69..03f55e955 100644--- a/fincept-qt/scripts/Analytics/backtesting/zipline/zl_data.py+++ b/fincept-qt/scripts/Analytics/backtesting/zipline/zl_data.py@@ -13,6 +13,18 @@ from datetime import datetime, timedeltafrom typing import Dict, Any, List, Optional, Tuple+# Symbols that fell back to synthetic data on the most recent fetch. Callers+# (zipline_provider.run_backtest) inspect this to flag the result with+# `usingSyntheticData: true` so the UI can warn the user. Reset on each call.+_LAST_FETCH_SYNTHETIC_SYMBOLS: set = set()+++def was_last_fetch_synthetic() -> bool:+ """True if the most recent fetch_yfinance_data fell back to synthetic data+ for at least one symbol."""+ return bool(_LAST_FETCH_SYNTHETIC_SYMBOLS)++def fetch_yfinance_data(symbols: List[str],start_date: str,@@ -26,10 +38,12 @@ def fetch_yfinance_data(Dict mapping symbol -> DataFrame with columns:[open, high, low, close, volume] (lowercase, tz-aware UTC index)"""+ _LAST_FETCH_SYNTHETIC_SYMBOLS.clear()try:import yfinance as yfexcept ImportError:print('[ZL-DATA] yfinance not installed, using synthetic data', file=sys.stderr)+ _LAST_FETCH_SYNTHETIC_SYMBOLS.update(symbols)return _generate_synthetic_data(symbols, start_date, end_date)result = {}@@ -41,6 +55,7 @@ def fetch_yfinance_data(if df.empty:print(f'[ZL-DATA] No data for {sym}, using synthetic', file=sys.stderr)+ _LAST_FETCH_SYNTHETIC_SYMBOLS.add(sym)synth = _generate_synthetic_data([sym], start_date, end_date)result[sym] = synth[sym]continue@@ -70,6 +85,7 @@ def fetch_yfinance_data(except Exception as e:print(f'[ZL-DATA] Error fetching {sym}: {e}, using synthetic', file=sys.stderr)+ _LAST_FETCH_SYNTHETIC_SYMBOLS.add(sym)synth = _generate_synthetic_data([sym], start_date, end_date)result[sym] = synth[sym]diff --git a/fincept-qt/scripts/Analytics/backtesting/zipline/zl_metrics.py b/fincept-qt/scripts/Analytics/backtesting/zipline/zl_metrics.pyindex 711b3ceb8..f5dab2ed6 100644--- a/fincept-qt/scripts/Analytics/backtesting/zipline/zl_metrics.py+++ b/fincept-qt/scripts/Analytics/backtesting/zipline/zl_metrics.py@@ -55,11 +55,13 @@ def extract_performance(downside_std = float(np.std(downside, ddof=1) * np.sqrt(252)) if len(downside) > 1 else 1e-8sortino = (mean_ret * 252) / downside_std if downside_std > 1e-8 else 0.0- # Max drawdown+ # Max drawdown — emit as positive magnitude to match the convention+ # used by every other backtesting provider (vectorbt/backtestingpy/bt/+ # fasttrade). Frontend treats it as a percent in [0, 1].cumulative = np.cumprod(1 + daily_returns)running_max = np.maximum.accumulate(cumulative)drawdowns = (cumulative - running_max) / running_max- max_drawdown = float(np.min(drawdowns)) if len(drawdowns) > 0 else 0.0+ max_drawdown = abs(float(np.min(drawdowns))) if len(drawdowns) > 0 else 0.0# Calmar ratiocalmar = annualized_return / abs(max_drawdown) if abs(max_drawdown) > 1e-8 else 0.0diff --git a/fincept-qt/scripts/Analytics/fortitudo_tech_wrapper/fortitudo_service.py b/fincept-qt/scripts/Analytics/fortitudo_tech_wrapper/fortitudo_service.pyindex 68f32a549..b34493984 100644--- a/fincept-qt/scripts/Analytics/fortitudo_tech_wrapper/fortitudo_service.py+++ b/fincept-qt/scripts/Analytics/fortitudo_tech_wrapper/fortitudo_service.py@@ -1,746 +1,673 @@"""-Fortitudo.tech Service - Python backend for analytics-===============================================================================--Provides JSON-RPC interface for C++ to call fortitudo.tech analytics functions.-Includes portfolio risk metrics, option pricing, entropy pooling, and exposure stacking.--Supports Python 3.14+ via pure NumPy/SciPy fallback implementations when fortitudo.tech-is not available (requires Python <3.14).+Fortitudo Service (risk-aware portfolio optimization)+======================================================+Self-contained portfolio risk + optimization service for the Fincept Terminal+"Fortitudo" sub-tab. Same response contract as gs_quant_service /+functime_service / statsmodels_service.++Backed by the in-tree fortitudo_tech_wrapper modules (functions.py,+optimization.py) — those wrap the fortitudo.tech library when present and+fall back to numpy implementations otherwise. The legacy entry point is+preserved as fortitudo_service_legacy.py.++Response contract (all ops):+ success: bool+ operation: str+ data: dict (when success)+ error: str (when failure)+ error_kind: str | None (validation | runtime | unknown_op)+ traceback: str | None (only on uncaught exceptions)"""-import jsonimport sysimport os+import json+import math+import tracebackfrom typing import Dict, List, Any, Optional-from datetime import datetime-# Add this script's directory to Python path for local imports+import numpy as np+import pandas as pd++# Add this module's directory to path so we can import sibling files._script_dir = os.path.dirname(os.path.abspath(__file__))if _script_dir not in sys.path:sys.path.insert(0, _script_dir)-import pandas as pd-import numpy as np-+# Wrapper modules (optimization.py + functions.py + option_pricing.py).+# These exist in this directory; they shadow / wrap fortitudo.tech.try:- import fortitudo.tech as ft- FORTITUDO_AVAILABLE = True- FORTITUDO_VERSION = getattr(ft, '__version__', '1.2')-except ImportError:- FORTITUDO_AVAILABLE = False- FORTITUDO_VERSION = 'fallback'+ from optimization import MeanVarianceOptimizer, MeanCVaROptimizer+ OPTIMIZATION_OK = True+except ImportError as e:+ OPTIMIZATION_OK = False+ _opt_err = str(e)-# Import local wrapper modules (with fallback support)try:from functions import (- calculate_portfolio_volatility,- calculate_portfolio_var,- calculate_portfolio_cvar,+ calculate_all_metrics,calculate_covariance_matrix,calculate_correlation_matrix,calculate_simulation_moments,calculate_exp_decay_probabilities,- calculate_normal_calibration,- calculate_all_metrics,- FORTITUDO_AVAILABLE as FUNCTIONS_AVAILABLE- )- from option_pricing import (- price_call_option,- price_put_option,- calculate_forward_price,- price_option_straddle,- calculate_put_call_parity_check,- calculate_all_greeks,- FORTITUDO_AVAILABLE as OPTIONS_AVAILABLE)- from advanced import (- apply_entropy_pooling,- apply_entropy_pooling_simple,- calculate_exposure_stacking,- FORTITUDO_AVAILABLE as ADVANCED_AVAILABLE- )- from optimization import (- MeanVarianceOptimizer,- MeanCVaROptimizer- )- WRAPPERS_AVAILABLE = True- OPTIMIZATION_AVAILABLE = True+ FUNCTIONS_OK = Trueexcept ImportError as e:- WRAPPERS_AVAILABLE = False- OPTIMIZATION_AVAILABLE = False- print(f"[fortitudo_service] Warning: Could not import wrappers: {e}", file=sys.stderr)---def serialize_result(data: Any) -> str:- """Serialize result to JSON, handling numpy/pandas types"""- def convert(obj):- if obj is None:- return None- if isinstance(obj, (np.integer, np.floating)):- if np.isnan(obj):- return None- return float(obj)- elif isinstance(obj, np.ndarray):- return obj.tolist()- elif isinstance(obj, np.bool_):- return bool(obj)- elif isinstance(obj, pd.DataFrame):- # Handle DataFrames with tuple column names (MultiIndex)- result = {}- for col in obj.columns:- col_key = str(col) if isinstance(col, tuple) else col- result[col_key] = {}- for idx in obj.index:- idx_key = str(idx) if isinstance(idx, tuple) else str(idx)- result[col_key][idx_key] = convert(obj.loc[idx, col])- return result- elif isinstance(obj, pd.Series):- # Handle Series with tuple index- return {str(k) if isinstance(k, tuple) else str(k): convert(v) for k, v in obj.items()}- elif isinstance(obj, pd.Timestamp):- return str(obj)- elif isinstance(obj, datetime):- return obj.isoformat()- elif isinstance(obj, dict):- # Convert tuple keys to strings for JSON compatibility- return {str(k) if isinstance(k, tuple) else k: convert(v) for k, v in obj.items()}- elif isinstance(obj, (list, tuple)):- return [convert(i) for i in obj]- return obj-- return json.dumps(convert(data), default=str)---def fetch_returns_for_tickers(tickers_str: str) -> pd.DataFrame:- """Fetch historical price data and compute daily returns for comma-separated tickers."""- try:- import yfinance as yf- except ImportError:- raise ValueError("yfinance not available; cannot fetch returns for tickers")- tickers = [t.strip() for t in tickers_str.split(',') if t.strip()]- if not tickers:- raise ValueError("No valid tickers provided")-- if len(tickers) == 1:- data = yf.download(tickers[0], period='1y', auto_adjust=True, progress=False)- # Handle MultiIndex columns from newer yfinance versions- if isinstance(data.columns, pd.MultiIndex):- data.columns = data.columns.get_level_values(0)- close = data['Close']- df = close.pct_change().dropna().to_frame(name=tickers[0])- else:- data = yf.download(tickers, period='1y', auto_adjust=True, progress=False)- # yfinance returns MultiIndex columns like ('Close', 'AAPL') for multiple tickers- if isinstance(data.columns, pd.MultiIndex):- # Extract just the 'Close' level- if 'Close' in data.columns.get_level_values(0):- close = data['Close']- else:- close = data.xs('Close', axis=1, level=0) if 'Close' in data.columns.get_level_values(0) else data- else:- close = data['Close'] if 'Close' in data.columns else data+ FUNCTIONS_OK = False+ _fn_err = str(e)- if isinstance(close, pd.Series):- close = close.to_frame(name=tickers[0])-- # Compute returns, drop columns that are entirely NaN- returns = close.pct_change()- returns = returns.dropna(axis=1, how='all') # drop fully-empty columns- returns = returns.dropna(axis=0, how='any') # drop rows with any NaN- # Rename columns to match requested tickers if shape matches- if returns.shape[1] == len(tickers):- returns.columns = tickers- df = returns-- if df.empty or df.shape[1] == 0:- raise ValueError(f"No valid return data available for tickers: {tickers_str}")- return df---def parse_returns_json(returns_json: str) -> pd.DataFrame:- """Parse JSON returns data into DataFrame"""- # Handle plain ticker strings (e.g. "AAPL,MSFT") that aren't JSON-wrapped- try:- data = json.loads(returns_json)- except (json.JSONDecodeError, TypeError):- # Treat as a plain comma-separated ticker string- data = returns_json-- # Handle the case where the frontend sends a JSON-encoded ticker string- # e.g. JSON.stringify("AAPL,MSFT,GOOGL") → data is a plain string- if isinstance(data, str):- return fetch_returns_for_tickers(data)-- if isinstance(data, dict):- first_value = next(iter(data.values()), None)- if isinstance(first_value, dict):- # Multi-asset: {symbol: {date: return}}- df = pd.DataFrame(data)- df.index = pd.to_datetime(df.index)- else:- # Single asset: {date: return}- df = pd.DataFrame({'returns': data})- df.index = pd.to_datetime(df.index)- elif isinstance(data, list):- df = pd.DataFrame(data)- if 'date' in df.columns:- df['date'] = pd.to_datetime(df['date'])- df.set_index('date', inplace=True)- if 'symbol' in df.columns:- df = df.pivot(columns='symbol', values='returns')- else:- raise ValueError(f"Unsupported returns data format: {type(data)}")-- df = df.sort_index()- return df---def parse_weights(weights_json: str) -> np.ndarray:- """Parse JSON weights into numpy array"""- data = json.loads(weights_json)- if isinstance(data, list):- return np.array(data)- elif isinstance(data, dict):- return np.array(list(data.values()))- else:- raise ValueError(f"Unsupported weights format: {type(data)}")+# Optional: detect native fortitudo.tech for status reporting only.+try:+ import fortitudo.tech as ft # noqa: F401+ NATIVE_OK = True+ NATIVE_VERSION = getattr(ft, "__version__", "unknown")+except ImportError:+ NATIVE_OK = False+ NATIVE_VERSION = None# ============================================================================-# COMMAND HANDLERS+# INPUT COERCION + VALIDATION# ============================================================================-def check_status() -> Dict[str, Any]:- """Check fortitudo.tech library status"""- mode = "native" if FORTITUDO_AVAILABLE else "fallback"- return {- "success": True,- "available": WRAPPERS_AVAILABLE, # Changed: now True even in fallback mode- "native_available": FORTITUDO_AVAILABLE,- "wrappers_available": WRAPPERS_AVAILABLE,- "mode": mode,- "version": FORTITUDO_VERSION,- "message": f"Fortitudo.tech analytics ready ({mode} mode)"- }---def portfolio_metrics(params: Dict[str, Any]) -> Dict[str, Any]:- """Calculate comprehensive portfolio risk metrics"""- if not WRAPPERS_AVAILABLE:- return {"success": False, "error": "Wrapper modules not available"}-- try:- returns = parse_returns_json(params['returns'])- weights = parse_weights(params['weights'])- alpha = params.get('alpha', 0.05)-- # Get optional probabilities- probabilities = None- if 'probabilities' in params and params['probabilities']:- probabilities = np.array(json.loads(params['probabilities']))-- # Calculate all metrics- metrics = calculate_all_metrics(weights, returns, probabilities, alpha)+class ValidationError(ValueError):+ pass- return {- "success": True,- "metrics": metrics,- "n_scenarios": len(returns),- "n_assets": len(weights)- }- except Exception as e:- return {"success": False, "error": str(e)}---def _clean_label(label) -> str:- """Extract a clean string label from potentially tuple/integer index values."""- if isinstance(label, tuple):- # fortitudo returns (int, 'TICKER') tuples — take the string part- parts = [str(p) for p in label if not isinstance(p, (int, float)) or isinstance(p, bool)]- if parts:- return parts[-1]- return str(label[-1])- return str(label)---def _matrix_to_flat_dict(df: pd.DataFrame) -> dict:- """Flatten a square matrix DataFrame into labelled scalar entries for the UI.- Uses .iloc to avoid issues with tuple/integer index labels from fortitudo.tech."""- result = {}- if not isinstance(df, pd.DataFrame):- return {"raw": str(df)}- n = df.shape[0]- # Build clean row/col labels- row_labels = [_clean_label(idx) for idx in df.index]- col_labels = [_clean_label(col) for col in df.columns]- # If col_labels are just integers, use row_labels for columns too (square matrix)- all_int_cols = all(lbl.isdigit() for lbl in col_labels)- if all_int_cols and len(col_labels) == len(row_labels):- col_labels = row_labels- for r in range(n):- for c in range(n):- key = f"{row_labels[r]} / {col_labels[c]}"- val = df.iloc[r, c]- result[key] = round(float(val), 8) if not isinstance(val, (str, bool)) else val- return result---def _moments_to_flat_dict(df: pd.DataFrame) -> dict:- """Flatten moments DataFrame (assets as rows, metrics as columns) into labelled scalars."""- result = {}- if not isinstance(df, pd.DataFrame):- return {"raw": str(df)}- for r in range(len(df.index)):- asset = _clean_label(df.index[r])- for c in range(len(df.columns)):- metric = _clean_label(df.columns[c])- val = df.iloc[r, c]- result[f"{asset} {metric}"] = round(float(val), 8) if not isinstance(val, (str, bool)) else val- return result---def covariance_analysis(params: Dict[str, Any]) -> Dict[str, Any]:- """Calculate covariance and correlation matrices"""- if not WRAPPERS_AVAILABLE:- return {"success": False, "error": "Wrapper modules not available"}+def _coerce_floats(value, field_name):+ if value is None:+ return []+ if isinstance(value, (list, tuple)):+ out = []+ for i, v in enumerate(value):+ try:+ out.append(float(v))+ except (TypeError, ValueError):+ raise ValidationError(f"{field_name}[{i}] is not numeric: {v!r}")+ return out+ if isinstance(value, np.ndarray):+ return [float(v) for v in value.tolist()]+ if isinstance(value, str):+ s = value.strip()+ if not s:+ return []+ for sep in [",", ";", "\t", "\n"]:+ s = s.replace(sep, " ")+ parts = [p for p in s.split(" ") if p.strip()]+ out = []+ for i, p in enumerate(parts):+ try:+ out.append(float(p))+ except ValueError:+ raise ValidationError(f"{field_name}[{i}] is not numeric: {p!r}")+ return outtry:- returns = parse_returns_json(params['returns'])-- probabilities = None- if 'probabilities' in params and params['probabilities']:- probabilities = np.array(json.loads(params['probabilities']))-- cov_matrix = calculate_covariance_matrix(returns, probabilities)- corr_matrix = calculate_correlation_matrix(returns, probabilities)- moments = calculate_simulation_moments(returns, probabilities)+ return [float(value)]+ except (TypeError, ValueError):+ raise ValidationError(f"{field_name} is not numeric: {value!r}")- assets = list(returns.columns) if hasattr(returns, 'columns') else []-- return {- "success": True,- "covariance_matrix": _matrix_to_flat_dict(cov_matrix),- "correlation_matrix": _matrix_to_flat_dict(corr_matrix),- "moments": _moments_to_flat_dict(moments),- "assets": assets,- "n_assets": len(assets),- "n_observations": len(returns)- }- except Exception as e:- return {"success": False, "error": str(e)}---def exp_decay_weighting(params: Dict[str, Any]) -> Dict[str, Any]:- """Calculate exponentially decaying probabilities"""- if not WRAPPERS_AVAILABLE:- return {"success": False, "error": "Wrapper modules not available"}+def _safe_float(v, default=0.0):try:- returns = parse_returns_json(params['returns'])- half_life = params.get('half_life', 252)-- probs = calculate_exp_decay_probabilities(returns, half_life)+ f = float(v)+ except (TypeError, ValueError):+ return default+ if math.isnan(f) or math.isinf(f):+ return default+ return f- return {- "success": True,- "probabilities": probs.flatten().tolist(),- "half_life": half_life,- "n_scenarios": len(probs),- "sum": float(probs.sum())- }- except Exception as e:- return {"success": False, "error": str(e)}---def option_pricing(params: Dict[str, Any]) -> Dict[str, Any]:- """Price options using Black-Scholes model"""- if not WRAPPERS_AVAILABLE:- return {"success": False, "error": "Wrapper modules not available"}+def _safe_int(v, default=0):try:- spot = params['spot_price']- strike = params['strike']- volatility = params['volatility']- risk_free_rate = params.get('risk_free_rate', 0.05)- dividend_yield = params.get('dividend_yield', 0.0)- time_to_maturity = params.get('time_to_maturity', 1.0)-- # Calculate forward price- forward = calculate_forward_price(spot, risk_free_rate, dividend_yield, time_to_maturity)-- # Price call and put- call_price = price_call_option(forward, strike, volatility, risk_free_rate, time_to_maturity)- put_price = price_put_option(forward, strike, volatility, risk_free_rate, time_to_maturity)-- # Straddle- straddle = price_option_straddle(forward, strike, volatility, risk_free_rate, time_to_maturity)-- # Put-call parity check- parity = calculate_put_call_parity_check(spot, strike, volatility, risk_free_rate, dividend_yield, time_to_maturity)-- return {- "success": True,- "forward_price": forward,- "call_price": call_price,- "put_price": put_price,- "straddle": straddle,- "parity_check": parity- }- except Exception as e:- return {"success": False, "error": str(e)}---def option_chain(params: Dict[str, Any]) -> Dict[str, Any]:- """Generate option chain for multiple strikes"""- if not WRAPPERS_AVAILABLE:- return {"success": False, "error": "Wrapper modules not available"}-- try:- spot = params['spot_price']- strikes = params.get('strikes', [spot * 0.9, spot * 0.95, spot, spot * 1.05, spot * 1.1])- volatility = params['volatility']- risk_free_rate = params.get('risk_free_rate', 0.05)- dividend_yield = params.get('dividend_yield', 0.0)- time_to_maturity = params.get('time_to_maturity', 1.0)-- forward = calculate_forward_price(spot, risk_free_rate, dividend_yield, time_to_maturity)-- chain = []- for strike in strikes:- call = price_call_option(forward, strike, volatility, risk_free_rate, time_to_maturity)- put = price_put_option(forward, strike, volatility, risk_free_rate, time_to_maturity)- chain.append({- "strike": strike,- "call_price": call,- "put_price": put,- "moneyness": strike / spot- })-- return {- "success": True,- "spot_price": spot,- "forward_price": forward,- "chain": chain- }- except Exception as e:- return {"success": False, "error": str(e)}-+ f = float(v)+ if math.isnan(f) or math.isinf(f):+ return default+ return int(f)+ except (TypeError, ValueError):+ return default+++def _normalize_returns_input(data):+ """+ Resolve `returns` into a pd.DataFrame (n_scenarios x n_assets).++ Accepted forms:+ 1. dict {asset: [r1, r2, ...]} (preferred wire format from C++)+ 2. dict {asset: {date: r}} (legacy)+ 3. list of dicts [{asset: r, asset2: r}] (rare)+ 4. tickers: "AAPL,MSFT,GOOG" (in `tickers` field, fetched via yfinance)++ Also accepts a `tickers` field that triggers yfinance fetch.+ Returns (DataFrame, asset_names).+ """+ tickers = data.get("tickers")+ period = str(data.get("period", "1y"))+ returns = data.get("returns")++ if tickers and not returns:+ try:+ import yfinance as yf+ except ImportError:+ raise ValidationError("yfinance not installed; supply `returns` instead of `tickers`")+ tk_list = [t.strip().upper() for t in str(tickers).split(",") if t.strip()]+ if not tk_list:+ raise ValidationError("`tickers` is empty")+ if len(tk_list) < 2:+ raise ValidationError(+ "Need at least 2 tickers for portfolio analysis; got 1")+ raw = yf.download(tk_list, period=period, auto_adjust=True, progress=False)+ if raw.empty:+ raise ValidationError(f"yfinance returned no data for {tk_list} (period={period})")+ if isinstance(raw.columns, pd.MultiIndex):+ close = raw["Close"] if "Close" in raw.columns.get_level_values(0) else raw+ else:+ close = raw["Close"] if "Close" in raw.columns else raw+ if isinstance(close, pd.Series):+ close = close.to_frame(name=tk_list[0])+ rets = close.pct_change(fill_method=None).dropna(how="any")+ if rets.empty:+ raise ValidationError(f"No usable price history for {tk_list}")+ # Reorder columns to match requested ticker order if shape matches+ if rets.shape[1] == len(tk_list) and set(rets.columns) >= set(tk_list):+ rets = rets[tk_list]+ return rets, list(rets.columns)++ if returns is None:+ raise ValidationError("`returns` (or `tickers`) is required")++ if isinstance(returns, dict):+ # Sniff first value+ first_val = next(iter(returns.values()), None)+ if isinstance(first_val, dict):+ # {asset: {date: r}}+ df = pd.DataFrame(returns)+ try:+ df.index = pd.to_datetime(df.index)+ except Exception:+ pass+ else:+ # {asset: [r1, r2, ...]}+ cleaned = {asset: _coerce_floats(vals, f"returns[{asset}]")+ for asset, vals in returns.items()}+ lengths = [len(v) for v in cleaned.values()]+ if not lengths:+ raise ValidationError("`returns` is empty")+ if len(set(lengths)) > 1:+ raise ValidationError(+ f"all return columns must have the same length, got {lengths}")+ df = pd.DataFrame(cleaned)+ if df.shape[1] < 2:+ raise ValidationError(+ f"Need at least 2 assets for portfolio analysis; got {df.shape[1]}")+ return df, list(df.columns)++ if isinstance(returns, list):+ # list of dicts+ df = pd.DataFrame(returns)+ if df.shape[1] < 2:+ raise ValidationError(+ f"Need at least 2 assets for portfolio analysis; got {df.shape[1]}")+ return df, list(df.columns)++ raise ValidationError(f"Unsupported `returns` format: {type(returns).__name__}")+++def _require_modules():+ missing = []+ if not OPTIMIZATION_OK:+ missing.append(f"optimization ({_opt_err})")+ if not FUNCTIONS_OK:+ missing.append(f"functions ({_fn_err})")+ if missing:+ raise ValidationError("required wrapper modules failed to import: " + "; ".join(missing))-def entropy_pooling(params: Dict[str, Any]) -> Dict[str, Any]:- """Apply entropy pooling for scenario probability adjustment"""- if not WRAPPERS_AVAILABLE:- return {"success": False, "error": "Wrapper modules not available"}- try:- n_scenarios = params['n_scenarios']- max_probability = params.get('max_probability', None)+# ============================================================================+# OPERATION HANDLERS+# ============================================================================- result = apply_entropy_pooling_simple(- n_scenarios=n_scenarios,- max_probability=max_probability- )+def op_check_status(_data):+ return {+ "wrappers_optimization": OPTIMIZATION_OK,+ "wrappers_functions": FUNCTIONS_OK,+ "native_fortitudo_tech": NATIVE_OK,+ "native_version": NATIVE_VERSION,+ "mode": "native" if NATIVE_OK else "wrapper-fallback",+ "ops_available": list(OPERATIONS.keys()),+ }- return {- "success": True,- "prior_probabilities": result['prior_probabilities'].tolist(),- "posterior_probabilities": result['posterior_probabilities'].tolist(),- "effective_scenarios_prior": result['effective_scenarios_prior'],- "effective_scenarios_posterior": result['effective_scenarios_posterior'],- "max_probability": result['max_probability'],- "min_probability": result['min_probability']- }- except Exception as e:- return {"success": False, "error": str(e)}+def op_portfolio_metrics(data):+ """+ Compute risk metrics for a weighted portfolio.+ Inputs:+ returns | tickers : see _normalize_returns_input+ weights : list[float] (must sum ~ 1.0; renormalized if not)+ alpha : float (CVaR confidence tail, default 0.05)+ """+ _require_modules()+ rets_df, assets = _normalize_returns_input(data)+ n_assets = len(assets)++ weights_raw = data.get("weights")+ if weights_raw is None:+ weights = np.full(n_assets, 1.0 / n_assets)+ else:+ weights = np.asarray(_coerce_floats(weights_raw, "weights"), dtype=float)+ if len(weights) != n_assets:+ raise ValidationError(+ f"weights ({len(weights)}) must match number of assets ({n_assets})")+ s = float(weights.sum())+ if s <= 0:+ raise ValidationError("weights sum must be > 0")+ weights = weights / s # renormalize to 1.0++ alpha = _safe_float(data.get("alpha", 0.05))+ if not (0.0 < alpha < 0.5):+ raise ValidationError(f"alpha must be in (0, 0.5), got {alpha}")++ metrics = calculate_all_metrics(weights, rets_df, None, alpha)++ # Project metrics into a flat, predictable shape+ expected_return = _safe_float(metrics.get("expected_return"))+ volatility = _safe_float(metrics.get("volatility"))+ sharpe = _safe_float(metrics.get("sharpe_ratio"))+ var = _safe_float(metrics.get("var"))+ cvar = _safe_float(metrics.get("cvar"))++ # Annualized projections (assume daily returns -> sqrt(252) for vol)+ ann_return = (1.0 + expected_return) ** 252 - 1.0+ ann_vol = volatility * math.sqrt(252)++ # Per-asset weight rows+ weight_rows = [+ {"asset": str(assets[i]), "weight": _safe_float(weights[i]),+ "weight_pct": _safe_float(weights[i] * 100.0)}+ for i in range(n_assets)+ ]-def exposure_stacking(params: Dict[str, Any]) -> Dict[str, Any]:- """Calculate exposure stacking portfolio"""- if not WRAPPERS_AVAILABLE:- return {"success": False, "error": "Wrapper modules not available"}+ return {+ "n_assets": n_assets,+ "n_scenarios": int(len(rets_df)),+ "alpha": alpha,+ "weights": weight_rows,+ "expected_return": expected_return,+ "volatility": volatility,+ "sharpe_ratio": sharpe,+ "annualized_return": _safe_float(ann_return),+ "annualized_volatility": _safe_float(ann_vol),+ "var": var,+ "cvar": cvar,+ "var_pct": _safe_float(var * 100.0),+ "cvar_pct": _safe_float(cvar * 100.0),+ "max_weight": _safe_float(float(weights.max())),+ "min_weight": _safe_float(float(weights.min())),+ "concentration_hhi": _safe_float(float((weights ** 2).sum())),+ }- try:- raw = json.loads(params['sample_portfolios'])- sample_portfolios = np.array(raw)-- # Frontend sends a 1-D weights array for a single portfolio.- # calculate_exposure_stacking expects shape (n_assets, n_samples).- # Reshape and tile to produce n_samples=8 perturbations around the- # submitted weights so the routine has something meaningful to stack.- if sample_portfolios.ndim == 1:- n_assets = len(sample_portfolios)- # Normalize so weights sum to 1- total = sample_portfolios.sum()- if total > 0:- sample_portfolios = sample_portfolios / total- # Generate 8 slightly perturbed copies to form a proper sample matrix- rng = np.random.default_rng(42)- n_samples = 8- noise = rng.dirichlet(np.ones(n_assets), size=n_samples).T * 0.1- base = sample_portfolios.reshape(-1, 1)- perturbed = base * 0.9 + noise # (n_assets, n_samples)- # Renormalize each column- perturbed = perturbed / perturbed.sum(axis=0, keepdims=True)- # Include the original as first column- sample_portfolios = np.hstack([base, perturbed]) # (n_assets, n_samples+1)-- n_partitions = params.get('n_partitions', 4)-- result = calculate_exposure_stacking(sample_portfolios, n_partitions)- return {- "success": True,- "stacked_weights": result['stacked_weights'],- "mean_sample_weights": result['mean_sample_weights'],- "std_sample_weights": result['std_sample_weights'],- "n_assets": result['n_assets'],- "n_samples": result['n_samples'],- "n_partitions": result['n_partitions'],- "weights_sum": result['weights_sum']- }- except Exception as e:- return {"success": False, "error": str(e)}+def op_covariance_matrix(data):+ """+ Compute covariance + correlation matrix and per-asset moments.+ Inputs:+ returns | tickers : see _normalize_returns_input+ """+ _require_modules()+ rets_df, assets = _normalize_returns_input(data)+ n = len(assets)++ cov = calculate_covariance_matrix(rets_df, None)+ corr = calculate_correlation_matrix(rets_df, None)+ moments = calculate_simulation_moments(rets_df, None)++ def _to_grid(df):+ # Return a list-of-rows dict with clean integer cells for the wire+ if not isinstance(df, pd.DataFrame):+ return []+ rows = []+ n_rows = df.shape[0]+ n_cols = df.shape[1]+ for r in range(n_rows):+ row = {"asset": str(assets[r]) if r < n else f"x{r}"}+ for c in range(n_cols):+ col_label = str(assets[c]) if c < n else f"x{c}"+ row[col_label] = _safe_float(float(df.iloc[r, c]))+ rows.append(row)+ return rows++ moments_rows = []+ if isinstance(moments, pd.DataFrame):+ for r in range(moments.shape[0]):+ asset = str(moments.index[r])+ row = {"asset": asset}+ for c in range(moments.shape[1]):+ col = str(moments.columns[c]).lower()+ row[col] = _safe_float(float(moments.iloc[r, c]))+ moments_rows.append(row)++ # Average off-diagonal correlation as a single-number summary+ if isinstance(corr, pd.DataFrame) and corr.shape[0] >= 2:+ cv = corr.values+ mask = ~np.eye(cv.shape[0], dtype=bool)+ avg_off_diag = float(cv[mask].mean())+ max_off_diag = float(cv[mask].max())+ min_off_diag = float(cv[mask].min())+ else:+ avg_off_diag = max_off_diag = min_off_diag = 0.0+ return {+ "n_assets": n,+ "n_observations": int(len(rets_df)),+ "assets": assets,+ "covariance_matrix": _to_grid(cov),+ "correlation_matrix": _to_grid(corr),+ "moments": moments_rows,+ "avg_off_diag_correlation": _safe_float(avg_off_diag),+ "max_off_diag_correlation": _safe_float(max_off_diag),+ "min_off_diag_correlation": _safe_float(min_off_diag),+ }-def full_analysis(params: Dict[str, Any]) -> Dict[str, Any]:- """Complete portfolio risk analysis"""- if not WRAPPERS_AVAILABLE:- return {"success": False, "error": "Wrapper modules not available"}- try:- returns = parse_returns_json(params['returns'])- weights = parse_weights(params['weights'])- alpha = params.get('alpha', 0.05)- half_life = params.get('half_life', 252)+def _opt_result_to_payload(result, assets):+ """Normalize an optimizer result dict into our display schema."""+ if not isinstance(result, dict) or not result.get("success", True):+ raise ValidationError(result.get("error", "optimizer returned a non-success payload"))+ weights_raw = result.get("weights", {})+ if isinstance(weights_raw, dict):+ weight_rows = [+ {"asset": str(k), "weight": _safe_float(v),+ "weight_pct": _safe_float(float(v) * 100.0)}+ for k, v in weights_raw.items()+ ]+ elif isinstance(weights_raw, (list, np.ndarray)):+ weight_rows = [+ {"asset": str(assets[i]) if i < len(assets) else f"x{i}",+ "weight": _safe_float(weights_raw[i]),+ "weight_pct": _safe_float(float(weights_raw[i]) * 100.0)}+ for i in range(len(weights_raw))+ ]+ else:+ weight_rows = []+ weights_arr = np.asarray([w["weight"] for w in weight_rows], dtype=float)+ out = {+ "weights": weight_rows,+ "expected_return": _safe_float(result.get("expected_return")),+ "annualized_return": _safe_float((1.0 + _safe_float(result.get("expected_return"))) ** 252 - 1.0),+ "volatility": _safe_float(result.get("volatility")),+ "annualized_volatility": _safe_float(_safe_float(result.get("volatility")) * math.sqrt(252)),+ "sharpe_ratio": _safe_float(result.get("sharpe_ratio")),+ "variance": _safe_float(result.get("variance")),+ "var": _safe_float(result.get("var")),+ "cvar": _safe_float(result.get("cvar")),+ "alpha": _safe_float(result.get("alpha", 0.0)),+ "n_assets": len(weight_rows),+ "max_weight": _safe_float(float(weights_arr.max()) if len(weights_arr) else 0.0),+ "min_weight": _safe_float(float(weights_arr.min()) if len(weights_arr) else 0.0),+ "concentration_hhi": _safe_float(float((weights_arr ** 2).sum()) if len(weights_arr) else 0.0),+ }+ return out+++def op_mean_variance_optimize(data):+ """+ Mean-Variance portfolio optimization.+ Inputs:+ returns | tickers : returns matrix+ objective : 'min_variance' | 'max_sharpe' | 'target_return' (default 'min_variance')+ target_return : float (required if objective='target_return')+ long_only : bool (default True)+ max_weight : float | null (default None)+ min_weight : float | null (default None)+ risk_free_rate : float (default 0.0)+ """+ _require_modules()+ rets_df, assets = _normalize_returns_input(data)+ objective = str(data.get("objective", "min_variance")).lower()+ long_only = bool(data.get("long_only", True))+ max_weight = data.get("max_weight")+ min_weight = data.get("min_weight")+ rf = _safe_float(data.get("risk_free_rate", 0.0))++ optimizer = MeanVarianceOptimizer(rets_df, risk_free_rate=rf)++ if objective == "min_variance":+ raw = optimizer.minimum_variance(long_only=long_only,+ max_weight=max_weight, min_weight=min_weight)+ elif objective == "max_sharpe":+ raw = optimizer.max_sharpe(long_only=long_only, max_weight=max_weight)+ elif objective == "target_return":+ target = data.get("target_return")+ if target is None:+ raise ValidationError("target_return is required when objective='target_return'")+ raw = optimizer.target_return(target=_safe_float(target),+ long_only=long_only, max_weight=max_weight)+ else:+ raise ValidationError(+ f"unknown objective {objective!r}; expected: min_variance, max_sharpe, target_return")++ payload = _opt_result_to_payload(raw, assets)+ payload["objective"] = objective+ payload["long_only"] = long_only+ payload["risk_free_rate"] = rf+ return payload+++def op_mean_cvar_optimize(data):+ """+ Mean-CVaR portfolio optimization.+ Inputs:+ returns | tickers : returns matrix+ objective : 'min_cvar' | 'target_return' (default 'min_cvar')+ target_return : float (required if objective='target_return')+ alpha : float (CVaR tail, default 0.05)+ long_only : bool+ max_weight : float | null+ min_weight : float | null+ """+ _require_modules()+ rets_df, assets = _normalize_returns_input(data)+ objective = str(data.get("objective", "min_cvar")).lower()+ alpha = _safe_float(data.get("alpha", 0.05))+ long_only = bool(data.get("long_only", True))+ max_weight = data.get("max_weight")+ min_weight = data.get("min_weight")++ if not (0.0 < alpha < 0.5):+ raise ValidationError(f"alpha must be in (0, 0.5), got {alpha}")++ optimizer = MeanCVaROptimizer(rets_df, alpha=alpha)++ if objective == "min_cvar":+ raw = optimizer.minimum_cvar(long_only=long_only,+ max_weight=max_weight, min_weight=min_weight)+ elif objective == "target_return":+ target = data.get("target_return")+ if target is None:+ raise ValidationError("target_return is required when objective='target_return'")+ raw = optimizer.target_return(target=_safe_float(target),+ long_only=long_only, max_weight=max_weight)+ else:+ raise ValidationError(+ f"unknown objective {objective!r}; expected: min_cvar, target_return")++ payload = _opt_result_to_payload(raw, assets)+ payload["objective"] = objective+ payload["long_only"] = long_only+ payload["alpha"] = alpha+ return payload+++def op_efficient_frontier(data):+ """+ Mean-Variance efficient frontier with N points.+ Inputs:+ returns | tickers : returns matrix+ n_points : int (default 20, clamped to [5, 50])+ long_only : bool (default True)+ max_weight : float | null+ risk_free_rate : float (default 0.0)+ """+ _require_modules()+ rets_df, assets = _normalize_returns_input(data)+ n_points = max(5, min(50, _safe_int(data.get("n_points", 20))))+ long_only = bool(data.get("long_only", True))+ max_weight = data.get("max_weight")+ rf = _safe_float(data.get("risk_free_rate", 0.0))++ optimizer = MeanVarianceOptimizer(rets_df, risk_free_rate=rf)+ raw = optimizer.efficient_frontier(n_points=n_points, long_only=long_only,+ max_weight=max_weight)++ if not isinstance(raw, dict) or not raw.get("success", True):+ raise ValidationError(raw.get("error", "efficient_frontier returned non-success"))++ frontier = raw.get("frontier", []) or []+ points = []+ for pt in frontier:+ ws = pt.get("weights", {})+ if isinstance(ws, dict):+ weight_rows = [{"asset": str(k), "weight": _safe_float(v)} for k, v in ws.items()]+ else:+ weight_rows = [+ {"asset": str(assets[i]) if i < len(assets) else f"x{i}",+ "weight": _safe_float(ws[i])}+ for i in range(len(ws))+ ]+ points.append({+ "expected_return": _safe_float(pt.get("expected_return")),+ "annualized_return": _safe_float((1.0 + _safe_float(pt.get("expected_return"))) ** 252 - 1.0),+ "volatility": _safe_float(pt.get("volatility")),+ "annualized_volatility": _safe_float(_safe_float(pt.get("volatility")) * math.sqrt(252)),+ "sharpe_ratio": _safe_float(pt.get("sharpe_ratio")),+ "weights": weight_rows,+ })- # Calculate exp decay probabilities- probs = calculate_exp_decay_probabilities(returns, half_life)+ # Identify special points+ min_var_pt = min(points, key=lambda p: p["volatility"]) if points else None+ max_sharpe_pt = max(points, key=lambda p: p["sharpe_ratio"]) if points else None- # Calculate metrics with equal weights- metrics_equal = calculate_all_metrics(weights, returns, None, alpha)+ return {+ "n_points": len(points),+ "n_assets": len(assets),+ "assets": assets,+ "long_only": long_only,+ "risk_free_rate": rf,+ "frontier": points,+ "min_volatility": _safe_float(min(p["volatility"] for p in points) if points else 0.0),+ "max_volatility": _safe_float(max(p["volatility"] for p in points) if points else 0.0),+ "min_return": _safe_float(min(p["expected_return"] for p in points) if points else 0.0),+ "max_return": _safe_float(max(p["expected_return"] for p in points) if points else 0.0),+ "best_sharpe": _safe_float(max(p["sharpe_ratio"] for p in points) if points else 0.0),+ "min_var_index": points.index(min_var_pt) if min_var_pt else -1,+ "max_sharpe_index": points.index(max_sharpe_pt) if max_sharpe_pt else -1,+ }- # Calculate metrics with exp decay weights- metrics_weighted = calculate_all_metrics(weights, returns, probs, alpha)- # Covariance and correlation- cov_matrix = calculate_covariance_matrix(returns)- corr_matrix = calculate_correlation_matrix(returns)+def op_exp_decay_probabilities(data):+ """+ Compute exponentially-decayed scenario probabilities for time-weighted analysis.+ Inputs:+ returns | tickers : returns matrix (only the row count matters)+ half_life : int (in observations, default 60)+ """+ _require_modules()+ rets_df, _assets = _normalize_returns_input(data)+ half_life = max(1, _safe_int(data.get("half_life", 60)))++ probs = calculate_exp_decay_probabilities(rets_df, half_life)+ probs_arr = np.asarray(probs).flatten()++ # Build a sampled (date, weight) curve for the wire — keep it under ~300 rows+ n = len(probs_arr)+ step = max(1, n // 300)+ rows = []+ if isinstance(rets_df.index, pd.DatetimeIndex):+ for i, p in enumerate(probs_arr):+ if i % step == 0:+ rows.append({"date": str(rets_df.index[i])[:10], "weight": _safe_float(float(p))})+ else:+ for i, p in enumerate(probs_arr):+ if i % step == 0:+ rows.append({"index": int(i), "weight": _safe_float(float(p))})- # Moments- moments = calculate_simulation_moments(returns)+ # Effective sample size (Kish): ESS = (sum p)^2 / sum p^2+ s = float(probs_arr.sum())+ s2 = float((probs_arr ** 2).sum())+ ess = (s * s) / s2 if s2 > 0 else 0.0- return {- "success": True,- "analysis": {- "metrics_equal_weight": metrics_equal,- "metrics_exp_decay": metrics_weighted,- "covariance_matrix": _matrix_to_flat_dict(cov_matrix) if isinstance(cov_matrix, pd.DataFrame) else None,- "correlation_matrix": _matrix_to_flat_dict(corr_matrix) if isinstance(corr_matrix, pd.DataFrame) else None,- "moments": _moments_to_flat_dict(moments) if isinstance(moments, pd.DataFrame) else None,- "half_life": half_life,- "alpha": alpha,- "n_scenarios": len(returns),- "n_assets": len(weights),- "assets": list(returns.columns) if hasattr(returns, 'columns') else None- }- }- except Exception as e:- return {"success": False, "error": str(e)}+ return {+ "n_scenarios": n,+ "half_life": half_life,+ "sum": _safe_float(s),+ "first_weight": _safe_float(float(probs_arr[0])),+ "last_weight": _safe_float(float(probs_arr[-1])),+ "max_weight": _safe_float(float(probs_arr.max())),+ "min_weight": _safe_float(float(probs_arr.min())),+ "weight_ratio_last_to_first": _safe_float(+ float(probs_arr[-1] / probs_arr[0]) if probs_arr[0] > 0 else 0.0),+ "effective_sample_size": _safe_float(ess),+ "ess_pct_of_n": _safe_float((ess / n) * 100.0) if n > 0 else 0.0,+ "weights": rows,+ }# ============================================================================-# MAIN ENTRY POINT+# DISPATCH TABLE# ============================================================================-def option_greeks(params: Dict[str, Any]) -> Dict[str, Any]:- """Calculate option Greeks (Delta, Gamma, Vega, Theta, Rho)"""- if not WRAPPERS_AVAILABLE:- return {"success": False, "error": "Wrapper modules not available"}+OPERATIONS = {+ "check_status": op_check_status,+ "portfolio_metrics": op_portfolio_metrics,+ "covariance_matrix": op_covariance_matrix,+ "mean_variance_optimize": op_mean_variance_optimize,+ "mean_cvar_optimize": op_mean_cvar_optimize,+ "efficient_frontier": op_efficient_frontier,+ "exp_decay_probabilities": op_exp_decay_probabilities,+}- try:- spot = params['spot_price']- strike = params['strike']- volatility = params['volatility']- risk_free_rate = params.get('risk_free_rate', 0.05)- dividend_yield = params.get('dividend_yield', 0.0)- time_to_maturity = params.get('time_to_maturity', 1.0)-- greeks = calculate_all_greeks(- spot_price=spot,- strike=strike,- volatility=volatility,- risk_free_rate=risk_free_rate,- dividend_yield=dividend_yield,- time_to_maturity=time_to_maturity- )+def dispatch(operation, data):+ handler = OPERATIONS.get(operation)+ if handler is None:return {- "success": True,- **greeks+ "success": False, "operation": operation,+ "error": f"Unknown operation: {operation}",+ "error_kind": "unknown_op",+ "available": list(OPERATIONS.keys()),}- except Exception as e:- return {"success": False, "error": str(e)}---def optimize_mean_variance(params: Dict[str, Any]) -> Dict[str, Any]:- """Mean-Variance portfolio optimization"""- if not OPTIMIZATION_AVAILABLE:- return {"success": False, "error": "Optimization module not available"}-- try:- returns = parse_returns_json(params['returns'])- objective = params.get('objective', 'min_variance') # min_variance, max_sharpe, target_return- long_only = params.get('long_only', True)- max_weight = params.get('max_weight', None)- min_weight = params.get('min_weight', None)- risk_free_rate = params.get('risk_free_rate', 0.0)- target_return = params.get('target_return', None)-- optimizer = MeanVarianceOptimizer(returns, risk_free_rate=risk_free_rate)-- if objective == 'min_variance':- result = optimizer.minimum_variance(long_only=long_only, max_weight=max_weight, min_weight=min_weight)- elif objective == 'max_sharpe':- result = optimizer.max_sharpe(long_only=long_only, max_weight=max_weight)- elif objective == 'target_return' and target_return is not None:- result = optimizer.target_return(target=target_return, long_only=long_only, max_weight=max_weight)- else:- result = optimizer.minimum_variance(long_only=long_only, max_weight=max_weight)-- return result- except Exception as e:- return {"success": False, "error": str(e)}---def optimize_mean_cvar(params: Dict[str, Any]) -> Dict[str, Any]:- """Mean-CVaR portfolio optimization"""- if not OPTIMIZATION_AVAILABLE:- return {"success": False, "error": "Optimization module not available"}-- try:- returns = parse_returns_json(params['returns'])- objective = params.get('objective', 'min_cvar') # min_cvar, target_return- alpha = params.get('alpha', 0.05)- long_only = params.get('long_only', True)- max_weight = params.get('max_weight', None)- min_weight = params.get('min_weight', None)- risk_free_rate = params.get('risk_free_rate', 0.0)- target_return = params.get('target_return', None)-- optimizer = MeanCVaROptimizer(returns, alpha=alpha, risk_free_rate=risk_free_rate)-- if objective == 'min_cvar':- result = optimizer.minimum_cvar(long_only=long_only, max_weight=max_weight, min_weight=min_weight)- elif objective == 'target_return' and target_return is not None:- result = optimizer.target_return(target=target_return, long_only=long_only, max_weight=max_weight)- else:- result = optimizer.minimum_cvar(long_only=long_only, max_weight=max_weight)-- return result- except Exception as e:- return {"success": False, "error": str(e)}---def efficient_frontier_mv(params: Dict[str, Any]) -> Dict[str, Any]:- """Generate Mean-Variance efficient frontier"""- if not OPTIMIZATION_AVAILABLE:- return {"success": False, "error": "Optimization module not available"}-try:- returns = parse_returns_json(params['returns'])- n_points = params.get('n_points', 20)- long_only = params.get('long_only', True)- max_weight = params.get('max_weight', None)- risk_free_rate = params.get('risk_free_rate', 0.0)-- optimizer = MeanVarianceOptimizer(returns, risk_free_rate=risk_free_rate)- result = optimizer.efficient_frontier(n_points=n_points, long_only=long_only, max_weight=max_weight)-- return result+ result = handler(data or {})+ return {"success": True, "operation": operation, "data": result}+ except ValidationError as e:+ return {"success": False, "operation": operation, "error": str(e),+ "error_kind": "validation"}except Exception as e:- return {"success": False, "error": str(e)}+ return {"success": False, "operation": operation, "error": str(e),+ "error_kind": "runtime", "traceback": traceback.format_exc()}-def efficient_frontier_cvar(params: Dict[str, Any]) -> Dict[str, Any]:- """Generate Mean-CVaR efficient frontier"""- if not OPTIMIZATION_AVAILABLE:- return {"success": False, "error": "Optimization module not available"}-- try:- returns = parse_returns_json(params['returns'])- n_points = params.get('n_points', 20)- alpha = params.get('alpha', 0.05)- long_only = params.get('long_only', True)- max_weight = params.get('max_weight', None)-- optimizer = MeanCVaROptimizer(returns, alpha=alpha)- result = optimizer.efficient_frontier(n_points=n_points, long_only=long_only, max_weight=max_weight)-- return result- except Exception as e:- return {"success": False, "error": str(e)}---def main(args: list) -> str:- """Main entry point for C++ command execution"""- if not args:- return serialize_result({"success": False, "error": "No command specified"})-- command = args[0]-- # Parse params - either from args or stdin- params = {}+def main(args):+ if len(args) < 1:+ print(json.dumps({+ "success": False,+ "error": "Usage: fortitudo_service.py <operation> [json_data]",+ "error_kind": "usage",+ }))+ return+ operation = args[0]+ data = {}if len(args) > 1:- if args[1] == "--stdin":- # Read params from stdin (for large payloads)- try:- stdin_data = sys.stdin.read()- params = json.loads(stdin_data)- except json.JSONDecodeError as e:- return serialize_result({"success": False, "error": f"Invalid JSON from stdin: {e}"})- else:- try:- params = json.loads(args[1])- except json.JSONDecodeError as e:- return serialize_result({"success": False, "error": f"Invalid JSON params: {e}"})- else:- # No explicit params arg — read from stdin (C++ execute_with_stdin pipes data here)try:- stdin_data = sys.stdin.read()- if stdin_data and stdin_data.strip():- params = json.loads(stdin_data)- except (json.JSONDecodeError, OSError):- pass-- # Route commands- handlers = {- "check_status": lambda: check_status(),- "portfolio_metrics": lambda: portfolio_metrics(params),- "covariance_analysis": lambda: covariance_analysis(params),- "exp_decay_weighting": lambda: exp_decay_weighting(params),- "option_pricing": lambda: option_pricing(params),- "option_chain": lambda: option_chain(params),- "option_greeks": lambda: option_greeks(params),- "entropy_pooling": lambda: entropy_pooling(params),- "exposure_stacking": lambda: exposure_stacking(params),- "full_analysis": lambda: full_analysis(params),- "optimize_mean_variance": lambda: optimize_mean_variance(params),- "optimize_mean_cvar": lambda: optimize_mean_cvar(params),- "efficient_frontier_mv": lambda: efficient_frontier_mv(params),- "efficient_frontier_cvar": lambda: efficient_frontier_cvar(params),- }-- if command in handlers:- result = handlers[command]()- return serialize_result(result)- else:- return serialize_result({- "success": False,- "error": f"Unknown command: {command}",- "available_commands": list(handlers.keys())- })+ data = json.loads(args[1])+ except json.JSONDecodeError as e:+ print(json.dumps({+ "success": False, "operation": operation,+ "error": f"Invalid JSON: {e}", "error_kind": "validation",+ }))+ return+ result = dispatch(operation, data)+ print(json.dumps(result, default=str))if __name__ == "__main__":- result = main(sys.argv[1:] if len(sys.argv) > 1 else [])- print(result)+ main(sys.argv[1:])diff --git a/fincept-qt/scripts/Analytics/fortitudo_tech_wrapper/fortitudo_service_legacy.py b/fincept-qt/scripts/Analytics/fortitudo_tech_wrapper/fortitudo_service_legacy.pynew file mode 100644index 000000000..68f32a549--- /dev/null+++ b/fincept-qt/scripts/Analytics/fortitudo_tech_wrapper/fortitudo_service_legacy.py@@ -0,0 +1,746 @@+"""+Fortitudo.tech Service - Python backend for analytics+===============================================================================++Provides JSON-RPC interface for C++ to call fortitudo.tech analytics functions.+Includes portfolio risk metrics, option pricing, entropy pooling, and exposure stacking.++Supports Python 3.14+ via pure NumPy/SciPy fallback implementations when fortitudo.tech+is not available (requires Python <3.14).+"""++import json+import sys+import os+from typing import Dict, List, Any, Optional+from datetime import datetime++# Add this script's directory to Python path for local imports+_script_dir = os.path.dirname(os.path.abspath(__file__))+if _script_dir not in sys.path:+ sys.path.insert(0, _script_dir)++import pandas as pd+import numpy as np++try:+ import fortitudo.tech as ft+ FORTITUDO_AVAILABLE = True+ FORTITUDO_VERSION = getattr(ft, '__version__', '1.2')+except ImportError:+ FORTITUDO_AVAILABLE = False+ FORTITUDO_VERSION = 'fallback'++# Import local wrapper modules (with fallback support)+try:+ from functions import (+ calculate_portfolio_volatility,+ calculate_portfolio_var,+ calculate_portfolio_cvar,+ calculate_covariance_matrix,+ calculate_correlation_matrix,+ calculate_simulation_moments,+ calculate_exp_decay_probabilities,+ calculate_normal_calibration,+ calculate_all_metrics,+ FORTITUDO_AVAILABLE as FUNCTIONS_AVAILABLE+ )+ from option_pricing import (+ price_call_option,+ price_put_option,+ calculate_forward_price,+ price_option_straddle,+ calculate_put_call_parity_check,+ calculate_all_greeks,+ FORTITUDO_AVAILABLE as OPTIONS_AVAILABLE+ )+ from advanced import (+ apply_entropy_pooling,+ apply_entropy_pooling_simple,+ calculate_exposure_stacking,+ FORTITUDO_AVAILABLE as ADVANCED_AVAILABLE+ )+ from optimization import (+ MeanVarianceOptimizer,+ MeanCVaROptimizer+ )+ WRAPPERS_AVAILABLE = True+ OPTIMIZATION_AVAILABLE = True+except ImportError as e:+ WRAPPERS_AVAILABLE = False+ OPTIMIZATION_AVAILABLE = False+ print(f"[fortitudo_service] Warning: Could not import wrappers: {e}", file=sys.stderr)+++def serialize_result(data: Any) -> str:+ """Serialize result to JSON, handling numpy/pandas types"""+ def convert(obj):+ if obj is None:+ return None+ if isinstance(obj, (np.integer, np.floating)):+ if np.isnan(obj):+ return None+ return float(obj)+ elif isinstance(obj, np.ndarray):+ return obj.tolist()+ elif isinstance(obj, np.bool_):+ return bool(obj)+ elif isinstance(obj, pd.DataFrame):+ # Handle DataFrames with tuple column names (MultiIndex)+ result = {}+ for col in obj.columns:+ col_key = str(col) if isinstance(col, tuple) else col+ result[col_key] = {}+ for idx in obj.index:+ idx_key = str(idx) if isinstance(idx, tuple) else str(idx)+ result[col_key][idx_key] = convert(obj.loc[idx, col])+ return result+ elif isinstance(obj, pd.Series):+ # Handle Series with tuple index+ return {str(k) if isinstance(k, tuple) else str(k): convert(v) for k, v in obj.items()}+ elif isinstance(obj, pd.Timestamp):+ return str(obj)+ elif isinstance(obj, datetime):+ return obj.isoformat()+ elif isinstance(obj, dict):+ # Convert tuple keys to strings for JSON compatibility+ return {str(k) if isinstance(k, tuple) else k: convert(v) for k, v in obj.items()}+ elif isinstance(obj, (list, tuple)):+ return [convert(i) for i in obj]+ return obj++ return json.dumps(convert(data), default=str)+++def fetch_returns_for_tickers(tickers_str: str) -> pd.DataFrame:+ """Fetch historical price data and compute daily returns for comma-separated tickers."""+ try:+ import yfinance as yf+ except ImportError:+ raise ValueError("yfinance not available; cannot fetch returns for tickers")+ tickers = [t.strip() for t in tickers_str.split(',') if t.strip()]+ if not tickers:+ raise ValueError("No valid tickers provided")++ if len(tickers) == 1:+ data = yf.download(tickers[0], period='1y', auto_adjust=True, progress=False)+ # Handle MultiIndex columns from newer yfinance versions+ if isinstance(data.columns, pd.MultiIndex):+ data.columns = data.columns.get_level_values(0)+ close = data['Close']+ df = close.pct_change().dropna().to_frame(name=tickers[0])+ else:+ data = yf.download(tickers, period='1y', auto_adjust=True, progress=False)+ # yfinance returns MultiIndex columns like ('Close', 'AAPL') for multiple tickers+ if isinstance(data.columns, pd.MultiIndex):+ # Extract just the 'Close' level+ if 'Close' in data.columns.get_level_values(0):+ close = data['Close']+ else:+ close = data.xs('Close', axis=1, level=0) if 'Close' in data.columns.get_level_values(0) else data+ else:+ close = data['Close'] if 'Close' in data.columns else data++ if isinstance(close, pd.Series):+ close = close.to_frame(name=tickers[0])++ # Compute returns, drop columns that are entirely NaN+ returns = close.pct_change()+ returns = returns.dropna(axis=1, how='all') # drop fully-empty columns+ returns = returns.dropna(axis=0, how='any') # drop rows with any NaN+ # Rename columns to match requested tickers if shape matches+ if returns.shape[1] == len(tickers):+ returns.columns = tickers+ df = returns++ if df.empty or df.shape[1] == 0:+ raise ValueError(f"No valid return data available for tickers: {tickers_str}")+ return df+++def parse_returns_json(returns_json: str) -> pd.DataFrame:+ """Parse JSON returns data into DataFrame"""+ # Handle plain ticker strings (e.g. "AAPL,MSFT") that aren't JSON-wrapped+ try:+ data = json.loads(returns_json)+ except (json.JSONDecodeError, TypeError):+ # Treat as a plain comma-separated ticker string+ data = returns_json++ # Handle the case where the frontend sends a JSON-encoded ticker string+ # e.g. JSON.stringify("AAPL,MSFT,GOOGL") → data is a plain string+ if isinstance(data, str):+ return fetch_returns_for_tickers(data)++ if isinstance(data, dict):+ first_value = next(iter(data.values()), None)+ if isinstance(first_value, dict):+ # Multi-asset: {symbol: {date: return}}+ df = pd.DataFrame(data)+ df.index = pd.to_datetime(df.index)+ else:+ # Single asset: {date: return}+ df = pd.DataFrame({'returns': data})+ df.index = pd.to_datetime(df.index)+ elif isinstance(data, list):+ df = pd.DataFrame(data)+ if 'date' in df.columns:+ df['date'] = pd.to_datetime(df['date'])+ df.set_index('date', inplace=True)+ if 'symbol' in df.columns:+ df = df.pivot(columns='symbol', values='returns')+ else:+ raise ValueError(f"Unsupported returns data format: {type(data)}")++ df = df.sort_index()+ return df+++def parse_weights(weights_json: str) -> np.ndarray:+ """Parse JSON weights into numpy array"""+ data = json.loads(weights_json)+ if isinstance(data, list):+ return np.array(data)+ elif isinstance(data, dict):+ return np.array(list(data.values()))+ else:+ raise ValueError(f"Unsupported weights format: {type(data)}")+++# ============================================================================+# COMMAND HANDLERS+# ============================================================================++def check_status() -> Dict[str, Any]:+ """Check fortitudo.tech library status"""+ mode = "native" if FORTITUDO_AVAILABLE else "fallback"+ return {+ "success": True,+ "available": WRAPPERS_AVAILABLE, # Changed: now True even in fallback mode+ "native_available": FORTITUDO_AVAILABLE,+ "wrappers_available": WRAPPERS_AVAILABLE,+ "mode": mode,+ "version": FORTITUDO_VERSION,+ "message": f"Fortitudo.tech analytics ready ({mode} mode)"+ }+++def portfolio_metrics(params: Dict[str, Any]) -> Dict[str, Any]:+ """Calculate comprehensive portfolio risk metrics"""+ if not WRAPPERS_AVAILABLE:+ return {"success": False, "error": "Wrapper modules not available"}++ try:+ returns = parse_returns_json(params['returns'])+ weights = parse_weights(params['weights'])+ alpha = params.get('alpha', 0.05)++ # Get optional probabilities+ probabilities = None+ if 'probabilities' in params and params['probabilities']:+ probabilities = np.array(json.loads(params['probabilities']))++ # Calculate all metrics+ metrics = calculate_all_metrics(weights, returns, probabilities, alpha)++ return {+ "success": True,+ "metrics": metrics,+ "n_scenarios": len(returns),+ "n_assets": len(weights)+ }+ except Exception as e:+ return {"success": False, "error": str(e)}+++def _clean_label(label) -> str:+ """Extract a clean string label from potentially tuple/integer index values."""+ if isinstance(label, tuple):+ # fortitudo returns (int, 'TICKER') tuples — take the string part+ parts = [str(p) for p in label if not isinstance(p, (int, float)) or isinstance(p, bool)]+ if parts:+ return parts[-1]+ return str(label[-1])+ return str(label)+++def _matrix_to_flat_dict(df: pd.DataFrame) -> dict:+ """Flatten a square matrix DataFrame into labelled scalar entries for the UI.+ Uses .iloc to avoid issues with tuple/integer index labels from fortitudo.tech."""+ result = {}+ if not isinstance(df, pd.DataFrame):+ return {"raw": str(df)}+ n = df.shape[0]+ # Build clean row/col labels+ row_labels = [_clean_label(idx) for idx in df.index]+ col_labels = [_clean_label(col) for col in df.columns]+ # If col_labels are just integers, use row_labels for columns too (square matrix)+ all_int_cols = all(lbl.isdigit() for lbl in col_labels)+ if all_int_cols and len(col_labels) == len(row_labels):+ col_labels = row_labels+ for r in range(n):+ for c in range(n):+ key = f"{row_labels[r]} / {col_labels[c]}"+ val = df.iloc[r, c]+ result[key] = round(float(val), 8) if not isinstance(val, (str, bool)) else val+ return result+++def _moments_to_flat_dict(df: pd.DataFrame) -> dict:+ """Flatten moments DataFrame (assets as rows, metrics as columns) into labelled scalars."""+ result = {}+ if not isinstance(df, pd.DataFrame):+ return {"raw": str(df)}+ for r in range(len(df.index)):+ asset = _clean_label(df.index[r])+ for c in range(len(df.columns)):+ metric = _clean_label(df.columns[c])+ val = df.iloc[r, c]+ result[f"{asset} {metric}"] = round(float(val), 8) if not isinstance(val, (str, bool)) else val+ return result+++def covariance_analysis(params: Dict[str, Any]) -> Dict[str, Any]:+ """Calculate covariance and correlation matrices"""+ if not WRAPPERS_AVAILABLE:+ return {"success": False, "error": "Wrapper modules not available"}++ try:+ returns = parse_returns_json(params['returns'])++ probabilities = None+ if 'probabilities' in params and params['probabilities']:+ probabilities = np.array(json.loads(params['probabilities']))++ cov_matrix = calculate_covariance_matrix(returns, probabilities)+ corr_matrix = calculate_correlation_matrix(returns, probabilities)+ moments = calculate_simulation_moments(returns, probabilities)++ assets = list(returns.columns) if hasattr(returns, 'columns') else []++ return {+ "success": True,+ "covariance_matrix": _matrix_to_flat_dict(cov_matrix),+ "correlation_matrix": _matrix_to_flat_dict(corr_matrix),+ "moments": _moments_to_flat_dict(moments),+ "assets": assets,+ "n_assets": len(assets),+ "n_observations": len(returns)+ }+ except Exception as e:+ return {"success": False, "error": str(e)}+++def exp_decay_weighting(params: Dict[str, Any]) -> Dict[str, Any]:+ """Calculate exponentially decaying probabilities"""+ if not WRAPPERS_AVAILABLE:+ return {"success": False, "error": "Wrapper modules not available"}++ try:+ returns = parse_returns_json(params['returns'])+ half_life = params.get('half_life', 252)++ probs = calculate_exp_decay_probabilities(returns, half_life)++ return {+ "success": True,+ "probabilities": probs.flatten().tolist(),+ "half_life": half_life,+ "n_scenarios": len(probs),+ "sum": float(probs.sum())+ }+ except Exception as e:+ return {"success": False, "error": str(e)}+++def option_pricing(params: Dict[str, Any]) -> Dict[str, Any]:+ """Price options using Black-Scholes model"""+ if not WRAPPERS_AVAILABLE:+ return {"success": False, "error": "Wrapper modules not available"}++ try:+ spot = params['spot_price']+ strike = params['strike']+ volatility = params['volatility']+ risk_free_rate = params.get('risk_free_rate', 0.05)+ dividend_yield = params.get('dividend_yield', 0.0)+ time_to_maturity = params.get('time_to_maturity', 1.0)++ # Calculate forward price+ forward = calculate_forward_price(spot, risk_free_rate, dividend_yield, time_to_maturity)++ # Price call and put+ call_price = price_call_option(forward, strike, volatility, risk_free_rate, time_to_maturity)+ put_price = price_put_option(forward, strike, volatility, risk_free_rate, time_to_maturity)++ # Straddle+ straddle = price_option_straddle(forward, strike, volatility, risk_free_rate, time_to_maturity)++ # Put-call parity check+ parity = calculate_put_call_parity_check(spot, strike, volatility, risk_free_rate, dividend_yield, time_to_maturity)++ return {+ "success": True,+ "forward_price": forward,+ "call_price": call_price,+ "put_price": put_price,+ "straddle": straddle,+ "parity_check": parity+ }+ except Exception as e:+ return {"success": False, "error": str(e)}+++def option_chain(params: Dict[str, Any]) -> Dict[str, Any]:+ """Generate option chain for multiple strikes"""+ if not WRAPPERS_AVAILABLE:+ return {"success": False, "error": "Wrapper modules not available"}++ try:+ spot = params['spot_price']+ strikes = params.get('strikes', [spot * 0.9, spot * 0.95, spot, spot * 1.05, spot * 1.1])+ volatility = params['volatility']+ risk_free_rate = params.get('risk_free_rate', 0.05)+ dividend_yield = params.get('dividend_yield', 0.0)+ time_to_maturity = params.get('time_to_maturity', 1.0)++ forward = calculate_forward_price(spot, risk_free_rate, dividend_yield, time_to_maturity)++ chain = []+ for strike in strikes:+ call = price_call_option(forward, strike, volatility, risk_free_rate, time_to_maturity)+ put = price_put_option(forward, strike, volatility, risk_free_rate, time_to_maturity)+ chain.append({+ "strike": strike,+ "call_price": call,+ "put_price": put,+ "moneyness": strike / spot+ })++ return {+ "success": True,+ "spot_price": spot,+ "forward_price": forward,+ "chain": chain+ }+ except Exception as e:+ return {"success": False, "error": str(e)}+++def entropy_pooling(params: Dict[str, Any]) -> Dict[str, Any]:+ """Apply entropy pooling for scenario probability adjustment"""+ if not WRAPPERS_AVAILABLE:+ return {"success": False, "error": "Wrapper modules not available"}++ try:+ n_scenarios = params['n_scenarios']+ max_probability = params.get('max_probability', None)++ result = apply_entropy_pooling_simple(+ n_scenarios=n_scenarios,+ max_probability=max_probability+ )++ return {+ "success": True,+ "prior_probabilities": result['prior_probabilities'].tolist(),+ "posterior_probabilities": result['posterior_probabilities'].tolist(),+ "effective_scenarios_prior": result['effective_scenarios_prior'],+ "effective_scenarios_posterior": result['effective_scenarios_posterior'],+ "max_probability": result['max_probability'],+ "min_probability": result['min_probability']+ }+ except Exception as e:+ return {"success": False, "error": str(e)}+++def exposure_stacking(params: Dict[str, Any]) -> Dict[str, Any]:+ """Calculate exposure stacking portfolio"""+ if not WRAPPERS_AVAILABLE:+ return {"success": False, "error": "Wrapper modules not available"}++ try:+ raw = json.loads(params['sample_portfolios'])+ sample_portfolios = np.array(raw)++ # Frontend sends a 1-D weights array for a single portfolio.+ # calculate_exposure_stacking expects shape (n_assets, n_samples).+ # Reshape and tile to produce n_samples=8 perturbations around the+ # submitted weights so the routine has something meaningful to stack.+ if sample_portfolios.ndim == 1:+ n_assets = len(sample_portfolios)+ # Normalize so weights sum to 1+ total = sample_portfolios.sum()+ if total > 0:+ sample_portfolios = sample_portfolios / total+ # Generate 8 slightly perturbed copies to form a proper sample matrix+ rng = np.random.default_rng(42)+ n_samples = 8+ noise = rng.dirichlet(np.ones(n_assets), size=n_samples).T * 0.1+ base = sample_portfolios.reshape(-1, 1)+ perturbed = base * 0.9 + noise # (n_assets, n_samples)+ # Renormalize each column+ perturbed = perturbed / perturbed.sum(axis=0, keepdims=True)+ # Include the original as first column+ sample_portfolios = np.hstack([base, perturbed]) # (n_assets, n_samples+1)++ n_partitions = params.get('n_partitions', 4)++ result = calculate_exposure_stacking(sample_portfolios, n_partitions)++ return {+ "success": True,+ "stacked_weights": result['stacked_weights'],+ "mean_sample_weights": result['mean_sample_weights'],+ "std_sample_weights": result['std_sample_weights'],+ "n_assets": result['n_assets'],+ "n_samples": result['n_samples'],+ "n_partitions": result['n_partitions'],+ "weights_sum": result['weights_sum']+ }+ except Exception as e:+ return {"success": False, "error": str(e)}+++def full_analysis(params: Dict[str, Any]) -> Dict[str, Any]:+ """Complete portfolio risk analysis"""+ if not WRAPPERS_AVAILABLE:+ return {"success": False, "error": "Wrapper modules not available"}++ try:+ returns = parse_returns_json(params['returns'])+ weights = parse_weights(params['weights'])+ alpha = params.get('alpha', 0.05)+ half_life = params.get('half_life', 252)++ # Calculate exp decay probabilities+ probs = calculate_exp_decay_probabilities(returns, half_life)++ # Calculate metrics with equal weights+ metrics_equal = calculate_all_metrics(weights, returns, None, alpha)++ # Calculate metrics with exp decay weights+ metrics_weighted = calculate_all_metrics(weights, returns, probs, alpha)++ # Covariance and correlation+ cov_matrix = calculate_covariance_matrix(returns)+ corr_matrix = calculate_correlation_matrix(returns)++ # Moments+ moments = calculate_simulation_moments(returns)++ return {+ "success": True,+ "analysis": {+ "metrics_equal_weight": metrics_equal,+ "metrics_exp_decay": metrics_weighted,+ "covariance_matrix": _matrix_to_flat_dict(cov_matrix) if isinstance(cov_matrix, pd.DataFrame) else None,+ "correlation_matrix": _matrix_to_flat_dict(corr_matrix) if isinstance(corr_matrix, pd.DataFrame) else None,+ "moments": _moments_to_flat_dict(moments) if isinstance(moments, pd.DataFrame) else None,+ "half_life": half_life,+ "alpha": alpha,+ "n_scenarios": len(returns),+ "n_assets": len(weights),+ "assets": list(returns.columns) if hasattr(returns, 'columns') else None+ }+ }+ except Exception as e:+ return {"success": False, "error": str(e)}+++# ============================================================================+# MAIN ENTRY POINT+# ============================================================================++def option_greeks(params: Dict[str, Any]) -> Dict[str, Any]:+ """Calculate option Greeks (Delta, Gamma, Vega, Theta, Rho)"""+ if not WRAPPERS_AVAILABLE:+ return {"success": False, "error": "Wrapper modules not available"}++ try:+ spot = params['spot_price']+ strike = params['strike']+ volatility = params['volatility']+ risk_free_rate = params.get('risk_free_rate', 0.05)+ dividend_yield = params.get('dividend_yield', 0.0)+ time_to_maturity = params.get('time_to_maturity', 1.0)++ greeks = calculate_all_greeks(+ spot_price=spot,+ strike=strike,+ volatility=volatility,+ risk_free_rate=risk_free_rate,+ dividend_yield=dividend_yield,+ time_to_maturity=time_to_maturity+ )++ return {+ "success": True,+ **greeks+ }+ except Exception as e:+ return {"success": False, "error": str(e)}+++def optimize_mean_variance(params: Dict[str, Any]) -> Dict[str, Any]:+ """Mean-Variance portfolio optimization"""+ if not OPTIMIZATION_AVAILABLE:+ return {"success": False, "error": "Optimization module not available"}++ try:+ returns = parse_returns_json(params['returns'])+ objective = params.get('objective', 'min_variance') # min_variance, max_sharpe, target_return+ long_only = params.get('long_only', True)+ max_weight = params.get('max_weight', None)+ min_weight = params.get('min_weight', None)+ risk_free_rate = params.get('risk_free_rate', 0.0)+ target_return = params.get('target_return', None)++ optimizer = MeanVarianceOptimizer(returns, risk_free_rate=risk_free_rate)++ if objective == 'min_variance':+ result = optimizer.minimum_variance(long_only=long_only, max_weight=max_weight, min_weight=min_weight)+ elif objective == 'max_sharpe':+ result = optimizer.max_sharpe(long_only=long_only, max_weight=max_weight)+ elif objective == 'target_return' and target_return is not None:+ result = optimizer.target_return(target=target_return, long_only=long_only, max_weight=max_weight)+ else:+ result = optimizer.minimum_variance(long_only=long_only, max_weight=max_weight)++ return result+ except Exception as e:+ return {"success": False, "error": str(e)}+++def optimize_mean_cvar(params: Dict[str, Any]) -> Dict[str, Any]:+ """Mean-CVaR portfolio optimization"""+ if not OPTIMIZATION_AVAILABLE:+ return {"success": False, "error": "Optimization module not available"}++ try:+ returns = parse_returns_json(params['returns'])+ objective = params.get('objective', 'min_cvar') # min_cvar, target_return+ alpha = params.get('alpha', 0.05)+ long_only = params.get('long_only', True)+ max_weight = params.get('max_weight', None)+ min_weight = params.get('min_weight', None)+ risk_free_rate = params.get('risk_free_rate', 0.0)+ target_return = params.get('target_return', None)++ optimizer = MeanCVaROptimizer(returns, alpha=alpha, risk_free_rate=risk_free_rate)++ if objective == 'min_cvar':+ result = optimizer.minimum_cvar(long_only=long_only, max_weight=max_weight, min_weight=min_weight)+ elif objective == 'target_return' and target_return is not None:+ result = optimizer.target_return(target=target_return, long_only=long_only, max_weight=max_weight)+ else:+ result = optimizer.minimum_cvar(long_only=long_only, max_weight=max_weight)++ return result+ except Exception as e:+ return {"success": False, "error": str(e)}+++def efficient_frontier_mv(params: Dict[str, Any]) -> Dict[str, Any]:+ """Generate Mean-Variance efficient frontier"""+ if not OPTIMIZATION_AVAILABLE:+ return {"success": False, "error": "Optimization module not available"}++ try:+ returns = parse_returns_json(params['returns'])+ n_points = params.get('n_points', 20)+ long_only = params.get('long_only', True)+ max_weight = params.get('max_weight', None)+ risk_free_rate = params.get('risk_free_rate', 0.0)++ optimizer = MeanVarianceOptimizer(returns, risk_free_rate=risk_free_rate)+ result = optimizer.efficient_frontier(n_points=n_points, long_only=long_only, max_weight=max_weight)++ return result+ except Exception as e:+ return {"success": False, "error": str(e)}+++def efficient_frontier_cvar(params: Dict[str, Any]) -> Dict[str, Any]:+ """Generate Mean-CVaR efficient frontier"""+ if not OPTIMIZATION_AVAILABLE:+ return {"success": False, "error": "Optimization module not available"}++ try:+ returns = parse_returns_json(params['returns'])+ n_points = params.get('n_points', 20)+ alpha = params.get('alpha', 0.05)+ long_only = params.get('long_only', True)+ max_weight = params.get('max_weight', None)++ optimizer = MeanCVaROptimizer(returns, alpha=alpha)+ result = optimizer.efficient_frontier(n_points=n_points, long_only=long_only, max_weight=max_weight)++ return result+ except Exception as e:+ return {"success": False, "error": str(e)}+++def main(args: list) -> str:+ """Main entry point for C++ command execution"""+ if not args:+ return serialize_result({"success": False, "error": "No command specified"})++ command = args[0]++ # Parse params - either from args or stdin+ params = {}+ if len(args) > 1:+ if args[1] == "--stdin":+ # Read params from stdin (for large payloads)+ try:+ stdin_data = sys.stdin.read()+ params = json.loads(stdin_data)+ except json.JSONDecodeError as e:+ return serialize_result({"success": False, "error": f"Invalid JSON from stdin: {e}"})+ else:+ try:+ params = json.loads(args[1])+ except json.JSONDecodeError as e:+ return serialize_result({"success": False, "error": f"Invalid JSON params: {e}"})+ else:+ # No explicit params arg — read from stdin (C++ execute_with_stdin pipes data here)+ try:+ stdin_data = sys.stdin.read()+ if stdin_data and stdin_data.strip():+ params = json.loads(stdin_data)+ except (json.JSONDecodeError, OSError):+ pass++ # Route commands+ handlers = {+ "check_status": lambda: check_status(),+ "portfolio_metrics": lambda: portfolio_metrics(params),+ "covariance_analysis": lambda: covariance_analysis(params),+ "exp_decay_weighting": lambda: exp_decay_weighting(params),+ "option_pricing": lambda: option_pricing(params),+ "option_chain": lambda: option_chain(params),+ "option_greeks": lambda: option_greeks(params),+ "entropy_pooling": lambda: entropy_pooling(params),+ "exposure_stacking": lambda: exposure_stacking(params),+ "full_analysis": lambda: full_analysis(params),+ "optimize_mean_variance": lambda: optimize_mean_variance(params),+ "optimize_mean_cvar": lambda: optimize_mean_cvar(params),+ "efficient_frontier_mv": lambda: efficient_frontier_mv(params),+ "efficient_frontier_cvar": lambda: efficient_frontier_cvar(params),+ }++ if command in handlers:+ result = handlers[command]()+ return serialize_result(result)+ else:+ return serialize_result({+ "success": False,+ "error": f"Unknown command: {command}",+ "available_commands": list(handlers.keys())+ })+++if __name__ == "__main__":+ result = main(sys.argv[1:] if len(sys.argv) > 1 else [])+ print(result)diff --git a/fincept-qt/scripts/Analytics/functime_wrapper/functime_service.py b/fincept-qt/scripts/Analytics/functime_wrapper/functime_service.pyindex 61da4c65a..54ce5a902 100644--- a/fincept-qt/scripts/Analytics/functime_wrapper/functime_service.py+++ b/fincept-qt/scripts/Analytics/functime_wrapper/functime_service.py@@ -1,1354 +1,793 @@"""-Functime Service - Python backend for analytics-=================================================================--Provides JSON-RPC interface for C++ to call functime forecasting functions.--Note: This service provides local-only forecasting when functime cloud is not configured.-Uses sklearn-based implementations as fallback for cloud API.+Functime Service (pandas/sklearn/statsmodels backend)+======================================================+Self-contained time-series analytics service for the Fincept Terminal+"Functime" sub-tab. Does not require the polars-based functime library+(the original wrapper is preserved as functime_service_polars_legacy.py).++Response contract (all ops):+ success: bool+ operation: str+ data: dict (when success)+ error: str (when failure)+ error_kind: str | None (validation | runtime | unknown_op)+ traceback: str | None (only on uncaught exceptions)"""-import jsonimport sysimport os-from typing import Dict, List, Any, Optional+import json+import math+import tracebackfrom datetime import datetime, timedelta--# Add this script's directory to Python path for local imports-_script_dir = os.path.dirname(os.path.abspath(__file__))-if _script_dir not in sys.path:- sys.path.insert(0, _script_dir)+from typing import Dict, List, Any, Optionalimport numpy as np+import pandas as pd+# Fail loudly only on truly missing essentials.try:- import polars as pl- POLARS_AVAILABLE = True-except ImportError:- POLARS_AVAILABLE = False--# Try sklearn for local fallback-try:- from sklearn.linear_model import LinearRegression, Lasso, Ridge, ElasticNet, LassoCV, RidgeCV, ElasticNetCV+ from sklearn.linear_model import LinearRegression, Lasso, Ridge, ElasticNetfrom sklearn.neighbors import KNeighborsRegressor- from sklearn.model_selection import GridSearchCV, TimeSeriesSplit- SKLEARN_AVAILABLE = True+ from sklearn.ensemble import IsolationForest+ SKLEARN_OK = Trueexcept ImportError:- SKLEARN_AVAILABLE = False+ SKLEARN_OK = Falsetry:- from lightgbm import LGBMRegressor- LIGHTGBM_AVAILABLE = True+ from statsmodels.tsa.seasonal import STL+ from statsmodels.tsa.holtwinters import ExponentialSmoothing+ from statsmodels.tsa.arima.model import ARIMA+ from statsmodels.tsa.stattools import adfuller, kpss, acf+ STATSMODELS_OK = Trueexcept ImportError:- LIGHTGBM_AVAILABLE = False--# Check if functime cloud is available and configured-FUNCTIME_CLOUD_AVAILABLE = False-try:- import functime- # Check if credentials exist- import toml- config_path = os.path.expanduser("~/.functime.toml")- if os.path.exists(config_path):- with open(config_path, 'r') as f:- config = toml.load(f)- if config.get('token_id') and config.get('token_secret'):- FUNCTIME_CLOUD_AVAILABLE = True-except:- pass--# Use local sklearn implementation as default-FUNCTIME_AVAILABLE = SKLEARN_AVAILABLE and POLARS_AVAILABLE--# Import local modules after path fix-if FUNCTIME_AVAILABLE:- try:- from preprocessing import (- apply_boxcox, scale_data, difference_data,- create_lags, create_rolling_features, impute_missing- )- from cross_validation import (- split_train_test, create_expanding_window_splits,- create_sliding_window_splits- )- from metrics import (- calculate_mae, calculate_rmse, calculate_smape,- calculate_mape, calculate_mse- )- from feature_extraction import (- create_calendar_effects, create_future_calendar_effects- )- from offsets import frequency_to_seasonal_period- except ImportError as e:- print(f"Warning: Could not import local modules: {e}", file=sys.stderr)--# Import advanced modules-try:- from advanced_models import (- naive_forecast, seasonal_naive_forecast, drift_forecast,- ses_forecast, holt_forecast, theta_forecast,- croston_forecast, xgboost_forecast, catboost_forecast- )- ADVANCED_MODELS_AVAILABLE = True-except ImportError as e:- ADVANCED_MODELS_AVAILABLE = False- print(f"Warning: Could not import advanced_models: {e}", file=sys.stderr)--try:- from ensemble import (- ensemble_mean, ensemble_median, ensemble_trimmed_mean,- ensemble_weighted, ensemble_stacking, auto_ensemble- )- ENSEMBLE_AVAILABLE = True-except ImportError as e:- ENSEMBLE_AVAILABLE = False- print(f"Warning: Could not import ensemble: {e}", file=sys.stderr)--try:- from anomaly_detection import (- detect_zscore, detect_iqr, detect_grubbs,- detect_isolation_forest, detect_lof,- detect_residual_anomalies, detect_change_points- )- ANOMALY_AVAILABLE = True-except ImportError as e:- ANOMALY_AVAILABLE = False- print(f"Warning: Could not import anomaly_detection: {e}", file=sys.stderr)--try:- from seasonality import (- detect_seasonal_period, decompose_stl, decompose_classical,- seasonally_adjust, calculate_seasonality_metrics- )- SEASONALITY_AVAILABLE = True-except ImportError as e:- SEASONALITY_AVAILABLE = False- print(f"Warning: Could not import seasonality: {e}", file=sys.stderr)--try:- from confidence_intervals import (- bootstrap_prediction_intervals, residual_prediction_intervals,- quantile_prediction_intervals, conformal_prediction_intervals,- monte_carlo_intervals- )- CONFIDENCE_AVAILABLE = True-except ImportError as e:- CONFIDENCE_AVAILABLE = False- print(f"Warning: Could not import confidence_intervals: {e}", file=sys.stderr)+ STATSMODELS_OK = Falsetry:- from feature_importance import (- calculate_permutation_importance, calculate_model_importance,- calculate_shap_importance, analyze_lag_importance, sensitivity_analysis- )- FEATURE_IMPORTANCE_AVAILABLE = True-except ImportError as e:- FEATURE_IMPORTANCE_AVAILABLE = False- print(f"Warning: Could not import feature_importance: {e}", file=sys.stderr)--try:- from advanced_cv import (- blocked_time_series_cv, purged_kfold_cv, combinatorial_purged_cv,- walk_forward_validation, nested_cv, get_cv_splits- )- ADVANCED_CV_AVAILABLE = True-except ImportError as e:- ADVANCED_CV_AVAILABLE = False- print(f"Warning: Could not import advanced_cv: {e}", file=sys.stderr)--try:- from backtesting import (- walk_forward_backtest, compare_models_backtest,- rolling_origin_evaluation, performance_attribution, backtest_summary- )- BACKTESTING_AVAILABLE = True-except ImportError as e:- BACKTESTING_AVAILABLE = False- print(f"Warning: Could not import backtesting: {e}", file=sys.stderr)---def parse_panel_data_json(data_json: str) -> "pl.DataFrame":- """Parse JSON data into Polars DataFrame for functime panel data format"""- data = json.loads(data_json)-- if isinstance(data, dict):- # Check if it's multi-entity format {entity: {date: value}}- first_value = next(iter(data.values()), None)- if isinstance(first_value, dict):- # Multi-entity: {entity: {date: value}}- rows = []- for entity_id, time_values in data.items():- for time_str, value in time_values.items():- rows.append({- 'entity_id': entity_id,- 'time': time_str,- 'value': float(value)- })- df = pl.DataFrame(rows)- df = df.with_columns([- pl.col('time').str.to_datetime()- ])- else:- # Single entity: {date: value} - wrap as entity 'default'- rows = []- for time_str, value in data.items():- rows.append({- 'entity_id': 'default',- 'time': time_str,- 'value': float(value)- })- df = pl.DataFrame(rows)- df = df.with_columns([- pl.col('time').str.to_datetime()- ])- elif isinstance(data, list):- # Array format: [{entity_id, time, value}, ...]- df = pl.DataFrame(data)- if 'time' in df.columns and df['time'].dtype == pl.Utf8:- df = df.with_columns([- pl.col('time').str.to_datetime()- ])- if 'entity_id' not in df.columns:- df = df.with_columns([- pl.lit('default').alias('entity_id')- ])- else:- raise ValueError(f"Unsupported data format: {type(data)}")-- # Sort by entity_id and time- df = df.sort(['entity_id', 'time'])- return df---def serialize_to_json(obj: Any) -> str:- """Convert object to JSON string with proper type handling"""- from datetime import date-- def convert(item):- if item is None:- return None- if isinstance(item, datetime):- return item.isoformat()- if isinstance(item, date):- return item.isoformat()- if isinstance(item, (np.integer, np.floating)):- return float(item)- if isinstance(item, np.ndarray):- return [convert(v) for v in item.tolist()]- if isinstance(item, np.bool_):- return bool(item)- if POLARS_AVAILABLE and isinstance(item, pl.DataFrame):- return [convert(d) for d in item.to_dicts()]- if POLARS_AVAILABLE and isinstance(item, pl.Series):- return [convert(v) for v in item.to_list()]- if isinstance(item, dict):- return {str(k): convert(v) for k, v in item.items()}- if isinstance(item, (list, tuple)):- return [convert(v) for v in item]- if isinstance(item, float) and np.isnan(item):- return None- return item-- return json.dumps(convert(obj))---def serialize_result(data: Any) -> str:- """Serialize result to JSON, handling numpy/polars types"""- from datetime import date-- def convert(obj):- # Handle None first- if obj is None:- return None-- # Handle numpy types- if isinstance(obj, (np.integer, np.floating)):- if np.isnan(obj):- return None- return float(obj)- elif isinstance(obj, np.ndarray):- return [convert(v) for v in obj.tolist()]- elif isinstance(obj, np.bool_):- return bool(obj)-- # Handle polars types- elif POLARS_AVAILABLE and isinstance(obj, pl.DataFrame):- return [convert(d) for d in obj.to_dicts()]- elif POLARS_AVAILABLE and isinstance(obj, pl.Series):- return [convert(v) for v in obj.to_list()]-- # Handle datetime and date- elif isinstance(obj, datetime):- return obj.isoformat()- elif isinstance(obj, date):- return obj.isoformat()-- # Handle NaN for scalar floats- elif isinstance(obj, float) and np.isnan(obj):- return None-- # Handle tuples (convert to list)- elif isinstance(obj, tuple):- return [convert(v) for v in obj]-- # Handle dicts and lists - convert tuple keys to strings- elif isinstance(obj, dict):- return {str(k) if isinstance(k, tuple) else str(k): convert(v) for k, v in obj.items()}- elif isinstance(obj, list):- return [convert(v) for v in obj]-- # Return as-is for other types- return obj-- return json.dumps(convert(data), indent=2)+ from scipy import stats as scstats+ SCIPY_OK = True+except ImportError:+ SCIPY_OK = False# ============================================================================-# COMMAND HANDLERS+# INPUT COERCION + VALIDATION# ============================================================================-def check_status() -> Dict[str, Any]:- """Check functime library availability and version"""- return {- "success": True,- "available": FUNCTIME_AVAILABLE,- "sklearn_available": SKLEARN_AVAILABLE,- "polars_available": POLARS_AVAILABLE,- "lightgbm_available": LIGHTGBM_AVAILABLE,- "functime_cloud_available": FUNCTIME_CLOUD_AVAILABLE,- "advanced_models_available": ADVANCED_MODELS_AVAILABLE,- "ensemble_available": ENSEMBLE_AVAILABLE,- "anomaly_available": ANOMALY_AVAILABLE,- "seasonality_available": SEASONALITY_AVAILABLE,- "confidence_available": CONFIDENCE_AVAILABLE,- "feature_importance_available": FEATURE_IMPORTANCE_AVAILABLE,- "advanced_cv_available": ADVANCED_CV_AVAILABLE,- "backtesting_available": BACKTESTING_AVAILABLE,- "message": "Time series forecasting ready (sklearn backend)" if FUNCTIME_AVAILABLE else "scikit-learn or polars not installed"- }---def run_forecast(params: Dict[str, Any]) -> Dict[str, Any]:- """Run forecasting with specified model using sklearn backend"""- if not FUNCTIME_AVAILABLE:- return {"success": False, "error": "Forecasting library not available (sklearn or polars missing)"}-- try:- data = parse_panel_data_json(params['data'])- model_type = params.get('model', 'linear')- fh = params.get('horizon', 7)- freq = params.get('frequency', '1d')-- # Model parameters- alpha = params.get('alpha', 1.0)- l1_ratio = params.get('l1_ratio', 0.5)- n_neighbors = params.get('n_neighbors', 5)- lags = params.get('lags', 3) # Number of lags for autoregression-- # Get unique entities- entities = data['entity_id'].unique().to_list()- all_forecasts = []- final_best_params = None-- for entity_id in entities:- entity_data = data.filter(pl.col('entity_id') == entity_id).sort('time')- times = entity_data['time'].to_list()- values = entity_data['value'].to_numpy()-- if len(values) < lags + 1:- continue-- # Create lag features- X, y = [], []- for i in range(lags, len(values)):- X.append(values[i-lags:i])- y.append(values[i])- X = np.array(X)- y = np.array(y)-- # Select and fit model- best_params = None-- if model_type == 'linear':- model = LinearRegression()- elif model_type == 'lasso':- model = Lasso(alpha=alpha)- elif model_type == 'ridge':- model = Ridge(alpha=alpha)- elif model_type == 'elasticnet':- model = ElasticNet(alpha=alpha, l1_ratio=l1_ratio)- elif model_type == 'knn':- model = KNeighborsRegressor(n_neighbors=min(n_neighbors, len(X)))- elif model_type == 'lightgbm':- if not LIGHTGBM_AVAILABLE:- return {"success": False, "error": "LightGBM not installed. Please install: pip install lightgbm"}- model = LGBMRegressor(n_estimators=100, verbosity=-1)-- # Auto-tuned models with cross-validation- elif model_type == 'auto_lasso':- alphas = np.logspace(-4, 2, 50)- cv_splits = min(5, len(X) - 1)- if cv_splits < 2:- cv_splits = 2- model = LassoCV(alphas=alphas, cv=cv_splits, max_iter=10000)- model.fit(X, y)- best_params = {'alpha': float(model.alpha_)}-- elif model_type == 'auto_ridge':- alphas = np.logspace(-4, 4, 50)- cv_splits = min(5, len(X) - 1)- if cv_splits < 2:- cv_splits = 2- model = RidgeCV(alphas=alphas, cv=cv_splits)- model.fit(X, y)- best_params = {'alpha': float(model.alpha_)}-- elif model_type == 'auto_elasticnet':- alphas = np.logspace(-4, 2, 20)- l1_ratios = [0.1, 0.3, 0.5, 0.7, 0.9, 0.95, 0.99]- cv_splits = min(5, len(X) - 1)- if cv_splits < 2:- cv_splits = 2- model = ElasticNetCV(alphas=alphas, l1_ratio=l1_ratios, cv=cv_splits, max_iter=10000)- model.fit(X, y)- best_params = {'alpha': float(model.alpha_), 'l1_ratio': float(model.l1_ratio_)}-- elif model_type == 'auto_knn':- # Grid search for best n_neighbors- max_neighbors = min(20, len(X) - 1)- if max_neighbors < 1:- max_neighbors = 1- param_grid = {'n_neighbors': list(range(1, max_neighbors + 1, 2))}- cv_splits = min(3, len(X) - 1)- if cv_splits < 2:- cv_splits = 2- base_model = KNeighborsRegressor()- tscv = TimeSeriesSplit(n_splits=cv_splits)- grid_search = GridSearchCV(base_model, param_grid, cv=tscv, scoring='neg_mean_squared_error')- grid_search.fit(X, y)- model = grid_search.best_estimator_- best_params = grid_search.best_params_-- elif model_type == 'auto_lightgbm':- if not LIGHTGBM_AVAILABLE:- return {"success": False, "error": "LightGBM not installed. Please install: pip install lightgbm"}- param_grid = {- 'n_estimators': [50, 100, 200],- 'learning_rate': [0.01, 0.05, 0.1],- 'max_depth': [3, 5, 7]- }- cv_splits = min(3, len(X) - 1)- if cv_splits < 2:- cv_splits = 2- base_model = LGBMRegressor(verbosity=-1)- tscv = TimeSeriesSplit(n_splits=cv_splits)- grid_search = GridSearchCV(base_model, param_grid, cv=tscv, scoring='neg_mean_squared_error')- grid_search.fit(X, y)- model = grid_search.best_estimator_- best_params = grid_search.best_params_-- else:- return {"success": False, "error": f"Unknown model type: {model_type}. Supported: linear, lasso, ridge, elasticnet, knn, lightgbm, auto_lasso, auto_ridge, auto_elasticnet, auto_knn, auto_lightgbm"}-- # Fit model if not already fitted by CV- if model_type not in ['auto_lasso', 'auto_ridge', 'auto_elasticnet', 'auto_knn', 'auto_lightgbm']:- model.fit(X, y)-- # Store best params from first entity (they're the same for all)- if best_params and final_best_params is None:- final_best_params = best_params-- # Generate future forecasts- last_values = values[-lags:].tolist()- last_time = times[-1]-- # Parse frequency to timedelta- freq_map = {- '1d': timedelta(days=1),- '1h': timedelta(hours=1),- '1w': timedelta(weeks=1),- '1mo': timedelta(days=30),- '1m': timedelta(minutes=1),- }- delta = freq_map.get(freq, timedelta(days=1))-- for h in range(fh):- X_pred = np.array([last_values[-lags:]])- y_pred = model.predict(X_pred)[0]- forecast_time = last_time + delta * (h + 1)-- all_forecasts.append({- 'entity_id': entity_id,- 'time': forecast_time.isoformat() if hasattr(forecast_time, 'isoformat') else str(forecast_time),- 'value': float(y_pred)- })-- last_values.append(y_pred)-- return {- "success": True,- "model": model_type,- "horizon": fh,- "frequency": freq,- "lags": lags,- "forecast": all_forecasts,- "shape": [len(all_forecasts), 3],- "best_params": final_best_params,- "backend": "sklearn"- }- except Exception as e:- import traceback- return {"success": False, "error": str(e), "traceback": traceback.format_exc()}---def preprocess_data(params: Dict[str, Any]) -> Dict[str, Any]:- """Apply preprocessing transformations"""- if not FUNCTIME_AVAILABLE:- return {"success": False, "error": "Functime library not available"}-- try:- data = parse_panel_data_json(params['data'])- method = params.get('method', 'scale')-- if method == 'boxcox':- lmbda = params.get('lambda')- result = apply_boxcox(data, lmbda=lmbda)- elif method == 'scale':- scale_method = params.get('scale_method', 'standard')- result = scale_data(data, method=scale_method)- elif method == 'difference':- order = params.get('order', 1)- result = difference_data(data, order=order)- elif method == 'lags':- lags = params.get('lags', [1, 2, 3])- result = create_lags(data, lags=lags)- elif method == 'rolling':- window_sizes = params.get('window_sizes', [3, 7])- stats = params.get('stats', ['mean'])- result = create_rolling_features(data, window_sizes=window_sizes, stats=stats)- elif method == 'impute':- impute_method = params.get('impute_method', 'forward')- result = impute_missing(data, method=impute_method)- else:- return {"success": False, "error": f"Unknown preprocessing method: {method}"}-- return {- "success": True,- "method": method,- "shape": result.get('shape', []),- "columns": result.get('columns', []),- "data": result.get(list(result.keys())[0], []) # Get first data key- }- except Exception as e:- return {"success": False, "error": str(e)}---def cross_validate(params: Dict[str, Any]) -> Dict[str, Any]:- """Perform cross-validation splits"""- if not FUNCTIME_AVAILABLE:- return {"success": False, "error": "Functime library not available"}-- try:- data = parse_panel_data_json(params['data'])- method = params.get('method', 'train_test')- test_size = params.get('test_size', 1)- n_splits = params.get('n_splits', 3)-- if method == 'train_test':- result = split_train_test(data, test_size=test_size)- return {- "success": True,- "method": method,- "train_shape": result['train_shape'],- "test_shape": result['test_shape']- }- elif method == 'expanding':- step = params.get('step', 1)- result = create_expanding_window_splits(- data, test_size=test_size, n_splits=n_splits, step=step- )- return {- "success": True,- "method": method,- "n_splits": result['n_splits'],- "splits_summary": [- {"train_shape": s['train_shape'], "test_shape": s['test_shape']}- for s in result['splits']- ]- }- elif method == 'sliding':- train_size = params.get('train_size', 5)- step = params.get('step', 1)- result = create_sliding_window_splits(- data, train_size=train_size, test_size=test_size,- n_splits=n_splits, step=step- )- return {- "success": True,- "method": method,- "n_splits": result['n_splits'],- "splits_summary": [- {"train_shape": s['train_shape'], "test_shape": s['test_shape']}- for s in result['splits']- ]- }- else:- return {"success": False, "error": f"Unknown CV method: {method}"}- except Exception as e:- return {"success": False, "error": str(e)}---def calculate_metrics(params: Dict[str, Any]) -> Dict[str, Any]:- """Calculate forecast accuracy metrics"""- if not FUNCTIME_AVAILABLE:- return {"success": False, "error": "Functime library not available"}-- try:- y_true = parse_panel_data_json(params['y_true'])- y_pred = parse_panel_data_json(params['y_pred'])- metrics_list = params.get('metrics', ['mae', 'rmse', 'smape'])-- results = {}-- if 'mae' in metrics_list:- try:- mae_result = calculate_mae(y_true, y_pred)- results['mae'] = mae_result['mean_mae']- except Exception:- results['mae'] = None-- if 'rmse' in metrics_list:- try:- rmse_result = calculate_rmse(y_true, y_pred)- results['rmse'] = rmse_result['mean_rmse']- except Exception:- results['rmse'] = None+class ValidationError(ValueError):+ """Raised when an op's input doesn't pass coercion/length checks."""+ pass- if 'smape' in metrics_list:- try:- smape_result = calculate_smape(y_true, y_pred)- results['smape'] = smape_result['mean_smape']- except Exception:- results['smape'] = None- if 'mape' in metrics_list:+def _coerce_floats(value, field_name):+ """+ Accept list[number], tuple[number], np.ndarray, or a CSV / whitespace-separated string.+ Returns list[float]. Empty / None -> [].+ """+ if value is None:+ return []+ if isinstance(value, (list, tuple)):+ out = []+ for i, v in enumerate(value):try:- mape_result = calculate_mape(y_true, y_pred)- results['mape'] = mape_result['mean_mape']- except Exception:- results['mape'] = None-- if 'mse' in metrics_list:+ out.append(float(v))+ except (TypeError, ValueError):+ raise ValidationError(f"{field_name}[{i}] is not numeric: {v!r}")+ return out+ if isinstance(value, np.ndarray):+ return [float(v) for v in value.tolist()]+ if isinstance(value, str):+ s = value.strip()+ if not s:+ return []+ for sep in [",", ";", "\t", "\n"]:+ s = s.replace(sep, " ")+ parts = [p for p in s.split(" ") if p.strip()]+ out = []+ for i, p in enumerate(parts):try:- mse_result = calculate_mse(y_true, y_pred)- results['mse'] = mse_result['mean_mse']- except Exception:- results['mse'] = None-- return {- "success": True,- "metrics": results- }- except Exception as e:- return {"success": False, "error": str(e)}---def add_features(params: Dict[str, Any]) -> Dict[str, Any]:- """Add calendar/holiday features"""- if not FUNCTIME_AVAILABLE:- return {"success": False, "error": "Functime library not available"}-+ out.append(float(p))+ except ValueError:+ raise ValidationError(f"{field_name}[{i}] is not numeric: {p!r}")+ return outtry:- data = parse_panel_data_json(params['data'])- feature_type = params.get('feature_type', 'calendar')- freq = params.get('frequency', '1d')-- if feature_type == 'calendar':- result = create_calendar_effects(data, freq=freq)- elif feature_type == 'future_calendar':- fh = params.get('horizon', 7)- result = create_future_calendar_effects(fh=fh, freq=freq)- else:- return {"success": False, "error": f"Unknown feature type: {feature_type}"}-- return {- "success": True,- "feature_type": feature_type,- "shape": result.get('shape', []),- "columns": result.get('columns', []),- "data": result.get('data', [])- }- except Exception as e:- return {"success": False, "error": str(e)}+ return [float(value)]+ except (TypeError, ValueError):+ raise ValidationError(f"{field_name} is not numeric: {value!r}")-def get_seasonal_period(params: Dict[str, Any]) -> Dict[str, Any]:- """Get seasonal period for a frequency"""- if not FUNCTIME_AVAILABLE:- return {"success": False, "error": "Functime library not available"}+def _require_min_length(values, n, field_name):+ if len(values) < n:+ raise ValidationError(+ f"{field_name} needs at least {n} values, got {len(values)}")- try:- freq = params.get('frequency', '1d')- result = frequency_to_seasonal_period(freq)-- return {- "success": True,- "frequency": freq,- "seasonal_period": result['seasonal_period']- }- except Exception as e:- return {"success": False, "error": str(e)}+def _series_from_list(values, dates=None, name="series"):+ """Build a pd.Series of floats with a date index (default daily)."""+ if dates:+ idx = pd.to_datetime(dates)+ else:+ idx = pd.date_range("2020-01-01", periods=len(values), freq="B")+ return pd.Series(np.asarray(values, dtype=float), index=idx, name=name)-def full_forecast_pipeline(params: Dict[str, Any]) -> Dict[str, Any]:- """Run a complete forecasting pipeline with preprocessing and evaluation"""- if not FUNCTIME_AVAILABLE:- return {"success": False, "error": "Forecasting library not available (sklearn or polars missing)"}+def _safe_float(v, default=0.0):try:- data = parse_panel_data_json(params['data'])- model_type = params.get('model', 'linear')- fh = params.get('horizon', 7)- freq = params.get('frequency', '1d')- test_size = params.get('test_size', fh)- preprocess_method = params.get('preprocess', None)-- # Skip preprocessing for now - use data as-is- processed_data = data- preprocessing_info = None-- if preprocess_method and preprocess_method != 'none':- preprocessing_info = {"method": preprocess_method, "note": "Preprocessing not applied - using raw data"}+ f = float(v)+ except (TypeError, ValueError):+ return default+ if math.isnan(f) or math.isinf(f):+ return default+ return f- # Train/test split: Hold out test_size rows per entity for evaluation- # We train on earlier data, make predictions for the test period, and compare- train_data = processed_data- test_data = None-- try:- # Group by entity and split- entities = processed_data['entity_id'].unique().to_list()- train_rows = []- test_rows = []-- for entity_id in entities:- entity_data = processed_data.filter(pl.col('entity_id') == entity_id).sort('time')- n = len(entity_data)- if n > test_size:- train_rows.extend(entity_data.head(n - test_size).to_dicts())- test_rows.extend(entity_data.tail(test_size).to_dicts())- else:- train_rows.extend(entity_data.to_dicts())-- train_data = pl.DataFrame(train_rows) if train_rows else processed_data- test_data = pl.DataFrame(test_rows) if test_rows else None- except Exception as e:- # If split fails, use all data for training- train_data = processed_data- print(f"Warning: Could not split data: {e}", file=sys.stderr)-- # Calculate evaluation metrics BEFORE generating the final forecast- # We need to predict on the test period using the training data- metrics = None- if test_data is not None and len(test_data) > 0:- try:- # Get actual test values- y_true_values = test_data['value'].to_numpy()-- # For evaluation, we predict for test_size periods from training data- eval_forecast_result = run_forecast({- 'data': serialize_to_json(train_data.to_dicts()),- 'model': model_type,- 'horizon': min(test_size, len(y_true_values)), # Match test size- 'frequency': freq- })-- if eval_forecast_result.get('success'):- forecast_list = eval_forecast_result.get('forecast', [])- if len(forecast_list) > 0:- y_pred_values = np.array([f['value'] for f in forecast_list])-- if len(y_pred_values) > 0 and len(y_true_values) > 0:- min_len = min(len(y_true_values), len(y_pred_values))- y_true = y_true_values[:min_len]- y_pred = y_pred_values[:min_len]-- mae = float(np.mean(np.abs(y_true - y_pred)))- rmse = float(np.sqrt(np.mean((y_true - y_pred) ** 2)))- # SMAPE- smape = float(np.mean(2 * np.abs(y_true - y_pred) / (np.abs(y_true) + np.abs(y_pred) + 1e-8)) * 100)-- metrics = {- 'mae': mae,- 'rmse': rmse,- 'smape': smape- }- except Exception as e:- print(f"Warning: Could not calculate metrics: {e}", file=sys.stderr)-- # Now run forecast on FULL data for actual future predictions- forecast_result = run_forecast({- 'data': serialize_to_json(processed_data.to_dicts()),- 'model': model_type,- 'horizon': fh,- 'frequency': freq- })-- return {- "success": True,- "model": model_type,- "horizon": fh,- "frequency": freq,- "preprocessing": preprocessing_info,- "forecast": forecast_result.get('forecast', []),- "forecast_shape": forecast_result.get('shape'),- "best_params": forecast_result.get('best_params'),- "evaluation_metrics": metrics,- "data_summary": {- "total_rows": len(data),- "entities": data['entity_id'].n_unique() if 'entity_id' in data.columns else 1,- "train_size": len(train_data) if train_data is not None else 0,- "test_size": len(test_data) if test_data is not None else 0- }- }- except Exception as e:- return {"success": False, "error": str(e)}---# ============================================================================-# ADVANCED MODELS COMMAND HANDLERS-# ============================================================================--def run_advanced_forecast(params: Dict[str, Any]) -> Dict[str, Any]:- """Run advanced forecasting models (naive, SES, Holt, Theta, Croston, XGBoost, CatBoost)"""- if not ADVANCED_MODELS_AVAILABLE:- return {"success": False, "error": "Advanced models not available"}+def _safe_int(v, default=0):try:- data = parse_panel_data_json(params['data'])- model_type = params.get('model', 'naive')- fh = params.get('horizon', 7)- freq = params.get('frequency', '1d')-- model_params = params.get('model_params', {})-- if model_type == 'naive':- result = naive_forecast(data, fh=fh, freq=freq)- elif model_type == 'seasonal_naive':- seasonal_period = model_params.get('seasonal_period', 7)- result = seasonal_naive_forecast(data, fh=fh, seasonal_period=seasonal_period, freq=freq)- elif model_type == 'drift':- result = drift_forecast(data, fh=fh, freq=freq)- elif model_type == 'ses':- alpha = model_params.get('alpha')- result = ses_forecast(data, fh=fh, alpha=alpha, freq=freq)- elif model_type == 'holt':- alpha = model_params.get('alpha')- beta = model_params.get('beta')- result = holt_forecast(data, fh=fh, alpha=alpha, beta=beta, freq=freq)- elif model_type == 'theta':- result = theta_forecast(data, fh=fh, freq=freq)- elif model_type == 'croston':- alpha = model_params.get('alpha', 0.1)- result = croston_forecast(data, fh=fh, alpha=alpha, freq=freq)- elif model_type == 'xgboost':- n_lags = model_params.get('n_lags', 10)- xgb_params = model_params.get('xgb_params', {})- result = xgboost_forecast(data, fh=fh, n_lags=n_lags, xgb_params=xgb_params, freq=freq)- elif model_type == 'catboost':- n_lags = model_params.get('n_lags', 10)- cat_params = model_params.get('cat_params', {})- result = catboost_forecast(data, fh=fh, n_lags=n_lags, cat_params=cat_params, freq=freq)- else:- return {"success": False, "error": f"Unknown advanced model: {model_type}"}-- return result- except Exception as e:- import traceback- return {"success": False, "error": str(e), "traceback": traceback.format_exc()}+ f = float(v)+ if math.isnan(f) or math.isinf(f):+ return default+ return int(f)+ except (TypeError, ValueError):+ return default+++def _sample_curve(series, max_points=250):+ """Return [{date, value}] sampled to ~max_points entries, always including the last."""+ out = []+ if series is None or len(series) == 0:+ return out+ step = max(1, len(series) // max_points)+ for i, (d, v) in enumerate(series.items()):+ if i % step == 0:+ out.append({"date": str(d)[:10], "value": _safe_float(v)})+ last_date = str(series.index[-1])[:10]+ if not out or out[-1]["date"] != last_date:+ out.append({"date": last_date, "value": _safe_float(series.iloc[-1])})+ return out# ============================================================================-# ENSEMBLE COMMAND HANDLERS+# OPERATION HANDLERS# ============================================================================-def run_ensemble(params: Dict[str, Any]) -> Dict[str, Any]:- """Run ensemble forecasting"""- if not ENSEMBLE_AVAILABLE:- return {"success": False, "error": "Ensemble methods not available"}-- try:- forecasts_json = params.get('forecasts', [])- method = params.get('method', 'mean')-- # Parse forecasts - each should be a list of {entity_id, time, value}- if isinstance(forecasts_json, str):- forecasts_json = json.loads(forecasts_json)-- forecasts = [pl.DataFrame(fc) for fc in forecasts_json]-- if method == 'mean':- result = ensemble_mean(forecasts)- elif method == 'median':- result = ensemble_median(forecasts)- elif method == 'trimmed_mean':- trim_pct = params.get('trim_pct', 0.1)- result = ensemble_trimmed_mean(forecasts, trim_pct=trim_pct)- elif method == 'weighted':- weights = params.get('weights')- result = ensemble_weighted(forecasts, weights=weights)- elif method == 'stacking':- y_train = parse_panel_data_json(params['y_train'])- result = ensemble_stacking(forecasts, y_train)- else:- return {"success": False, "error": f"Unknown ensemble method: {method}"}-- return result- except Exception as e:- return {"success": False, "error": str(e)}---def run_auto_ensemble(params: Dict[str, Any]) -> Dict[str, Any]:- """Run automatic ensemble selection and combination"""- if not ENSEMBLE_AVAILABLE:- return {"success": False, "error": "Ensemble methods not available"}-- try:- data = parse_panel_data_json(params['data'])- fh = params.get('horizon', 7)- freq = params.get('frequency', '1d')- n_best = params.get('n_best', 3)-- result = auto_ensemble(data, fh=fh, freq=freq, n_best=n_best)- return result- except Exception as e:- return {"success": False, "error": str(e)}---# ============================================================================-# ANOMALY DETECTION COMMAND HANDLERS-# ============================================================================+def op_check_status(_data):+ """Report library availability — no inputs."""+ return {+ "sklearn": SKLEARN_OK,+ "statsmodels": STATSMODELS_OK,+ "scipy": SCIPY_OK,+ "backend": "pandas + sklearn + statsmodels",+ "ops_available": list(OPERATIONS.keys()),+ }-def run_anomaly_detection(params: Dict[str, Any]) -> Dict[str, Any]:- """Run anomaly detection on time series"""- if not ANOMALY_AVAILABLE:- return {"success": False, "error": "Anomaly detection not available"}- try:- data = parse_panel_data_json(params['data'])- method = params.get('method', 'zscore')-- if method == 'zscore':- threshold = params.get('threshold', 3.0)- result = detect_zscore(data, threshold=threshold)- elif method == 'iqr':- multiplier = params.get('multiplier', 1.5)- result = detect_iqr(data, k=multiplier)- elif method == 'grubbs':- alpha = params.get('alpha', 0.05)- result = detect_grubbs(data, alpha=alpha)- elif method == 'isolation_forest':- contamination = params.get('contamination', 0.05)- result = detect_isolation_forest(data, contamination=contamination)- elif method == 'lof':- n_neighbors = params.get('n_neighbors', 20)- contamination = params.get('contamination', 0.05)- result = detect_lof(data, n_neighbors=n_neighbors, contamination=contamination)- elif method == 'residual':- threshold = params.get('threshold', 3.0)- result = detect_residual_anomalies(data, threshold=threshold)- elif method == 'change_points':- n_bkps = params.get('n_bkps', 5)- result = detect_change_points(data, n_bkps=n_bkps)- else:- return {"success": False, "error": f"Unknown anomaly method: {method}"}-- # Restructure result to match frontend expectations- # Frontend expects: { results: { entity_id: { anomalies: [...], n_anomalies, anomaly_rate } } }- if result.get('success') and 'data' in result:- # Group anomalies by entity_id- all_data = result.get('data', [])- anomalies_list = result.get('anomalies', [])-- # Group by entity_id- entities_results = {}- for item in all_data:- entity_id = item.get('entity_id', 'default')- if entity_id not in entities_results:- entities_results[entity_id] = {- 'anomalies': [],- 'n_anomalies': 0,- 'anomaly_rate': 0.0,- 'total_points': 0- }- entities_results[entity_id]['total_points'] += 1- if item.get('is_anomaly'):- entities_results[entity_id]['anomalies'].append(item)- entities_results[entity_id]['n_anomalies'] += 1-- # Calculate anomaly rate per entity- for entity_id, entity_data in entities_results.items():- if entity_data['total_points'] > 0:- entity_data['anomaly_rate'] = entity_data['n_anomalies'] / entity_data['total_points']- del entity_data['total_points'] # Remove temp field-- return {- 'success': True,- 'method': result.get('method', method),- 'results': entities_results- }-- return result- except Exception as e:- import traceback- return {"success": False, "error": str(e), "traceback": traceback.format_exc()}+def op_forecast(data):+ """+ Multi-model forecasting.+ Inputs:+ values : list[float] | CSV string (required, >= 30 values)+ model : 'linear' | 'ridge' | 'lasso' | 'elasticnet' | 'knn' |+ 'holt_winters' | 'arima' | 'naive' | 'drift' (default: 'linear')+ horizon : int (default: 14)+ lags : int (default: 7)+ alpha : float (regularization for ridge/lasso/elasticnet, default 1.0)+ l1_ratio : float (elasticnet only, default 0.5)+ n_neighbors : int (knn only, default 5)+ season : int (holt_winters/arima seasonal period, default 0=disabled)+ """+ if not SKLEARN_OK:+ raise ValidationError("sklearn is not installed in the venv — cannot run forecast")++ values = _coerce_floats(data.get("values"), "values")+ _require_min_length(values, 30, "values")++ model_type = str(data.get("model", "linear")).lower()+ horizon = max(1, _safe_int(data.get("horizon", 14)))+ lags = max(1, _safe_int(data.get("lags", 7)))+ alpha = _safe_float(data.get("alpha", 1.0))+ l1_ratio = _safe_float(data.get("l1_ratio", 0.5))+ n_neighbors = max(1, _safe_int(data.get("n_neighbors", 5)))+ season = max(0, _safe_int(data.get("season", 0)))++ series = _series_from_list(values, data.get("dates"))+ arr = series.to_numpy()+ n = len(arr)++ # Compute in-sample fit and out-of-sample forecast+ in_sample = np.full(n, np.nan)+ forecast: List[float] = []++ def _ml_forecast(model):+ # Build lag matrix+ if n <= lags + 1:+ raise ValidationError(f"need at least lags+2={lags + 2} observations, got {n}")+ X, y = [], []+ for i in range(lags, n):+ X.append(arr[i - lags:i])+ y.append(arr[i])+ X = np.asarray(X, dtype=float)+ y = np.asarray(y, dtype=float)+ model.fit(X, y)+ # In-sample fitted (fit ignores first `lags` points)+ in_sample[lags:] = model.predict(X)+ # Recursive out-of-sample+ last = list(arr[-lags:])+ out = []+ for _ in range(horizon):+ x_pred = np.asarray([last[-lags:]], dtype=float)+ yhat = float(model.predict(x_pred)[0])+ out.append(yhat)+ last.append(yhat)+ return out++ if model_type == "linear":+ forecast = _ml_forecast(LinearRegression())+ elif model_type == "ridge":+ forecast = _ml_forecast(Ridge(alpha=alpha))+ elif model_type == "lasso":+ forecast = _ml_forecast(Lasso(alpha=alpha, max_iter=10000))+ elif model_type == "elasticnet":+ forecast = _ml_forecast(ElasticNet(alpha=alpha, l1_ratio=l1_ratio, max_iter=10000))+ elif model_type == "knn":+ forecast = _ml_forecast(KNeighborsRegressor(n_neighbors=min(n_neighbors, max(1, n - lags - 1))))+ elif model_type == "naive":+ # Repeat the last value+ in_sample[1:] = arr[:-1]+ forecast = [float(arr[-1])] * horizon+ elif model_type == "drift":+ # Linear interpolation from first to last point+ slope = (arr[-1] - arr[0]) / (n - 1) if n > 1 else 0.0+ in_sample[1:] = arr[:-1] + slope+ forecast = [float(arr[-1] + slope * (i + 1)) for i in range(horizon)]+ elif model_type == "holt_winters":+ if not STATSMODELS_OK:+ raise ValidationError("statsmodels not installed — cannot run holt_winters")+ kwargs = {"trend": "add"}+ if season >= 2:+ kwargs.update({"seasonal": "add", "seasonal_periods": season})+ try:+ mdl = ExponentialSmoothing(arr, **kwargs).fit(optimized=True)+ except Exception as e:+ raise ValidationError(f"holt_winters fit failed: {e}")+ in_sample[:] = mdl.fittedvalues+ forecast = [float(v) for v in mdl.forecast(horizon)]+ elif model_type == "arima":+ if not STATSMODELS_OK:+ raise ValidationError("statsmodels not installed — cannot run arima")+ order = (1, 1, 1)+ seasonal_order = (0, 0, 0, 0)+ if season >= 2:+ seasonal_order = (1, 0, 1, season)+ try:+ mdl = ARIMA(arr, order=order, seasonal_order=seasonal_order).fit()+ except Exception as e:+ raise ValidationError(f"arima fit failed: {e}")+ in_sample[:] = mdl.fittedvalues+ forecast = [float(v) for v in mdl.forecast(horizon)]+ else:+ raise ValidationError(+ f"unknown model {model_type!r}; expected one of: "+ "linear, ridge, lasso, elasticnet, knn, naive, drift, holt_winters, arima")+ # Build forecast dates (extend the last frequency)+ if isinstance(series.index, pd.DatetimeIndex) and len(series.index) >= 2:+ delta = series.index[-1] - series.index[-2]+ else:+ delta = pd.Timedelta(days=1)+ forecast_dates = [series.index[-1] + delta * (i + 1) for i in range(horizon)]++ # In-sample residuals + summary+ fitted = pd.Series(in_sample, index=series.index)+ resid = (series - fitted).dropna()+ resid_std = float(resid.std()) if len(resid) > 1 else 0.0+ if len(resid) > 0:+ rss = float((resid ** 2).sum())+ tss = float(((series.loc[resid.index] - series.loc[resid.index].mean()) ** 2).sum())+ r2 = 1.0 - rss / tss if tss > 0 else 0.0+ mae = float(resid.abs().mean())+ rmse = float(np.sqrt((resid ** 2).mean()))+ else:+ r2, mae, rmse = 0.0, 0.0, 0.0++ history = _sample_curve(series, 250)+ in_sample_curve = []+ for d, v in fitted.items():+ if not math.isnan(v):+ in_sample_curve.append({"date": str(d)[:10], "value": _safe_float(v)})+ # Subsample fitted to ~250 too+ if len(in_sample_curve) > 250:+ step = max(1, len(in_sample_curve) // 250)+ in_sample_curve = [r for i, r in enumerate(in_sample_curve) if i % step == 0]-# ============================================================================-# SEASONALITY COMMAND HANDLERS-# ============================================================================+ return {+ "model": model_type,+ "n_observations": n,+ "horizon": horizon,+ "lags": lags,+ "season": season,+ "in_sample_r2": _safe_float(r2),+ "in_sample_mae": _safe_float(mae),+ "in_sample_rmse": _safe_float(rmse),+ "residual_std": _safe_float(resid_std),+ "history": history,+ "fitted": in_sample_curve,+ "forecast": [+ {"date": str(d)[:10], "value": _safe_float(v)}+ for d, v in zip(forecast_dates, forecast)+ ],+ "forecast_min": _safe_float(min(forecast) if forecast else 0.0),+ "forecast_max": _safe_float(max(forecast) if forecast else 0.0),+ "forecast_mean": _safe_float(float(np.mean(forecast)) if forecast else 0.0),+ "last_actual": _safe_float(arr[-1]),+ "first_forecast": _safe_float(forecast[0] if forecast else 0.0),+ "last_forecast": _safe_float(forecast[-1] if forecast else 0.0),+ }-def run_seasonality_analysis(params: Dict[str, Any]) -> Dict[str, Any]:- """Run seasonality analysis on time series"""- if not SEASONALITY_AVAILABLE:- return {"success": False, "error": "Seasonality analysis not available"}- try:- data = parse_panel_data_json(params['data'])- # Support both 'operation' and 'analysis_type' parameter names- operation = params.get('operation') or params.get('analysis_type', 'decompose')-- # Map analysis_type values to operation values- operation_map = {- 'decompose': 'decompose_stl',- 'detect': 'detect_period',- 'strength': 'metrics',- 'adjust': 'adjust',- }- operation = operation_map.get(operation, operation)-- period = params.get('period')- model_type = params.get('model_type', 'additive')-- if operation == 'detect_period':- method = params.get('method', 'fft')- max_period = params.get('max_period', 365)- result = detect_seasonal_period(data, method=method, max_period=max_period)- elif operation == 'decompose_stl':- robust = params.get('robust', True)- result = decompose_stl(data, period=period, robust=robust)- elif operation == 'decompose_classical':- result = decompose_classical(data, period=period, model=model_type)- elif operation == 'adjust':- method = params.get('method', 'stl')- result = seasonally_adjust(data, period=period, method=method)- elif operation == 'metrics':- result = calculate_seasonality_metrics(data, period=period)+def op_anomaly_detection(data):+ """+ Detect anomalies in a time series.+ Inputs:+ values : list[float] | CSV string (required, >= 20)+ method : 'zscore' | 'iqr' | 'isolation_forest' | 'residual' (default 'zscore')+ threshold : float — z-score / residual cutoff in std units (default 3.0)+ iqr_k : float — IQR multiplier (default 1.5)+ contamination: float — IsolationForest expected anomaly fraction (default 0.05)+ """+ values = _coerce_floats(data.get("values"), "values")+ _require_min_length(values, 20, "values")+ method = str(data.get("method", "zscore")).lower()++ series = _series_from_list(values, data.get("dates"))+ arr = series.to_numpy()+ n = len(arr)+ flags = np.zeros(n, dtype=bool)+ scores = np.zeros(n, dtype=float)++ if method == "zscore":+ thr = _safe_float(data.get("threshold", 3.0))+ mu = float(arr.mean())+ sd = float(arr.std()) or 1.0+ scores = (arr - mu) / sd+ flags = np.abs(scores) > thr+ elif method == "iqr":+ k = _safe_float(data.get("iqr_k", 1.5))+ q1, q3 = np.percentile(arr, [25, 75])+ iqr = q3 - q1+ lo, hi = q1 - k * iqr, q3 + k * iqr+ flags = (arr < lo) | (arr > hi)+ scores = np.where(arr < lo, (lo - arr) / (iqr or 1.0),+ np.where(arr > hi, (arr - hi) / (iqr or 1.0), 0.0))+ elif method == "isolation_forest":+ if not SKLEARN_OK:+ raise ValidationError("sklearn not installed — cannot run isolation_forest")+ cont = max(0.001, min(0.5, _safe_float(data.get("contamination", 0.05))))+ clf = IsolationForest(contamination=cont, random_state=42)+ clf.fit(arr.reshape(-1, 1))+ preds = clf.predict(arr.reshape(-1, 1)) # -1 anomaly, 1 normal+ flags = preds == -1+ # Anomaly score: lower = more anomalous; flip sign so higher = more anomalous+ scores = -clf.score_samples(arr.reshape(-1, 1))+ elif method == "residual":+ # Fit a simple linear trend, flag residuals > threshold * std+ thr = _safe_float(data.get("threshold", 3.0))+ x = np.arange(n, dtype=float).reshape(-1, 1)+ if SKLEARN_OK:+ mdl = LinearRegression().fit(x, arr)+ trend = mdl.predict(x)else:- return {"success": False, "error": f"Unknown seasonality operation: {operation}"}-- return result- except Exception as e:- import traceback- return {"success": False, "error": str(e), "traceback": traceback.format_exc()}-+ slope, intercept = np.polyfit(np.arange(n), arr, 1)+ trend = slope * np.arange(n) + intercept+ resid = arr - trend+ sd = float(resid.std()) or 1.0+ scores = resid / sd+ flags = np.abs(scores) > thr+ else:+ raise ValidationError(+ f"unknown method {method!r}; expected one of: zscore, iqr, isolation_forest, residual")++ anomalies = []+ for i in range(n):+ if flags[i]:+ anomalies.append({+ "date": str(series.index[i])[:10],+ "value": _safe_float(arr[i]),+ "score": _safe_float(scores[i]),+ "index": int(i),+ })+ # Sort by absolute score, biggest first+ anomalies.sort(key=lambda a: abs(a["score"]), reverse=True)-# ============================================================================-# CONFIDENCE INTERVALS COMMAND HANDLERS-# ============================================================================+ return {+ "method": method,+ "n_observations": n,+ "n_anomalies": int(flags.sum()),+ "anomaly_rate_pct": _safe_float(float(flags.mean() * 100)),+ "anomalies": anomalies[:200], # Cap at 200 for the wire+ "history": _sample_curve(series, 300),+ "score_min": _safe_float(float(scores.min())),+ "score_max": _safe_float(float(scores.max())),+ "score_mean": _safe_float(float(scores.mean())),+ "score_std": _safe_float(float(scores.std())),+ }-def run_confidence_intervals(params: Dict[str, Any]) -> Dict[str, Any]:- """Generate prediction/confidence intervals"""- if not CONFIDENCE_AVAILABLE:- return {"success": False, "error": "Confidence intervals not available"}+def op_seasonality(data):+ """+ Decompose a series into trend + seasonal + residual via STL, and detect+ the dominant period via FFT/autocorrelation when none is provided.+ Inputs:+ values : list[float] (required, >= 24)+ period : int (optional; auto-detected when omitted/0)+ robust : bool (default True)+ """+ if not STATSMODELS_OK:+ raise ValidationError("statsmodels not installed — cannot run seasonality")+ values = _coerce_floats(data.get("values"), "values")+ _require_min_length(values, 24, "values")++ series = _series_from_list(values, data.get("dates"))+ arr = series.to_numpy()+ n = len(arr)++ period = _safe_int(data.get("period", 0))+ detected = False+ if period < 2:+ # Auto-detect via autocorrelation peak (skip lag 0)+ max_lag = min(n // 2, 366)+ ac = acf(arr, nlags=max_lag, fft=True)+ # Find first significant peak after lag 1+ if len(ac) > 4:+ peaks = []+ for i in range(2, len(ac) - 1):+ if ac[i] > ac[i - 1] and ac[i] > ac[i + 1] and ac[i] > 0.2:+ peaks.append((i, float(ac[i])))+ if peaks:+ peaks.sort(key=lambda p: -p[1])+ period = peaks[0][0]+ detected = True+ if period < 2:+ period = max(2, n // 4)+ detected = True++ if period * 2 >= n:+ period = max(2, n // 3)++ robust = bool(data.get("robust", True))try:- method = params.get('method', 'monte_carlo')- confidence_levels = params.get('confidence_levels', [0.80, 0.95])-- if method == 'bootstrap':- data = parse_panel_data_json(params['data'])- fh = params.get('horizon', 7)- freq = params.get('frequency', '1d')- n_bootstrap = params.get('n_bootstrap', 100)-- # Need a forecaster - create a simple one- def simple_forecaster(y_train, fh, freq):- last_value = y_train['value'].to_list()[-1]- last_time = y_train['time'].to_list()[-1]- delta = timedelta(days=1)- forecast = []- for i in range(1, fh + 1):- forecast.append({- 'entity_id': y_train['entity_id'].to_list()[0],- 'time': last_time + (delta * i),- 'value': last_value- })- return {'forecast': forecast}-- result = bootstrap_prediction_intervals(- data, simple_forecaster, fh=fh,- n_bootstrap=n_bootstrap, confidence_levels=confidence_levels, freq=freq- )- elif method == 'residual':- data = parse_panel_data_json(params['data'])- forecast = parse_panel_data_json(params['forecast'])- y_validation = parse_panel_data_json(params['y_validation']) if 'y_validation' in params else None- result = residual_prediction_intervals(data, forecast, y_validation, confidence_levels)- elif method == 'quantile':- data = parse_panel_data_json(params['data'])- fh = params.get('horizon', 7)- lags = params.get('lags', 10)- quantiles = params.get('quantiles', [0.025, 0.10, 0.50, 0.90, 0.975])- freq = params.get('frequency', '1d')- result = quantile_prediction_intervals(data, fh=fh, lags=lags, quantiles=quantiles, freq=freq)- elif method == 'conformal':- data = parse_panel_data_json(params['data'])- forecast = parse_panel_data_json(params['forecast'])- calibration_size = params.get('calibration_size', 50)- result = conformal_prediction_intervals(data, forecast, calibration_size, confidence_levels)- elif method == 'monte_carlo':- data = parse_panel_data_json(params['data'])- fh = params.get('horizon', 7)- n_simulations = params.get('n_simulations', 1000)- model = params.get('model', 'random_walk')- freq = params.get('frequency', '1d')- result = monte_carlo_intervals(data, fh=fh, n_simulations=n_simulations, model=model,- confidence_levels=confidence_levels, freq=freq)- else:- return {"success": False, "error": f"Unknown interval method: {method}"}-- return result+ stl = STL(arr, period=period, robust=robust).fit()except Exception as e:- return {"success": False, "error": str(e)}+ raise ValidationError(f"STL decomposition failed: {e}")+ trend = pd.Series(stl.trend, index=series.index)+ seasonal = pd.Series(stl.seasonal, index=series.index)+ resid = pd.Series(stl.resid, index=series.index)-# ============================================================================-# FEATURE IMPORTANCE COMMAND HANDLERS-# ============================================================================+ # Strength of trend / seasonality (Hyndman 2018 formulation)+ var_resid = float(resid.var())+ var_detrended = float((seasonal + resid).var()) or 1.0+ var_deseasonalized = float((trend + resid).var()) or 1.0+ trend_strength = max(0.0, 1.0 - var_resid / var_deseasonalized)+ seasonal_strength = max(0.0, 1.0 - var_resid / var_detrended)-def run_feature_importance(params: Dict[str, Any]) -> Dict[str, Any]:- """Calculate feature importance for time series"""- if not FEATURE_IMPORTANCE_AVAILABLE:- return {"success": False, "error": "Feature importance not available"}-- try:- data = parse_panel_data_json(params['data'])- method = params.get('method', 'permutation')- n_lags = params.get('n_lags', 10)-- if method == 'permutation':- n_repeats = params.get('n_repeats', 10)- model_type = params.get('model_type', 'ridge')- result = calculate_permutation_importance(data, n_lags=n_lags, n_repeats=n_repeats, model_type=model_type)- elif method == 'model':- model_type = params.get('model_type', 'ridge')- result = calculate_model_importance(data, n_lags=n_lags, model_type=model_type)- elif method == 'shap':- max_samples = params.get('max_samples', 100)- result = calculate_shap_importance(data, n_lags=n_lags, max_samples=max_samples)- elif method == 'lag_analysis':- max_lags = params.get('max_lags', 20)- result = analyze_lag_importance(data, max_lags=max_lags)- elif method == 'sensitivity':- fh = params.get('horizon', 10)- perturbation_pct = params.get('perturbation_pct', 0.05)- freq = params.get('frequency', '1d')-- # Need a forecaster for sensitivity- def simple_forecaster(y_train, fh, freq):- last_value = y_train['value'].to_list()[-1]- last_time = y_train['time'].to_list()[-1]- delta = timedelta(days=1)- forecast = []- for i in range(1, fh + 1):- forecast.append({- 'entity_id': y_train['entity_id'].to_list()[0],- 'time': last_time + (delta * i),- 'value': last_value- })- return {'forecast': forecast}-- result = sensitivity_analysis(data, simple_forecaster, fh=fh,- perturbation_pct=perturbation_pct, freq=freq)- else:- return {"success": False, "error": f"Unknown importance method: {method}"}+ return {+ "n_observations": n,+ "period": int(period),+ "period_auto_detected": detected,+ "trend_strength": _safe_float(trend_strength),+ "seasonal_strength": _safe_float(seasonal_strength),+ "residual_std": _safe_float(float(resid.std())),+ "history": _sample_curve(series, 300),+ "trend": _sample_curve(trend, 300),+ "seasonal": _sample_curve(seasonal, 300),+ "residual": _sample_curve(resid, 300),+ }- return result- except Exception as e:- return {"success": False, "error": str(e)}+def op_metrics(data):+ """+ Forecast accuracy metrics between actual and predicted series (must align).+ Inputs:+ actual : list[float] (required)+ predicted : list[float] (required, same length as actual)+ """+ actual = _coerce_floats(data.get("actual"), "actual")+ predicted = _coerce_floats(data.get("predicted"), "predicted")+ _require_min_length(actual, 2, "actual")+ if len(actual) != len(predicted):+ raise ValidationError(+ f"actual ({len(actual)}) and predicted ({len(predicted)}) must have the same length")++ a = np.asarray(actual, dtype=float)+ p = np.asarray(predicted, dtype=float)+ err = a - p++ mae = float(np.mean(np.abs(err)))+ mse = float(np.mean(err ** 2))+ rmse = float(np.sqrt(mse))+ # MAPE / sMAPE — guard against zero+ safe_a = np.where(np.abs(a) < 1e-12, np.nan, a)+ mape = float(np.nanmean(np.abs(err / safe_a)) * 100.0)+ denom = (np.abs(a) + np.abs(p))+ safe_denom = np.where(denom < 1e-12, np.nan, denom)+ smape = float(np.nanmean(2.0 * np.abs(err) / safe_denom) * 100.0)+ # R²+ ss_res = float(np.sum(err ** 2))+ ss_tot = float(np.sum((a - a.mean()) ** 2)) or 1.0+ r2 = 1.0 - ss_res / ss_tot+ # Bias / direction accuracy+ bias = float(np.mean(err))+ if len(a) > 1:+ actual_dir = np.sign(np.diff(a))+ pred_dir = np.sign(np.diff(p))+ direction_acc = float(np.mean(actual_dir == pred_dir) * 100.0)+ else:+ direction_acc = 0.0-# ============================================================================-# ADVANCED CROSS-VALIDATION COMMAND HANDLERS-# ============================================================================+ return {+ "n_observations": len(a),+ "mae": _safe_float(mae),+ "mse": _safe_float(mse),+ "rmse": _safe_float(rmse),+ "mape_pct": _safe_float(mape),+ "smape_pct": _safe_float(smape),+ "r_squared": _safe_float(r2),+ "bias": _safe_float(bias),+ "direction_accuracy_pct": _safe_float(direction_acc),+ }-def run_advanced_cv(params: Dict[str, Any]) -> Dict[str, Any]:- """Run advanced cross-validation methods"""- if not ADVANCED_CV_AVAILABLE:- return {"success": False, "error": "Advanced CV not available"}- try:- data = parse_panel_data_json(params['data'])- method = params.get('method', 'walk_forward')-- if method == 'blocked':- n_splits = params.get('n_splits', 5)- test_size = params.get('test_size', 1)- gap = params.get('gap', 0)- result = blocked_time_series_cv(data, n_splits=n_splits, test_size=test_size, gap=gap)- elif method == 'purged':- n_splits = params.get('n_splits', 5)- embargo_pct = params.get('embargo_pct', 0.01)- purge_pct = params.get('purge_pct', 0.01)- result = purged_kfold_cv(data, n_splits=n_splits, embargo_pct=embargo_pct, purge_pct=purge_pct)- elif method == 'combinatorial':- n_test_splits = params.get('n_test_splits', 2)- n_groups = params.get('n_groups', 6)- embargo_pct = params.get('embargo_pct', 0.01)- result = combinatorial_purged_cv(data, n_test_splits=n_test_splits,- n_groups=n_groups, embargo_pct=embargo_pct)- elif method == 'walk_forward':- initial_train_size = params.get('initial_train_size', 100)- test_size = params.get('test_size', 1)- step_size = params.get('step_size', 1)- anchored = params.get('anchored', False)- result = walk_forward_validation(data, initial_train_size=initial_train_size,- test_size=test_size, step_size=step_size, anchored=anchored)- elif method == 'nested':- outer_splits = params.get('outer_splits', 5)- inner_splits = params.get('inner_splits', 3)- test_size = params.get('test_size', 1)- result = nested_cv(data, outer_splits=outer_splits, inner_splits=inner_splits, test_size=test_size)+def op_confidence_intervals(data):+ """+ Build prediction intervals around a point forecast.+ Inputs:+ values : list[float] (training history, >= 30)+ horizon : int (default 14)+ lags : int (default 7)+ n_boot : int (bootstrap iterations, default 200)+ confidence : float (e.g. 0.95, default 0.95)+ method : 'bootstrap' | 'residual' (default bootstrap)+ """+ if not SKLEARN_OK:+ raise ValidationError("sklearn not installed — cannot build intervals")+ values = _coerce_floats(data.get("values"), "values")+ _require_min_length(values, 30, "values")+ horizon = max(1, _safe_int(data.get("horizon", 14)))+ lags = max(1, _safe_int(data.get("lags", 7)))+ n_boot = max(50, min(1000, _safe_int(data.get("n_boot", 200))))+ confidence = _safe_float(data.get("confidence", 0.95))+ if not (0.5 < confidence < 1.0):+ raise ValidationError(f"confidence must be in (0.5, 1.0), got {confidence}")+ method = str(data.get("method", "bootstrap")).lower()++ series = _series_from_list(values, data.get("dates"))+ arr = series.to_numpy()+ n = len(arr)+ if n <= lags + 5:+ raise ValidationError(f"need at least lags+6={lags + 6} observations, got {n}")++ # Fit base linear regression on lag features+ X, y = [], []+ for i in range(lags, n):+ X.append(arr[i - lags:i])+ y.append(arr[i])+ X = np.asarray(X, dtype=float)+ y = np.asarray(y, dtype=float)+ base = LinearRegression().fit(X, y)+ point_resid = y - base.predict(X)+ resid_std = float(point_resid.std()) or 1.0++ # Recursive point forecast+ last = list(arr[-lags:])+ point = []+ for _ in range(horizon):+ x_pred = np.asarray([last[-lags:]], dtype=float)+ yhat = float(base.predict(x_pred)[0])+ point.append(yhat)+ last.append(yhat)++ alpha = 1.0 - confidence+ lower_q = alpha / 2.0 * 100.0+ upper_q = (1.0 - alpha / 2.0) * 100.0++ if method == "residual":+ # Parametric: assume Gaussian residuals; widen with sqrt(h) for accumulation+ if not SCIPY_OK:+ z = 1.96 # default 95% z-score if scipy missingelse:- return {"success": False, "error": f"Unknown CV method: {method}"}+ z = float(scstats.norm.ppf(1.0 - alpha / 2.0))+ lower = [point[h] - z * resid_std * math.sqrt(h + 1) for h in range(horizon)]+ upper = [point[h] + z * resid_std * math.sqrt(h + 1) for h in range(horizon)]+ elif method == "bootstrap":+ rng = np.random.default_rng(42)+ boot_paths = np.zeros((n_boot, horizon), dtype=float)+ for b in range(n_boot):+ last_b = list(arr[-lags:])+ shocks = rng.choice(point_resid, size=horizon, replace=True)+ for h in range(horizon):+ x_pred = np.asarray([last_b[-lags:]], dtype=float)+ yhat = float(base.predict(x_pred)[0]) + shocks[h]+ boot_paths[b, h] = yhat+ last_b.append(yhat)+ lower = list(np.percentile(boot_paths, lower_q, axis=0))+ upper = list(np.percentile(boot_paths, upper_q, axis=0))+ else:+ raise ValidationError(f"unknown method {method!r}; expected: bootstrap, residual")- return result- except Exception as e:- return {"success": False, "error": str(e)}+ if isinstance(series.index, pd.DatetimeIndex) and len(series.index) >= 2:+ delta = series.index[-1] - series.index[-2]+ else:+ delta = pd.Timedelta(days=1)+ forecast_dates = [series.index[-1] + delta * (i + 1) for i in range(horizon)]++ intervals = [+ {+ "date": str(d)[:10],+ "point": _safe_float(p),+ "lower": _safe_float(l),+ "upper": _safe_float(u),+ "width": _safe_float(u - l),+ }+ for d, p, l, u in zip(forecast_dates, point, lower, upper)+ ]+ return {+ "method": method,+ "n_observations": n,+ "horizon": horizon,+ "confidence": _safe_float(confidence),+ "lags": lags,+ "n_boot": n_boot if method == "bootstrap" else None,+ "residual_std": _safe_float(resid_std),+ "history": _sample_curve(series, 250),+ "intervals": intervals,+ "mean_width": _safe_float(float(np.mean([i["width"] for i in intervals]))),+ "first_lower": _safe_float(intervals[0]["lower"]),+ "first_upper": _safe_float(intervals[0]["upper"]),+ "last_lower": _safe_float(intervals[-1]["lower"]),+ "last_upper": _safe_float(intervals[-1]["upper"]),+ }-# ============================================================================-# BACKTESTING COMMAND HANDLERS-# ============================================================================-def run_backtest(params: Dict[str, Any]) -> Dict[str, Any]:- """Run backtesting on time series"""- if not BACKTESTING_AVAILABLE:- return {"success": False, "error": "Backtesting not available"}+def op_stationarity(data):+ """+ ADF + KPSS stationarity tests with a recommended differencing order.+ Inputs:+ values : list[float] (required, >= 30)+ max_d : int (max differencing order to test, default 2)+ """+ if not STATSMODELS_OK:+ raise ValidationError("statsmodels not installed — cannot run stationarity tests")+ values = _coerce_floats(data.get("values"), "values")+ _require_min_length(values, 30, "values")+ max_d = max(0, min(3, _safe_int(data.get("max_d", 2))))++ series = pd.Series(values, dtype=float)+ results = []+ recommended_d = None+ for d in range(max_d + 1):+ s = series.copy()+ for _ in range(d):+ s = s.diff().dropna()+ if len(s) < 10:+ continue+ # ADF: H0 = unit root (non-stationary). Reject (p < .05) -> stationary.+ try:+ adf_stat, adf_p, _, _, adf_crit, _ = adfuller(s, autolag="AIC")+ adf_stationary = adf_p < 0.05+ except Exception as e:+ adf_stat, adf_p, adf_crit, adf_stationary = float("nan"), 1.0, {}, False+ # KPSS: H0 = stationary. Reject -> non-stationary.+ try:+ kpss_stat, kpss_p, _, kpss_crit = kpss(s, regression="c", nlags="auto")+ kpss_stationary = kpss_p >= 0.05+ except Exception:+ kpss_stat, kpss_p, kpss_crit, kpss_stationary = float("nan"), 0.0, {}, False+ verdict_both = adf_stationary and kpss_stationary+ results.append({+ "differencing_order": d,+ "n_observations": int(len(s)),+ "adf_statistic": _safe_float(adf_stat),+ "adf_p_value": _safe_float(adf_p),+ "adf_critical_5pct": _safe_float(adf_crit.get("5%")) if isinstance(adf_crit, dict) else 0.0,+ "adf_stationary": bool(adf_stationary),+ "kpss_statistic": _safe_float(kpss_stat),+ "kpss_p_value": _safe_float(kpss_p),+ "kpss_critical_5pct": _safe_float(kpss_crit.get("5%")) if isinstance(kpss_crit, dict) else 0.0,+ "kpss_stationary": bool(kpss_stationary),+ "both_stationary": bool(verdict_both),+ })+ if recommended_d is None and verdict_both:+ recommended_d = d- try:- data = parse_panel_data_json(params['data'])- operation = params.get('operation', 'walk_forward')- freq = params.get('frequency', '1d')-- # Create a simple forecaster- def simple_forecaster(y_train, fh, freq):- last_value = y_train['value'].to_list()[-1]- last_time = y_train['time'].to_list()[-1]- delta = timedelta(days=1)- forecast = []- for i in range(1, fh + 1):- forecast.append({- 'entity_id': y_train['entity_id'].to_list()[0],- 'time': last_time + (delta * i),- 'value': last_value- })- return {'forecast': forecast}-- if operation == 'walk_forward':- initial_train_size = params.get('initial_train_size', 100)- test_size = params.get('test_size', 1)- step_size = params.get('step_size', 1)- horizons = params.get('horizons')- retrain = params.get('retrain', True)- result = walk_forward_backtest(data, simple_forecaster, initial_train_size=initial_train_size,- test_size=test_size, step_size=step_size,- horizons=horizons, freq=freq, retrain=retrain)- elif operation == 'compare_models':- initial_train_size = params.get('initial_train_size', 100)- test_size = params.get('test_size', 1)- step_size = params.get('step_size', 5)- # Use simple forecasters for comparison- forecasters = {'naive': simple_forecaster}- result = compare_models_backtest(data, forecasters, initial_train_size=initial_train_size,- test_size=test_size, step_size=step_size, freq=freq)- elif operation == 'rolling_origin':- min_train_size = params.get('min_train_size', 50)- max_train_size = params.get('max_train_size')- test_size = params.get('test_size', 1)- result = rolling_origin_evaluation(data, simple_forecaster, min_train_size=min_train_size,- max_train_size=max_train_size, test_size=test_size, freq=freq)- elif operation == 'attribution':- backtest_results = params.get('backtest_results', {})- result = performance_attribution(backtest_results)- elif operation == 'summary':- backtest_results = params.get('backtest_results', {})- result = backtest_summary(backtest_results)- else:- return {"success": False, "error": f"Unknown backtest operation: {operation}"}+ if recommended_d is None:+ recommended_d = max_d- return result- except Exception as e:- return {"success": False, "error": str(e)}+ return {+ "n_observations": len(series),+ "max_d_tested": max_d,+ "recommended_d": int(recommended_d),+ "tests": results,+ }# ============================================================================-# MAIN ENTRY POINT+# DISPATCH TABLE# ============================================================================-COMMANDS = {- "check_status": lambda _: check_status(),- "forecast": run_forecast,- "preprocess": preprocess_data,- "cross_validate": cross_validate,- "metrics": calculate_metrics,- "add_features": add_features,- "seasonal_period": get_seasonal_period,- "full_pipeline": full_forecast_pipeline,- # Advanced models- "advanced_forecast": run_advanced_forecast,- # Ensemble methods- "ensemble": run_ensemble,- "auto_ensemble": run_auto_ensemble,- # Anomaly detection- "anomaly_detection": run_anomaly_detection,- # Seasonality analysis- "seasonality": run_seasonality_analysis,- # Confidence intervals- "confidence_intervals": run_confidence_intervals,- # Feature importance- "feature_importance": run_feature_importance,- # Advanced cross-validation- "advanced_cv": run_advanced_cv,- # Backtesting- "backtest": run_backtest,+OPERATIONS = {+ "check_status": op_check_status,+ "forecast": op_forecast,+ "anomaly_detection": op_anomaly_detection,+ "seasonality": op_seasonality,+ "metrics": op_metrics,+ "confidence_intervals": op_confidence_intervals,+ "stationarity": op_stationarity,}-def main(args: list) -> str:- """Main entry point called by the host via subprocess"""+def dispatch(operation, data):+ """Dispatch to operation handler. Always returns a dict with a `success` key."""+ handler = OPERATIONS.get(operation)+ if handler is None:+ return {+ "success": False,+ "operation": operation,+ "error": f"Unknown operation: {operation}",+ "error_kind": "unknown_op",+ "available": list(OPERATIONS.keys()),+ }try:- if len(args) < 1:- return serialize_result({"success": False, "error": "No command specified"})-- command = args[0]+ result = handler(data or {})+ return {+ "success": True,+ "operation": operation,+ "data": result,+ }+ except ValidationError as e:+ return {+ "success": False,+ "operation": operation,+ "error": str(e),+ "error_kind": "validation",+ }+ except Exception as e:+ return {+ "success": False,+ "operation": operation,+ "error": str(e),+ "error_kind": "runtime",+ "traceback": traceback.format_exc(),+ }- if command not in COMMANDS:- return serialize_result({"success": False, "error": f"Unknown command: {command}"})- # Parse params if provided- params = {}- if len(args) > 1:- params = json.loads(args[1])+def main(args):+ """Entry point: args = [operation, json_data]"""+ if len(args) < 1:+ print(json.dumps({+ "success": False,+ "error": "Usage: functime_service.py <operation> [json_data]",+ "error_kind": "usage",+ }))+ return- result = COMMANDS[command](params)- return serialize_result(result)+ operation = args[0]+ data = {}+ if len(args) > 1:+ try:+ data = json.loads(args[1])+ except json.JSONDecodeError as e:+ print(json.dumps({+ "success": False,+ "operation": operation,+ "error": f"Invalid JSON input: {e}",+ "error_kind": "validation",+ }))+ return- except Exception as e:- return serialize_result({"success": False, "error": str(e)})+ result = dispatch(operation, data)+ print(json.dumps(result, default=str))if __name__ == "__main__":- output = main(sys.argv[1:])- print(output)+ main(sys.argv[1:])diff --git a/fincept-qt/scripts/Analytics/functime_wrapper/functime_service_polars_legacy.py b/fincept-qt/scripts/Analytics/functime_wrapper/functime_service_polars_legacy.pynew file mode 100644index 000000000..61da4c65a--- /dev/null+++ b/fincept-qt/scripts/Analytics/functime_wrapper/functime_service_polars_legacy.py@@ -0,0 +1,1354 @@+"""+Functime Service - Python backend for analytics+=================================================================++Provides JSON-RPC interface for C++ to call functime forecasting functions.++Note: This service provides local-only forecasting when functime cloud is not configured.+Uses sklearn-based implementations as fallback for cloud API.+"""++import json+import sys+import os+from typing import Dict, List, Any, Optional+from datetime import datetime, timedelta++# Add this script's directory to Python path for local imports+_script_dir = os.path.dirname(os.path.abspath(__file__))+if _script_dir not in sys.path:+ sys.path.insert(0, _script_dir)++import numpy as np++try:+ import polars as pl+ POLARS_AVAILABLE = True+except ImportError:+ POLARS_AVAILABLE = False++# Try sklearn for local fallback+try:+ from sklearn.linear_model import LinearRegression, Lasso, Ridge, ElasticNet, LassoCV, RidgeCV, ElasticNetCV+ from sklearn.neighbors import KNeighborsRegressor+ from sklearn.model_selection import GridSearchCV, TimeSeriesSplit+ SKLEARN_AVAILABLE = True+except ImportError:+ SKLEARN_AVAILABLE = False++try:+ from lightgbm import LGBMRegressor+ LIGHTGBM_AVAILABLE = True+except ImportError:+ LIGHTGBM_AVAILABLE = False++# Check if functime cloud is available and configured+FUNCTIME_CLOUD_AVAILABLE = False+try:+ import functime+ # Check if credentials exist+ import toml+ config_path = os.path.expanduser("~/.functime.toml")+ if os.path.exists(config_path):+ with open(config_path, 'r') as f:+ config = toml.load(f)+ if config.get('token_id') and config.get('token_secret'):+ FUNCTIME_CLOUD_AVAILABLE = True+except:+ pass++# Use local sklearn implementation as default+FUNCTIME_AVAILABLE = SKLEARN_AVAILABLE and POLARS_AVAILABLE++# Import local modules after path fix+if FUNCTIME_AVAILABLE:+ try:+ from preprocessing import (+ apply_boxcox, scale_data, difference_data,+ create_lags, create_rolling_features, impute_missing+ )+ from cross_validation import (+ split_train_test, create_expanding_window_splits,+ create_sliding_window_splits+ )+ from metrics import (+ calculate_mae, calculate_rmse, calculate_smape,+ calculate_mape, calculate_mse+ )+ from feature_extraction import (+ create_calendar_effects, create_future_calendar_effects+ )+ from offsets import frequency_to_seasonal_period+ except ImportError as e:+ print(f"Warning: Could not import local modules: {e}", file=sys.stderr)++# Import advanced modules+try:+ from advanced_models import (+ naive_forecast, seasonal_naive_forecast, drift_forecast,+ ses_forecast, holt_forecast, theta_forecast,+ croston_forecast, xgboost_forecast, catboost_forecast+ )+ ADVANCED_MODELS_AVAILABLE = True+except ImportError as e:+ ADVANCED_MODELS_AVAILABLE = False+ print(f"Warning: Could not import advanced_models: {e}", file=sys.stderr)++try:+ from ensemble import (+ ensemble_mean, ensemble_median, ensemble_trimmed_mean,+ ensemble_weighted, ensemble_stacking, auto_ensemble+ )+ ENSEMBLE_AVAILABLE = True+except ImportError as e:+ ENSEMBLE_AVAILABLE = False+ print(f"Warning: Could not import ensemble: {e}", file=sys.stderr)++try:+ from anomaly_detection import (+ detect_zscore, detect_iqr, detect_grubbs,+ detect_isolation_forest, detect_lof,+ detect_residual_anomalies, detect_change_points+ )+ ANOMALY_AVAILABLE = True+except ImportError as e:+ ANOMALY_AVAILABLE = False+ print(f"Warning: Could not import anomaly_detection: {e}", file=sys.stderr)++try:+ from seasonality import (+ detect_seasonal_period, decompose_stl, decompose_classical,+ seasonally_adjust, calculate_seasonality_metrics+ )+ SEASONALITY_AVAILABLE = True+except ImportError as e:+ SEASONALITY_AVAILABLE = False+ print(f"Warning: Could not import seasonality: {e}", file=sys.stderr)++try:+ from confidence_intervals import (+ bootstrap_prediction_intervals, residual_prediction_intervals,+ quantile_prediction_intervals, conformal_prediction_intervals,+ monte_carlo_intervals+ )+ CONFIDENCE_AVAILABLE = True+except ImportError as e:+ CONFIDENCE_AVAILABLE = False+ print(f"Warning: Could not import confidence_intervals: {e}", file=sys.stderr)++try:+ from feature_importance import (+ calculate_permutation_importance, calculate_model_importance,+ calculate_shap_importance, analyze_lag_importance, sensitivity_analysis+ )+ FEATURE_IMPORTANCE_AVAILABLE = True+except ImportError as e:+ FEATURE_IMPORTANCE_AVAILABLE = False+ print(f"Warning: Could not import feature_importance: {e}", file=sys.stderr)++try:+ from advanced_cv import (+ blocked_time_series_cv, purged_kfold_cv, combinatorial_purged_cv,+ walk_forward_validation, nested_cv, get_cv_splits+ )+ ADVANCED_CV_AVAILABLE = True+except ImportError as e:+ ADVANCED_CV_AVAILABLE = False+ print(f"Warning: Could not import advanced_cv: {e}", file=sys.stderr)++try:+ from backtesting import (+ walk_forward_backtest, compare_models_backtest,+ rolling_origin_evaluation, performance_attribution, backtest_summary+ )+ BACKTESTING_AVAILABLE = True+except ImportError as e:+ BACKTESTING_AVAILABLE = False+ print(f"Warning: Could not import backtesting: {e}", file=sys.stderr)+++def parse_panel_data_json(data_json: str) -> "pl.DataFrame":+ """Parse JSON data into Polars DataFrame for functime panel data format"""+ data = json.loads(data_json)++ if isinstance(data, dict):+ # Check if it's multi-entity format {entity: {date: value}}+ first_value = next(iter(data.values()), None)+ if isinstance(first_value, dict):+ # Multi-entity: {entity: {date: value}}+ rows = []+ for entity_id, time_values in data.items():+ for time_str, value in time_values.items():+ rows.append({+ 'entity_id': entity_id,+ 'time': time_str,+ 'value': float(value)+ })+ df = pl.DataFrame(rows)+ df = df.with_columns([+ pl.col('time').str.to_datetime()+ ])+ else:+ # Single entity: {date: value} - wrap as entity 'default'+ rows = []+ for time_str, value in data.items():+ rows.append({+ 'entity_id': 'default',+ 'time': time_str,+ 'value': float(value)+ })+ df = pl.DataFrame(rows)+ df = df.with_columns([+ pl.col('time').str.to_datetime()+ ])+ elif isinstance(data, list):+ # Array format: [{entity_id, time, value}, ...]+ df = pl.DataFrame(data)+ if 'time' in df.columns and df['time'].dtype == pl.Utf8:+ df = df.with_columns([+ pl.col('time').str.to_datetime()+ ])+ if 'entity_id' not in df.columns:+ df = df.with_columns([+ pl.lit('default').alias('entity_id')+ ])+ else:+ raise ValueError(f"Unsupported data format: {type(data)}")++ # Sort by entity_id and time+ df = df.sort(['entity_id', 'time'])+ return df+++def serialize_to_json(obj: Any) -> str:+ """Convert object to JSON string with proper type handling"""+ from datetime import date++ def convert(item):+ if item is None:+ return None+ if isinstance(item, datetime):+ return item.isoformat()+ if isinstance(item, date):+ return item.isoformat()+ if isinstance(item, (np.integer, np.floating)):+ return float(item)+ if isinstance(item, np.ndarray):+ return [convert(v) for v in item.tolist()]+ if isinstance(item, np.bool_):+ return bool(item)+ if POLARS_AVAILABLE and isinstance(item, pl.DataFrame):+ return [convert(d) for d in item.to_dicts()]+ if POLARS_AVAILABLE and isinstance(item, pl.Series):+ return [convert(v) for v in item.to_list()]+ if isinstance(item, dict):+ return {str(k): convert(v) for k, v in item.items()}+ if isinstance(item, (list, tuple)):+ return [convert(v) for v in item]+ if isinstance(item, float) and np.isnan(item):+ return None+ return item++ return json.dumps(convert(obj))+++def serialize_result(data: Any) -> str:+ """Serialize result to JSON, handling numpy/polars types"""+ from datetime import date++ def convert(obj):+ # Handle None first+ if obj is None:+ return None++ # Handle numpy types+ if isinstance(obj, (np.integer, np.floating)):+ if np.isnan(obj):+ return None+ return float(obj)+ elif isinstance(obj, np.ndarray):+ return [convert(v) for v in obj.tolist()]+ elif isinstance(obj, np.bool_):+ return bool(obj)++ # Handle polars types+ elif POLARS_AVAILABLE and isinstance(obj, pl.DataFrame):+ return [convert(d) for d in obj.to_dicts()]+ elif POLARS_AVAILABLE and isinstance(obj, pl.Series):+ return [convert(v) for v in obj.to_list()]++ # Handle datetime and date+ elif isinstance(obj, datetime):+ return obj.isoformat()+ elif isinstance(obj, date):+ return obj.isoformat()++ # Handle NaN for scalar floats+ elif isinstance(obj, float) and np.isnan(obj):+ return None++ # Handle tuples (convert to list)+ elif isinstance(obj, tuple):+ return [convert(v) for v in obj]++ # Handle dicts and lists - convert tuple keys to strings+ elif isinstance(obj, dict):+ return {str(k) if isinstance(k, tuple) else str(k): convert(v) for k, v in obj.items()}+ elif isinstance(obj, list):+ return [convert(v) for v in obj]++ # Return as-is for other types+ return obj++ return json.dumps(convert(data), indent=2)+++# ============================================================================+# COMMAND HANDLERS+# ============================================================================++def check_status() -> Dict[str, Any]:+ """Check functime library availability and version"""+ return {+ "success": True,+ "available": FUNCTIME_AVAILABLE,+ "sklearn_available": SKLEARN_AVAILABLE,+ "polars_available": POLARS_AVAILABLE,+ "lightgbm_available": LIGHTGBM_AVAILABLE,+ "functime_cloud_available": FUNCTIME_CLOUD_AVAILABLE,+ "advanced_models_available": ADVANCED_MODELS_AVAILABLE,+ "ensemble_available": ENSEMBLE_AVAILABLE,+ "anomaly_available": ANOMALY_AVAILABLE,+ "seasonality_available": SEASONALITY_AVAILABLE,+ "confidence_available": CONFIDENCE_AVAILABLE,+ "feature_importance_available": FEATURE_IMPORTANCE_AVAILABLE,+ "advanced_cv_available": ADVANCED_CV_AVAILABLE,+ "backtesting_available": BACKTESTING_AVAILABLE,+ "message": "Time series forecasting ready (sklearn backend)" if FUNCTIME_AVAILABLE else "scikit-learn or polars not installed"+ }+++def run_forecast(params: Dict[str, Any]) -> Dict[str, Any]:+ """Run forecasting with specified model using sklearn backend"""+ if not FUNCTIME_AVAILABLE:+ return {"success": False, "error": "Forecasting library not available (sklearn or polars missing)"}++ try:+ data = parse_panel_data_json(params['data'])+ model_type = params.get('model', 'linear')+ fh = params.get('horizon', 7)+ freq = params.get('frequency', '1d')++ # Model parameters+ alpha = params.get('alpha', 1.0)+ l1_ratio = params.get('l1_ratio', 0.5)+ n_neighbors = params.get('n_neighbors', 5)+ lags = params.get('lags', 3) # Number of lags for autoregression++ # Get unique entities+ entities = data['entity_id'].unique().to_list()+ all_forecasts = []+ final_best_params = None++ for entity_id in entities:+ entity_data = data.filter(pl.col('entity_id') == entity_id).sort('time')+ times = entity_data['time'].to_list()+ values = entity_data['value'].to_numpy()++ if len(values) < lags + 1:+ continue++ # Create lag features+ X, y = [], []+ for i in range(lags, len(values)):+ X.append(values[i-lags:i])+ y.append(values[i])+ X = np.array(X)+ y = np.array(y)++ # Select and fit model+ best_params = None++ if model_type == 'linear':+ model = LinearRegression()+ elif model_type == 'lasso':+ model = Lasso(alpha=alpha)+ elif model_type == 'ridge':+ model = Ridge(alpha=alpha)+ elif model_type == 'elasticnet':+ model = ElasticNet(alpha=alpha, l1_ratio=l1_ratio)+ elif model_type == 'knn':+ model = KNeighborsRegressor(n_neighbors=min(n_neighbors, len(X)))+ elif model_type == 'lightgbm':+ if not LIGHTGBM_AVAILABLE:+ return {"success": False, "error": "LightGBM not installed. Please install: pip install lightgbm"}+ model = LGBMRegressor(n_estimators=100, verbosity=-1)++ # Auto-tuned models with cross-validation+ elif model_type == 'auto_lasso':+ alphas = np.logspace(-4, 2, 50)+ cv_splits = min(5, len(X) - 1)+ if cv_splits < 2:+ cv_splits = 2+ model = LassoCV(alphas=alphas, cv=cv_splits, max_iter=10000)+ model.fit(X, y)+ best_params = {'alpha': float(model.alpha_)}++ elif model_type == 'auto_ridge':+ alphas = np.logspace(-4, 4, 50)+ cv_splits = min(5, len(X) - 1)+ if cv_splits < 2:+ cv_splits = 2+ model = RidgeCV(alphas=alphas, cv=cv_splits)+ model.fit(X, y)+ best_params = {'alpha': float(model.alpha_)}++ elif model_type == 'auto_elasticnet':+ alphas = np.logspace(-4, 2, 20)+ l1_ratios = [0.1, 0.3, 0.5, 0.7, 0.9, 0.95, 0.99]+ cv_splits = min(5, len(X) - 1)+ if cv_splits < 2:+ cv_splits = 2+ model = ElasticNetCV(alphas=alphas, l1_ratio=l1_ratios, cv=cv_splits, max_iter=10000)+ model.fit(X, y)+ best_params = {'alpha': float(model.alpha_), 'l1_ratio': float(model.l1_ratio_)}++ elif model_type == 'auto_knn':+ # Grid search for best n_neighbors+ max_neighbors = min(20, len(X) - 1)+ if max_neighbors < 1:+ max_neighbors = 1+ param_grid = {'n_neighbors': list(range(1, max_neighbors + 1, 2))}+ cv_splits = min(3, len(X) - 1)+ if cv_splits < 2:+ cv_splits = 2+ base_model = KNeighborsRegressor()+ tscv = TimeSeriesSplit(n_splits=cv_splits)+ grid_search = GridSearchCV(base_model, param_grid, cv=tscv, scoring='neg_mean_squared_error')+ grid_search.fit(X, y)+ model = grid_search.best_estimator_+ best_params = grid_search.best_params_++ elif model_type == 'auto_lightgbm':+ if not LIGHTGBM_AVAILABLE:+ return {"success": False, "error": "LightGBM not installed. Please install: pip install lightgbm"}+ param_grid = {+ 'n_estimators': [50, 100, 200],+ 'learning_rate': [0.01, 0.05, 0.1],+ 'max_depth': [3, 5, 7]+ }+ cv_splits = min(3, len(X) - 1)+ if cv_splits < 2:+ cv_splits = 2+ base_model = LGBMRegressor(verbosity=-1)+ tscv = TimeSeriesSplit(n_splits=cv_splits)+ grid_search = GridSearchCV(base_model, param_grid, cv=tscv, scoring='neg_mean_squared_error')+ grid_search.fit(X, y)+ model = grid_search.best_estimator_+ best_params = grid_search.best_params_++ else:+ return {"success": False, "error": f"Unknown model type: {model_type}. Supported: linear, lasso, ridge, elasticnet, knn, lightgbm, auto_lasso, auto_ridge, auto_elasticnet, auto_knn, auto_lightgbm"}++ # Fit model if not already fitted by CV+ if model_type not in ['auto_lasso', 'auto_ridge', 'auto_elasticnet', 'auto_knn', 'auto_lightgbm']:+ model.fit(X, y)++ # Store best params from first entity (they're the same for all)+ if best_params and final_best_params is None:+ final_best_params = best_params++ # Generate future forecasts+ last_values = values[-lags:].tolist()+ last_time = times[-1]++ # Parse frequency to timedelta+ freq_map = {+ '1d': timedelta(days=1),+ '1h': timedelta(hours=1),+ '1w': timedelta(weeks=1),+ '1mo': timedelta(days=30),+ '1m': timedelta(minutes=1),+ }+ delta = freq_map.get(freq, timedelta(days=1))++ for h in range(fh):+ X_pred = np.array([last_values[-lags:]])+ y_pred = model.predict(X_pred)[0]+ forecast_time = last_time + delta * (h + 1)++ all_forecasts.append({+ 'entity_id': entity_id,+ 'time': forecast_time.isoformat() if hasattr(forecast_time, 'isoformat') else str(forecast_time),+ 'value': float(y_pred)+ })++ last_values.append(y_pred)++ return {+ "success": True,+ "model": model_type,+ "horizon": fh,+ "frequency": freq,+ "lags": lags,+ "forecast": all_forecasts,+ "shape": [len(all_forecasts), 3],+ "best_params": final_best_params,+ "backend": "sklearn"+ }+ except Exception as e:+ import traceback+ return {"success": False, "error": str(e), "traceback": traceback.format_exc()}+++def preprocess_data(params: Dict[str, Any]) -> Dict[str, Any]:+ """Apply preprocessing transformations"""+ if not FUNCTIME_AVAILABLE:+ return {"success": False, "error": "Functime library not available"}++ try:+ data = parse_panel_data_json(params['data'])+ method = params.get('method', 'scale')++ if method == 'boxcox':+ lmbda = params.get('lambda')+ result = apply_boxcox(data, lmbda=lmbda)+ elif method == 'scale':+ scale_method = params.get('scale_method', 'standard')+ result = scale_data(data, method=scale_method)+ elif method == 'difference':+ order = params.get('order', 1)+ result = difference_data(data, order=order)+ elif method == 'lags':+ lags = params.get('lags', [1, 2, 3])+ result = create_lags(data, lags=lags)+ elif method == 'rolling':+ window_sizes = params.get('window_sizes', [3, 7])+ stats = params.get('stats', ['mean'])+ result = create_rolling_features(data, window_sizes=window_sizes, stats=stats)+ elif method == 'impute':+ impute_method = params.get('impute_method', 'forward')+ result = impute_missing(data, method=impute_method)+ else:+ return {"success": False, "error": f"Unknown preprocessing method: {method}"}++ return {+ "success": True,+ "method": method,+ "shape": result.get('shape', []),+ "columns": result.get('columns', []),+ "data": result.get(list(result.keys())[0], []) # Get first data key+ }+ except Exception as e:+ return {"success": False, "error": str(e)}+++def cross_validate(params: Dict[str, Any]) -> Dict[str, Any]:+ """Perform cross-validation splits"""+ if not FUNCTIME_AVAILABLE:+ return {"success": False, "error": "Functime library not available"}++ try:+ data = parse_panel_data_json(params['data'])+ method = params.get('method', 'train_test')+ test_size = params.get('test_size', 1)+ n_splits = params.get('n_splits', 3)++ if method == 'train_test':+ result = split_train_test(data, test_size=test_size)+ return {+ "success": True,+ "method": method,+ "train_shape": result['train_shape'],+ "test_shape": result['test_shape']+ }+ elif method == 'expanding':+ step = params.get('step', 1)+ result = create_expanding_window_splits(+ data, test_size=test_size, n_splits=n_splits, step=step+ )+ return {+ "success": True,+ "method": method,+ "n_splits": result['n_splits'],+ "splits_summary": [+ {"train_shape": s['train_shape'], "test_shape": s['test_shape']}+ for s in result['splits']+ ]+ }+ elif method == 'sliding':+ train_size = params.get('train_size', 5)+ step = params.get('step', 1)+ result = create_sliding_window_splits(+ data, train_size=train_size, test_size=test_size,+ n_splits=n_splits, step=step+ )+ return {+ "success": True,+ "method": method,+ "n_splits": result['n_splits'],+ "splits_summary": [+ {"train_shape": s['train_shape'], "test_shape": s['test_shape']}+ for s in result['splits']+ ]+ }+ else:+ return {"success": False, "error": f"Unknown CV method: {method}"}+ except Exception as e:+ return {"success": False, "error": str(e)}+++def calculate_metrics(params: Dict[str, Any]) -> Dict[str, Any]:+ """Calculate forecast accuracy metrics"""+ if not FUNCTIME_AVAILABLE:+ return {"success": False, "error": "Functime library not available"}++ try:+ y_true = parse_panel_data_json(params['y_true'])+ y_pred = parse_panel_data_json(params['y_pred'])+ metrics_list = params.get('metrics', ['mae', 'rmse', 'smape'])++ results = {}++ if 'mae' in metrics_list:+ try:+ mae_result = calculate_mae(y_true, y_pred)+ results['mae'] = mae_result['mean_mae']+ except Exception:+ results['mae'] = None++ if 'rmse' in metrics_list:+ try:+ rmse_result = calculate_rmse(y_true, y_pred)+ results['rmse'] = rmse_result['mean_rmse']+ except Exception:+ results['rmse'] = None++ if 'smape' in metrics_list:+ try:+ smape_result = calculate_smape(y_true, y_pred)+ results['smape'] = smape_result['mean_smape']+ except Exception:+ results['smape'] = None++ if 'mape' in metrics_list:+ try:+ mape_result = calculate_mape(y_true, y_pred)+ results['mape'] = mape_result['mean_mape']+ except Exception:+ results['mape'] = None++ if 'mse' in metrics_list:+ try:+ mse_result = calculate_mse(y_true, y_pred)+ results['mse'] = mse_result['mean_mse']+ except Exception:+ results['mse'] = None++ return {+ "success": True,+ "metrics": results+ }+ except Exception as e:+ return {"success": False, "error": str(e)}+++def add_features(params: Dict[str, Any]) -> Dict[str, Any]:+ """Add calendar/holiday features"""+ if not FUNCTIME_AVAILABLE:+ return {"success": False, "error": "Functime library not available"}++ try:+ data = parse_panel_data_json(params['data'])+ feature_type = params.get('feature_type', 'calendar')+ freq = params.get('frequency', '1d')++ if feature_type == 'calendar':+ result = create_calendar_effects(data, freq=freq)+ elif feature_type == 'future_calendar':+ fh = params.get('horizon', 7)+ result = create_future_calendar_effects(fh=fh, freq=freq)+ else:+ return {"success": False, "error": f"Unknown feature type: {feature_type}"}++ return {+ "success": True,+ "feature_type": feature_type,+ "shape": result.get('shape', []),+ "columns": result.get('columns', []),+ "data": result.get('data', [])+ }+ except Exception as e:+ return {"success": False, "error": str(e)}+++def get_seasonal_period(params: Dict[str, Any]) -> Dict[str, Any]:+ """Get seasonal period for a frequency"""+ if not FUNCTIME_AVAILABLE:+ return {"success": False, "error": "Functime library not available"}++ try:+ freq = params.get('frequency', '1d')+ result = frequency_to_seasonal_period(freq)++ return {+ "success": True,+ "frequency": freq,+ "seasonal_period": result['seasonal_period']+ }+ except Exception as e:+ return {"success": False, "error": str(e)}+++def full_forecast_pipeline(params: Dict[str, Any]) -> Dict[str, Any]:+ """Run a complete forecasting pipeline with preprocessing and evaluation"""+ if not FUNCTIME_AVAILABLE:+ return {"success": False, "error": "Forecasting library not available (sklearn or polars missing)"}++ try:+ data = parse_panel_data_json(params['data'])+ model_type = params.get('model', 'linear')+ fh = params.get('horizon', 7)+ freq = params.get('frequency', '1d')+ test_size = params.get('test_size', fh)+ preprocess_method = params.get('preprocess', None)++ # Skip preprocessing for now - use data as-is+ processed_data = data+ preprocessing_info = None++ if preprocess_method and preprocess_method != 'none':+ preprocessing_info = {"method": preprocess_method, "note": "Preprocessing not applied - using raw data"}++ # Train/test split: Hold out test_size rows per entity for evaluation+ # We train on earlier data, make predictions for the test period, and compare+ train_data = processed_data+ test_data = None++ try:+ # Group by entity and split+ entities = processed_data['entity_id'].unique().to_list()+ train_rows = []+ test_rows = []++ for entity_id in entities:+ entity_data = processed_data.filter(pl.col('entity_id') == entity_id).sort('time')+ n = len(entity_data)+ if n > test_size:+ train_rows.extend(entity_data.head(n - test_size).to_dicts())+ test_rows.extend(entity_data.tail(test_size).to_dicts())+ else:+ train_rows.extend(entity_data.to_dicts())++ train_data = pl.DataFrame(train_rows) if train_rows else processed_data+ test_data = pl.DataFrame(test_rows) if test_rows else None+ except Exception as e:+ # If split fails, use all data for training+ train_data = processed_data+ print(f"Warning: Could not split data: {e}", file=sys.stderr)++ # Calculate evaluation metrics BEFORE generating the final forecast+ # We need to predict on the test period using the training data+ metrics = None+ if test_data is not None and len(test_data) > 0:+ try:+ # Get actual test values+ y_true_values = test_data['value'].to_numpy()++ # For evaluation, we predict for test_size periods from training data+ eval_forecast_result = run_forecast({+ 'data': serialize_to_json(train_data.to_dicts()),+ 'model': model_type,+ 'horizon': min(test_size, len(y_true_values)), # Match test size+ 'frequency': freq+ })++ if eval_forecast_result.get('success'):+ forecast_list = eval_forecast_result.get('forecast', [])+ if len(forecast_list) > 0:+ y_pred_values = np.array([f['value'] for f in forecast_list])++ if len(y_pred_values) > 0 and len(y_true_values) > 0:+ min_len = min(len(y_true_values), len(y_pred_values))+ y_true = y_true_values[:min_len]+ y_pred = y_pred_values[:min_len]++ mae = float(np.mean(np.abs(y_true - y_pred)))+ rmse = float(np.sqrt(np.mean((y_true - y_pred) ** 2)))+ # SMAPE+ smape = float(np.mean(2 * np.abs(y_true - y_pred) / (np.abs(y_true) + np.abs(y_pred) + 1e-8)) * 100)++ metrics = {+ 'mae': mae,+ 'rmse': rmse,+ 'smape': smape+ }+ except Exception as e:+ print(f"Warning: Could not calculate metrics: {e}", file=sys.stderr)++ # Now run forecast on FULL data for actual future predictions+ forecast_result = run_forecast({+ 'data': serialize_to_json(processed_data.to_dicts()),+ 'model': model_type,+ 'horizon': fh,+ 'frequency': freq+ })++ return {+ "success": True,+ "model": model_type,+ "horizon": fh,+ "frequency": freq,+ "preprocessing": preprocessing_info,+ "forecast": forecast_result.get('forecast', []),+ "forecast_shape": forecast_result.get('shape'),+ "best_params": forecast_result.get('best_params'),+ "evaluation_metrics": metrics,+ "data_summary": {+ "total_rows": len(data),+ "entities": data['entity_id'].n_unique() if 'entity_id' in data.columns else 1,+ "train_size": len(train_data) if train_data is not None else 0,+ "test_size": len(test_data) if test_data is not None else 0+ }+ }+ except Exception as e:+ return {"success": False, "error": str(e)}+++# ============================================================================+# ADVANCED MODELS COMMAND HANDLERS+# ============================================================================++def run_advanced_forecast(params: Dict[str, Any]) -> Dict[str, Any]:+ """Run advanced forecasting models (naive, SES, Holt, Theta, Croston, XGBoost, CatBoost)"""+ if not ADVANCED_MODELS_AVAILABLE:+ return {"success": False, "error": "Advanced models not available"}++ try:+ data = parse_panel_data_json(params['data'])+ model_type = params.get('model', 'naive')+ fh = params.get('horizon', 7)+ freq = params.get('frequency', '1d')++ model_params = params.get('model_params', {})++ if model_type == 'naive':+ result = naive_forecast(data, fh=fh, freq=freq)+ elif model_type == 'seasonal_naive':+ seasonal_period = model_params.get('seasonal_period', 7)+ result = seasonal_naive_forecast(data, fh=fh, seasonal_period=seasonal_period, freq=freq)+ elif model_type == 'drift':+ result = drift_forecast(data, fh=fh, freq=freq)+ elif model_type == 'ses':+ alpha = model_params.get('alpha')+ result = ses_forecast(data, fh=fh, alpha=alpha, freq=freq)+ elif model_type == 'holt':+ alpha = model_params.get('alpha')+ beta = model_params.get('beta')+ result = holt_forecast(data, fh=fh, alpha=alpha, beta=beta, freq=freq)+ elif model_type == 'theta':+ result = theta_forecast(data, fh=fh, freq=freq)+ elif model_type == 'croston':+ alpha = model_params.get('alpha', 0.1)+ result = croston_forecast(data, fh=fh, alpha=alpha, freq=freq)+ elif model_type == 'xgboost':+ n_lags = model_params.get('n_lags', 10)+ xgb_params = model_params.get('xgb_params', {})+ result = xgboost_forecast(data, fh=fh, n_lags=n_lags, xgb_params=xgb_params, freq=freq)+ elif model_type == 'catboost':+ n_lags = model_params.get('n_lags', 10)+ cat_params = model_params.get('cat_params', {})+ result = catboost_forecast(data, fh=fh, n_lags=n_lags, cat_params=cat_params, freq=freq)+ else:+ return {"success": False, "error": f"Unknown advanced model: {model_type}"}++ return result+ except Exception as e:+ import traceback+ return {"success": False, "error": str(e), "traceback": traceback.format_exc()}+++# ============================================================================+# ENSEMBLE COMMAND HANDLERS+# ============================================================================++def run_ensemble(params: Dict[str, Any]) -> Dict[str, Any]:+ """Run ensemble forecasting"""+ if not ENSEMBLE_AVAILABLE:+ return {"success": False, "error": "Ensemble methods not available"}++ try:+ forecasts_json = params.get('forecasts', [])+ method = params.get('method', 'mean')++ # Parse forecasts - each should be a list of {entity_id, time, value}+ if isinstance(forecasts_json, str):+ forecasts_json = json.loads(forecasts_json)++ forecasts = [pl.DataFrame(fc) for fc in forecasts_json]++ if method == 'mean':+ result = ensemble_mean(forecasts)+ elif method == 'median':+ result = ensemble_median(forecasts)+ elif method == 'trimmed_mean':+ trim_pct = params.get('trim_pct', 0.1)+ result = ensemble_trimmed_mean(forecasts, trim_pct=trim_pct)+ elif method == 'weighted':+ weights = params.get('weights')+ result = ensemble_weighted(forecasts, weights=weights)+ elif method == 'stacking':+ y_train = parse_panel_data_json(params['y_train'])+ result = ensemble_stacking(forecasts, y_train)+ else:+ return {"success": False, "error": f"Unknown ensemble method: {method}"}++ return result+ except Exception as e:+ return {"success": False, "error": str(e)}+++def run_auto_ensemble(params: Dict[str, Any]) -> Dict[str, Any]:+ """Run automatic ensemble selection and combination"""+ if not ENSEMBLE_AVAILABLE:+ return {"success": False, "error": "Ensemble methods not available"}++ try:+ data = parse_panel_data_json(params['data'])+ fh = params.get('horizon', 7)+ freq = params.get('frequency', '1d')+ n_best = params.get('n_best', 3)++ result = auto_ensemble(data, fh=fh, freq=freq, n_best=n_best)+ return result+ except Exception as e:+ return {"success": False, "error": str(e)}+++# ============================================================================+# ANOMALY DETECTION COMMAND HANDLERS+# ============================================================================++def run_anomaly_detection(params: Dict[str, Any]) -> Dict[str, Any]:+ """Run anomaly detection on time series"""+ if not ANOMALY_AVAILABLE:+ return {"success": False, "error": "Anomaly detection not available"}++ try:+ data = parse_panel_data_json(params['data'])+ method = params.get('method', 'zscore')++ if method == 'zscore':+ threshold = params.get('threshold', 3.0)+ result = detect_zscore(data, threshold=threshold)+ elif method == 'iqr':+ multiplier = params.get('multiplier', 1.5)+ result = detect_iqr(data, k=multiplier)+ elif method == 'grubbs':+ alpha = params.get('alpha', 0.05)+ result = detect_grubbs(data, alpha=alpha)+ elif method == 'isolation_forest':+ contamination = params.get('contamination', 0.05)+ result = detect_isolation_forest(data, contamination=contamination)+ elif method == 'lof':+ n_neighbors = params.get('n_neighbors', 20)+ contamination = params.get('contamination', 0.05)+ result = detect_lof(data, n_neighbors=n_neighbors, contamination=contamination)+ elif method == 'residual':+ threshold = params.get('threshold', 3.0)+ result = detect_residual_anomalies(data, threshold=threshold)+ elif method == 'change_points':+ n_bkps = params.get('n_bkps', 5)+ result = detect_change_points(data, n_bkps=n_bkps)+ else:+ return {"success": False, "error": f"Unknown anomaly method: {method}"}++ # Restructure result to match frontend expectations+ # Frontend expects: { results: { entity_id: { anomalies: [...], n_anomalies, anomaly_rate } } }+ if result.get('success') and 'data' in result:+ # Group anomalies by entity_id+ all_data = result.get('data', [])+ anomalies_list = result.get('anomalies', [])++ # Group by entity_id+ entities_results = {}+ for item in all_data:+ entity_id = item.get('entity_id', 'default')+ if entity_id not in entities_results:+ entities_results[entity_id] = {+ 'anomalies': [],+ 'n_anomalies': 0,+ 'anomaly_rate': 0.0,+ 'total_points': 0+ }+ entities_results[entity_id]['total_points'] += 1+ if item.get('is_anomaly'):+ entities_results[entity_id]['anomalies'].append(item)+ entities_results[entity_id]['n_anomalies'] += 1++ # Calculate anomaly rate per entity+ for entity_id, entity_data in entities_results.items():+ if entity_data['total_points'] > 0:+ entity_data['anomaly_rate'] = entity_data['n_anomalies'] / entity_data['total_points']+ del entity_data['total_points'] # Remove temp field++ return {+ 'success': True,+ 'method': result.get('method', method),+ 'results': entities_results+ }++ return result+ except Exception as e:+ import traceback+ return {"success": False, "error": str(e), "traceback": traceback.format_exc()}+++# ============================================================================+# SEASONALITY COMMAND HANDLERS+# ============================================================================++def run_seasonality_analysis(params: Dict[str, Any]) -> Dict[str, Any]:+ """Run seasonality analysis on time series"""+ if not SEASONALITY_AVAILABLE:+ return {"success": False, "error": "Seasonality analysis not available"}++ try:+ data = parse_panel_data_json(params['data'])+ # Support both 'operation' and 'analysis_type' parameter names+ operation = params.get('operation') or params.get('analysis_type', 'decompose')++ # Map analysis_type values to operation values+ operation_map = {+ 'decompose': 'decompose_stl',+ 'detect': 'detect_period',+ 'strength': 'metrics',+ 'adjust': 'adjust',+ }+ operation = operation_map.get(operation, operation)++ period = params.get('period')+ model_type = params.get('model_type', 'additive')++ if operation == 'detect_period':+ method = params.get('method', 'fft')+ max_period = params.get('max_period', 365)+ result = detect_seasonal_period(data, method=method, max_period=max_period)+ elif operation == 'decompose_stl':+ robust = params.get('robust', True)+ result = decompose_stl(data, period=period, robust=robust)+ elif operation == 'decompose_classical':+ result = decompose_classical(data, period=period, model=model_type)+ elif operation == 'adjust':+ method = params.get('method', 'stl')+ result = seasonally_adjust(data, period=period, method=method)+ elif operation == 'metrics':+ result = calculate_seasonality_metrics(data, period=period)+ else:+ return {"success": False, "error": f"Unknown seasonality operation: {operation}"}++ return result+ except Exception as e:+ import traceback+ return {"success": False, "error": str(e), "traceback": traceback.format_exc()}+++# ============================================================================+# CONFIDENCE INTERVALS COMMAND HANDLERS+# ============================================================================++def run_confidence_intervals(params: Dict[str, Any]) -> Dict[str, Any]:+ """Generate prediction/confidence intervals"""+ if not CONFIDENCE_AVAILABLE:+ return {"success": False, "error": "Confidence intervals not available"}++ try:+ method = params.get('method', 'monte_carlo')+ confidence_levels = params.get('confidence_levels', [0.80, 0.95])++ if method == 'bootstrap':+ data = parse_panel_data_json(params['data'])+ fh = params.get('horizon', 7)+ freq = params.get('frequency', '1d')+ n_bootstrap = params.get('n_bootstrap', 100)++ # Need a forecaster - create a simple one+ def simple_forecaster(y_train, fh, freq):+ last_value = y_train['value'].to_list()[-1]+ last_time = y_train['time'].to_list()[-1]+ delta = timedelta(days=1)+ forecast = []+ for i in range(1, fh + 1):+ forecast.append({+ 'entity_id': y_train['entity_id'].to_list()[0],+ 'time': last_time + (delta * i),+ 'value': last_value+ })+ return {'forecast': forecast}++ result = bootstrap_prediction_intervals(+ data, simple_forecaster, fh=fh,+ n_bootstrap=n_bootstrap, confidence_levels=confidence_levels, freq=freq+ )+ elif method == 'residual':+ data = parse_panel_data_json(params['data'])+ forecast = parse_panel_data_json(params['forecast'])+ y_validation = parse_panel_data_json(params['y_validation']) if 'y_validation' in params else None+ result = residual_prediction_intervals(data, forecast, y_validation, confidence_levels)+ elif method == 'quantile':+ data = parse_panel_data_json(params['data'])+ fh = params.get('horizon', 7)+ lags = params.get('lags', 10)+ quantiles = params.get('quantiles', [0.025, 0.10, 0.50, 0.90, 0.975])+ freq = params.get('frequency', '1d')+ result = quantile_prediction_intervals(data, fh=fh, lags=lags, quantiles=quantiles, freq=freq)+ elif method == 'conformal':+ data = parse_panel_data_json(params['data'])+ forecast = parse_panel_data_json(params['forecast'])+ calibration_size = params.get('calibration_size', 50)+ result = conformal_prediction_intervals(data, forecast, calibration_size, confidence_levels)+ elif method == 'monte_carlo':+ data = parse_panel_data_json(params['data'])+ fh = params.get('horizon', 7)+ n_simulations = params.get('n_simulations', 1000)+ model = params.get('model', 'random_walk')+ freq = params.get('frequency', '1d')+ result = monte_carlo_intervals(data, fh=fh, n_simulations=n_simulations, model=model,+ confidence_levels=confidence_levels, freq=freq)+ else:+ return {"success": False, "error": f"Unknown interval method: {method}"}++ return result+ except Exception as e:+ return {"success": False, "error": str(e)}+++# ============================================================================+# FEATURE IMPORTANCE COMMAND HANDLERS+# ============================================================================++def run_feature_importance(params: Dict[str, Any]) -> Dict[str, Any]:+ """Calculate feature importance for time series"""+ if not FEATURE_IMPORTANCE_AVAILABLE:+ return {"success": False, "error": "Feature importance not available"}++ try:+ data = parse_panel_data_json(params['data'])+ method = params.get('method', 'permutation')+ n_lags = params.get('n_lags', 10)++ if method == 'permutation':+ n_repeats = params.get('n_repeats', 10)+ model_type = params.get('model_type', 'ridge')+ result = calculate_permutation_importance(data, n_lags=n_lags, n_repeats=n_repeats, model_type=model_type)+ elif method == 'model':+ model_type = params.get('model_type', 'ridge')+ result = calculate_model_importance(data, n_lags=n_lags, model_type=model_type)+ elif method == 'shap':+ max_samples = params.get('max_samples', 100)+ result = calculate_shap_importance(data, n_lags=n_lags, max_samples=max_samples)+ elif method == 'lag_analysis':+ max_lags = params.get('max_lags', 20)+ result = analyze_lag_importance(data, max_lags=max_lags)+ elif method == 'sensitivity':+ fh = params.get('horizon', 10)+ perturbation_pct = params.get('perturbation_pct', 0.05)+ freq = params.get('frequency', '1d')++ # Need a forecaster for sensitivity+ def simple_forecaster(y_train, fh, freq):+ last_value = y_train['value'].to_list()[-1]+ last_time = y_train['time'].to_list()[-1]+ delta = timedelta(days=1)+ forecast = []+ for i in range(1, fh + 1):+ forecast.append({+ 'entity_id': y_train['entity_id'].to_list()[0],+ 'time': last_time + (delta * i),+ 'value': last_value+ })+ return {'forecast': forecast}++ result = sensitivity_analysis(data, simple_forecaster, fh=fh,+ perturbation_pct=perturbation_pct, freq=freq)+ else:+ return {"success": False, "error": f"Unknown importance method: {method}"}++ return result+ except Exception as e:+ return {"success": False, "error": str(e)}+++# ============================================================================+# ADVANCED CROSS-VALIDATION COMMAND HANDLERS+# ============================================================================++def run_advanced_cv(params: Dict[str, Any]) -> Dict[str, Any]:+ """Run advanced cross-validation methods"""+ if not ADVANCED_CV_AVAILABLE:+ return {"success": False, "error": "Advanced CV not available"}++ try:+ data = parse_panel_data_json(params['data'])+ method = params.get('method', 'walk_forward')++ if method == 'blocked':+ n_splits = params.get('n_splits', 5)+ test_size = params.get('test_size', 1)+ gap = params.get('gap', 0)+ result = blocked_time_series_cv(data, n_splits=n_splits, test_size=test_size, gap=gap)+ elif method == 'purged':+ n_splits = params.get('n_splits', 5)+ embargo_pct = params.get('embargo_pct', 0.01)+ purge_pct = params.get('purge_pct', 0.01)+ result = purged_kfold_cv(data, n_splits=n_splits, embargo_pct=embargo_pct, purge_pct=purge_pct)+ elif method == 'combinatorial':+ n_test_splits = params.get('n_test_splits', 2)+ n_groups = params.get('n_groups', 6)+ embargo_pct = params.get('embargo_pct', 0.01)+ result = combinatorial_purged_cv(data, n_test_splits=n_test_splits,+ n_groups=n_groups, embargo_pct=embargo_pct)+ elif method == 'walk_forward':+ initial_train_size = params.get('initial_train_size', 100)+ test_size = params.get('test_size', 1)+ step_size = params.get('step_size', 1)+ anchored = params.get('anchored', False)+ result = walk_forward_validation(data, initial_train_size=initial_train_size,+ test_size=test_size, step_size=step_size, anchored=anchored)+ elif method == 'nested':+ outer_splits = params.get('outer_splits', 5)+ inner_splits = params.get('inner_splits', 3)+ test_size = params.get('test_size', 1)+ result = nested_cv(data, outer_splits=outer_splits, inner_splits=inner_splits, test_size=test_size)+ else:+ return {"success": False, "error": f"Unknown CV method: {method}"}++ return result+ except Exception as e:+ return {"success": False, "error": str(e)}+++# ============================================================================+# BACKTESTING COMMAND HANDLERS+# ============================================================================++def run_backtest(params: Dict[str, Any]) -> Dict[str, Any]:+ """Run backtesting on time series"""+ if not BACKTESTING_AVAILABLE:+ return {"success": False, "error": "Backtesting not available"}++ try:+ data = parse_panel_data_json(params['data'])+ operation = params.get('operation', 'walk_forward')+ freq = params.get('frequency', '1d')++ # Create a simple forecaster+ def simple_forecaster(y_train, fh, freq):+ last_value = y_train['value'].to_list()[-1]+ last_time = y_train['time'].to_list()[-1]+ delta = timedelta(days=1)+ forecast = []+ for i in range(1, fh + 1):+ forecast.append({+ 'entity_id': y_train['entity_id'].to_list()[0],+ 'time': last_time + (delta * i),+ 'value': last_value+ })+ return {'forecast': forecast}++ if operation == 'walk_forward':+ initial_train_size = params.get('initial_train_size', 100)+ test_size = params.get('test_size', 1)+ step_size = params.get('step_size', 1)+ horizons = params.get('horizons')+ retrain = params.get('retrain', True)+ result = walk_forward_backtest(data, simple_forecaster, initial_train_size=initial_train_size,+ test_size=test_size, step_size=step_size,+ horizons=horizons, freq=freq, retrain=retrain)+ elif operation == 'compare_models':+ initial_train_size = params.get('initial_train_size', 100)+ test_size = params.get('test_size', 1)+ step_size = params.get('step_size', 5)+ # Use simple forecasters for comparison+ forecasters = {'naive': simple_forecaster}+ result = compare_models_backtest(data, forecasters, initial_train_size=initial_train_size,+ test_size=test_size, step_size=step_size, freq=freq)+ elif operation == 'rolling_origin':+ min_train_size = params.get('min_train_size', 50)+ max_train_size = params.get('max_train_size')+ test_size = params.get('test_size', 1)+ result = rolling_origin_evaluation(data, simple_forecaster, min_train_size=min_train_size,+ max_train_size=max_train_size, test_size=test_size, freq=freq)+ elif operation == 'attribution':+ backtest_results = params.get('backtest_results', {})+ result = performance_attribution(backtest_results)+ elif operation == 'summary':+ backtest_results = params.get('backtest_results', {})+ result = backtest_summary(backtest_results)+ else:+ return {"success": False, "error": f"Unknown backtest operation: {operation}"}++ return result+ except Exception as e:+ return {"success": False, "error": str(e)}+++# ============================================================================+# MAIN ENTRY POINT+# ============================================================================++COMMANDS = {+ "check_status": lambda _: check_status(),+ "forecast": run_forecast,+ "preprocess": preprocess_data,+ "cross_validate": cross_validate,+ "metrics": calculate_metrics,+ "add_features": add_features,+ "seasonal_period": get_seasonal_period,+ "full_pipeline": full_forecast_pipeline,+ # Advanced models+ "advanced_forecast": run_advanced_forecast,+ # Ensemble methods+ "ensemble": run_ensemble,+ "auto_ensemble": run_auto_ensemble,+ # Anomaly detection+ "anomaly_detection": run_anomaly_detection,+ # Seasonality analysis+ "seasonality": run_seasonality_analysis,+ # Confidence intervals+ "confidence_intervals": run_confidence_intervals,+ # Feature importance+ "feature_importance": run_feature_importance,+ # Advanced cross-validation+ "advanced_cv": run_advanced_cv,+ # Backtesting+ "backtest": run_backtest,+}+++def main(args: list) -> str:+ """Main entry point called by the host via subprocess"""+ try:+ if len(args) < 1:+ return serialize_result({"success": False, "error": "No command specified"})++ command = args[0]++ if command not in COMMANDS:+ return serialize_result({"success": False, "error": f"Unknown command: {command}"})++ # Parse params if provided+ params = {}+ if len(args) > 1:+ params = json.loads(args[1])++ result = COMMANDS[command](params)+ return serialize_result(result)++ except Exception as e:+ return serialize_result({"success": False, "error": str(e)})+++if __name__ == "__main__":+ output = main(sys.argv[1:])+ print(output)diff --git a/fincept-qt/scripts/Analytics/gluonts_wrapper/gluonts_service.py b/fincept-qt/scripts/Analytics/gluonts_wrapper/gluonts_service.pyindex 79436b712..3d020d319 100644--- a/fincept-qt/scripts/Analytics/gluonts_wrapper/gluonts_service.py+++ b/fincept-qt/scripts/Analytics/gluonts_wrapper/gluonts_service.py@@ -1,206 +1,579 @@-#!/usr/bin/env python3"""-GluonTS Worker Handler-Covers all 13 operations: 9 deep-learning forecasters, 3 baseline predictors, 1 evaluation.+GluonTS Service (probabilistic forecasting backend)+====================================================+Self-contained probabilistic-forecasting + distributional-modeling service for+the Fincept Terminal "GluonTS" sub-tab.++Notes:+- The legacy implementation (preserved as gluonts_service_legacy.py) imports+ the heavy `gluonts` package, which depends on torch/mxnet and is not+ installed in this venv. This rewrite uses scipy + sklearn + numpy only,+ giving the same conceptual surface (probabilistic point + interval+ forecasts, distribution fits, evaluation metrics, baseline predictors)+ without the dependency.++Response contract (all ops):+ success: bool+ operation: str+ data: dict (when success)+ error: str (when failure)+ error_kind: str | None (validation | runtime | unknown_op)+ traceback: str | None (only on uncaught exceptions)"""-import jsonimport sys-from pathlib import Path+import os+import json+import math+import traceback+from typing import Dict, List, Any++import numpy as np++try:+ from scipy import stats as scstats+ SCIPY_OK = True+except ImportError:+ SCIPY_OK = False++try:+ from sklearn.linear_model import LinearRegression+ SKLEARN_OK = True+except ImportError:+ SKLEARN_OK = False+++# ============================================================================+# INPUT COERCION + VALIDATION+# ============================================================================++class ValidationError(ValueError):+ pass+++def _coerce_floats(value, field_name):+ if value is None:+ return []+ if isinstance(value, (list, tuple)):+ out = []+ for i, v in enumerate(value):+ try:+ out.append(float(v))+ except (TypeError, ValueError):+ raise ValidationError(f"{field_name}[{i}] is not numeric: {v!r}")+ return out+ if isinstance(value, np.ndarray):+ return [float(v) for v in value.tolist()]+ if isinstance(value, str):+ s = value.strip()+ if not s:+ return []+ for sep in [",", ";", "\t", "\n"]:+ s = s.replace(sep, " ")+ parts = [p for p in s.split(" ") if p.strip()]+ out = []+ for i, p in enumerate(parts):+ try:+ out.append(float(p))+ except ValueError:+ raise ValidationError(f"{field_name}[{i}] is not numeric: {p!r}")+ return out+ try:+ return [float(value)]+ except (TypeError, ValueError):+ raise ValidationError(f"{field_name} is not numeric: {value!r}")-sys.path.insert(0, str(Path(__file__).parent))-from forecasters import (- forecast_feedforward, forecast_deepar, forecast_tft, forecast_wavenet,- forecast_dlinear, forecast_patchtst, forecast_tide, forecast_lagtst, forecast_deepnpts-)-from predictors import predict_seasonal_naive, predict_mean, predict_constant-from evaluation import evaluate_forecasts+def _require_min_length(values, n, field_name):+ if len(values) < n:+ raise ValidationError(+ f"{field_name} needs at least {n} values, got {len(values)}")-def main(args):+def _safe_float(v, default=0.0):+ try:+ f = float(v)+ except (TypeError, ValueError):+ return default+ if math.isnan(f) or math.isinf(f):+ return default+ return f+++def _safe_int(v, default=0):+ try:+ f = float(v)+ if math.isnan(f) or math.isinf(f):+ return default+ return int(f)+ except (TypeError, ValueError):+ return default+++# ============================================================================+# SHARED FORECASTING UTILS+# ============================================================================++def _bootstrap_paths(values, horizon, n_paths, lags, rng):"""- Entry point: [operation, json_data]- Returns: JSON string+ Generate n_paths bootstrapped forecast trajectories using residuals from a+ simple AR(lags) regression. Returns (paths[n_paths, horizon], in_sample_resid)."""- try:- if len(args) < 2:- return json.dumps({"error": "Expected: [operation, json_data]"})-- operation = args[0]- data = json.loads(args[1])-- dispatch = {- # Deep learning forecasters- "forecast_feedforward": _forecast_feedforward,- "forecast_deepar": _forecast_deepar,- "forecast_tft": _forecast_tft,- "forecast_wavenet": _forecast_wavenet,- "forecast_dlinear": _forecast_dlinear,- "forecast_patchtst": _forecast_patchtst,- "forecast_tide": _forecast_tide,- "forecast_lagtst": _forecast_lagtst,- "forecast_deepnpts": _forecast_deepnpts,- # Baseline predictors- "predict_seasonal_naive": _predict_seasonal_naive,- "predict_mean": _predict_mean,- "predict_constant": _predict_constant,- # Evaluation- "evaluate": _evaluate,- }+ if not SKLEARN_OK:+ raise ValidationError("sklearn not installed — bootstrap forecasting unavailable")+ n = len(values)+ arr = np.asarray(values, dtype=float)+ if n <= lags + 5:+ raise ValidationError(f"need at least lags+6={lags + 6} obs, got {n}")+ X, y = [], []+ for i in range(lags, n):+ X.append(arr[i - lags:i])+ y.append(arr[i])+ X = np.asarray(X, dtype=float)+ y = np.asarray(y, dtype=float)+ base = LinearRegression().fit(X, y)+ resid = y - base.predict(X)++ paths = np.zeros((n_paths, horizon), dtype=float)+ for b in range(n_paths):+ last = list(arr[-lags:])+ shocks = rng.choice(resid, size=horizon, replace=True)+ for h in range(horizon):+ x_pred = np.asarray([last[-lags:]], dtype=float)+ yhat = float(base.predict(x_pred)[0]) + shocks[h]+ paths[b, h] = yhat+ last.append(yhat)+ return paths, resid+++def _seasonal_naive_array(values, horizon, season_length):+ """Repeat the last `season_length` observations forward."""+ arr = np.asarray(values, dtype=float)+ n = len(arr)+ season = max(1, min(season_length, n))+ out = np.zeros(horizon, dtype=float)+ for h in range(horizon):+ out[h] = float(arr[n - season + (h % season)])+ return out+++# ============================================================================+# OPERATION HANDLERS+# ============================================================================++def op_check_status(_data):+ return {+ "scipy": SCIPY_OK,+ "sklearn": SKLEARN_OK,+ "gluonts_native": False,+ "backend": "numpy" + (" + scipy" if SCIPY_OK else "") + (" + sklearn" if SKLEARN_OK else ""),+ "ops_available": list(OPERATIONS.keys()),+ "note": "Self-contained probabilistic-forecasting backend. Heavy gluonts package not required.",+ }+++def op_probabilistic_forecast(data):+ """+ Bootstrap-residual probabilistic forecast with multi-quantile bands (10/25/50/75/90).++ Inputs:+ values : list[float] (required, >= 30)+ horizon : int (default 14)+ lags : int (AR window, default 7)+ n_paths : int (bootstrap paths, default 500)+ seed : int (RNG seed, default 42)+ """+ values = _coerce_floats(data.get("values"), "values")+ _require_min_length(values, 30, "values")+ horizon_raw = _safe_int(data.get("horizon", 14))+ if horizon_raw < 1:+ raise ValidationError(f"horizon must be >= 1, got {horizon_raw}")+ horizon = min(horizon_raw, 365)+ lags = max(1, min(_safe_int(data.get("lags", 7)), len(values) // 2))+ n_paths = max(100, min(_safe_int(data.get("n_paths", 500)), 5000))+ seed = _safe_int(data.get("seed", 42))++ rng = np.random.default_rng(seed)+ paths, resid = _bootstrap_paths(values, horizon, n_paths, lags, rng)++ qs = [10, 25, 50, 75, 90]+ quantile_arr = np.percentile(paths, qs, axis=0) # shape (5, horizon)+ point = quantile_arr[2] # median = 50th percentile+ mean_path = paths.mean(axis=0)++ # Build per-step forecast rows+ forecast = []+ for h in range(horizon):+ forecast.append({+ "step": h + 1,+ "p10": _safe_float(quantile_arr[0, h]),+ "p25": _safe_float(quantile_arr[1, h]),+ "p50": _safe_float(quantile_arr[2, h]),+ "p75": _safe_float(quantile_arr[3, h]),+ "p90": _safe_float(quantile_arr[4, h]),+ "mean": _safe_float(mean_path[h]),+ "width_50": _safe_float(quantile_arr[3, h] - quantile_arr[1, h]),+ "width_80": _safe_float(quantile_arr[4, h] - quantile_arr[0, h]),+ })- handler = dispatch.get(operation)- if handler is None:- return json.dumps({"error": f"Unknown operation: {operation}"})+ last_actual = float(values[-1])+ horizon_drift = float(point[-1] - last_actual)++ return {+ "n_observations": len(values),+ "horizon": horizon,+ "lags": lags,+ "n_paths": n_paths,+ "residual_std": _safe_float(float(resid.std())),+ "last_actual": _safe_float(last_actual),+ "first_forecast_p50": _safe_float(point[0]),+ "last_forecast_p50": _safe_float(point[-1]),+ "horizon_drift": _safe_float(horizon_drift),+ "mean_p80_width": _safe_float(float((quantile_arr[4] - quantile_arr[0]).mean())),+ "first_p80_width": _safe_float(quantile_arr[4, 0] - quantile_arr[0, 0]),+ "last_p80_width": _safe_float(quantile_arr[4, -1] - quantile_arr[0, -1]),+ "forecast": forecast,+ }+++def op_quantile_forecast(data):+ """+ Forecast with a user-chosen quantile list.++ Inputs:+ values : list[float] (required, >= 30)+ quantiles : list[float] (in (0, 1), default [0.05, 0.5, 0.95])+ horizon : int (default 14)+ lags : int (default 7)+ n_paths : int (default 500)+ seed : int (default 42)+ """+ values = _coerce_floats(data.get("values"), "values")+ _require_min_length(values, 30, "values")+ raw_qs = data.get("quantiles")+ if raw_qs is None:+ qs = [0.05, 0.5, 0.95]+ else:+ qs = _coerce_floats(raw_qs, "quantiles")+ if not qs:+ raise ValidationError("quantiles list is empty — provide at least one value in (0, 1)")+ for q in qs:+ if not (0.0 < q < 1.0):+ raise ValidationError(f"quantile {q} must be in (0, 1)")+ qs = sorted(qs)+ horizon_raw = _safe_int(data.get("horizon", 14))+ if horizon_raw < 1:+ raise ValidationError(f"horizon must be >= 1, got {horizon_raw}")+ horizon = min(horizon_raw, 365)+ lags = max(1, min(_safe_int(data.get("lags", 7)), len(values) // 2))+ n_paths = max(100, min(_safe_int(data.get("n_paths", 500)), 5000))+ seed = _safe_int(data.get("seed", 42))++ rng = np.random.default_rng(seed)+ paths, resid = _bootstrap_paths(values, horizon, n_paths, lags, rng)++ pcts = [q * 100.0 for q in qs]+ quantile_arr = np.percentile(paths, pcts, axis=0) # (len(qs), horizon)++ quantile_rows = []+ for h in range(horizon):+ row = {"step": h + 1}+ for i, q in enumerate(qs):+ row[f"q{int(round(q * 100))}"] = _safe_float(quantile_arr[i, h])+ quantile_rows.append(row)++ # Per-quantile summary across horizon+ quantile_summary = []+ for i, q in enumerate(qs):+ col = quantile_arr[i]+ quantile_summary.append({+ "quantile": _safe_float(q),+ "label": f"q{int(round(q * 100))}",+ "mean": _safe_float(float(col.mean())),+ "min": _safe_float(float(col.min())),+ "max": _safe_float(float(col.max())),+ "first": _safe_float(float(col[0])),+ "last": _safe_float(float(col[-1])),+ })- return handler(data)+ return {+ "n_observations": len(values),+ "horizon": horizon,+ "lags": lags,+ "n_paths": n_paths,+ "n_quantiles": len(qs),+ "quantiles": qs,+ "residual_std": _safe_float(float(resid.std())),+ "last_actual": _safe_float(float(values[-1])),+ "forecast": quantile_rows,+ "quantile_summary": quantile_summary,+ }+++def op_distribution_fit(data):+ """+ Fit candidate distributions (normal, student-t, lognormal, skewnormal) to a+ series. Return AIC/BIC for model selection.- except Exception as e:- import traceback- return json.dumps({- "error": f"GluonTS error: {str(e)}",- "traceback": traceback.format_exc()+ Inputs:+ values : list[float] (required, >= 30)+ """+ if not SCIPY_OK:+ raise ValidationError("scipy not installed — cannot fit distributions")+ values = _coerce_floats(data.get("values"), "values")+ _require_min_length(values, 30, "values")+ arr = np.asarray(values, dtype=float)+ n = len(arr)++ candidates = []+ # Normal+ candidates.append(("normal", scstats.norm, ()))+ # Student-t — needs positive df, fitted automatically+ candidates.append(("student_t", scstats.t, ()))+ # Lognormal — only if all values positive+ if (arr > 0).all():+ candidates.append(("lognormal", scstats.lognorm, ()))+ # Skewnormal — handles asymmetric tails+ candidates.append(("skewnormal", scstats.skewnorm, ()))++ fits = []+ for name, dist, _ in candidates:+ try:+ params = dist.fit(arr)+ log_lik = float(np.sum(dist.logpdf(arr, *params)))+ k = len(params)+ aic = 2 * k - 2 * log_lik+ bic = k * math.log(n) - 2 * log_lik+ # KS test against fitted distribution+ ks_stat, ks_p = scstats.kstest(arr, dist.cdf, args=params)+ except Exception as e:+ params = ()+ log_lik = float("nan")+ aic = float("inf")+ bic = float("inf")+ ks_stat = float("nan")+ ks_p = 0.0++ fits.append({+ "distribution": name,+ "n_params": len(params),+ "params": [_safe_float(p) for p in params],+ "log_likelihood": _safe_float(log_lik),+ "aic": _safe_float(aic, default=float("inf")) if not math.isinf(aic) else None,+ "bic": _safe_float(bic, default=float("inf")) if not math.isinf(bic) else None,+ "ks_statistic": _safe_float(ks_stat),+ "ks_p_value": _safe_float(ks_p),+ "cannot_reject_at_5pct": bool(ks_p > 0.05),})+ # Pick best by AIC (lowest)+ valid = [f for f in fits if f["aic"] is not None and not math.isinf(float(f["aic"]))]+ best_by_aic = min(valid, key=lambda f: f["aic"])["distribution"] if valid else None+ best_by_bic = min(valid, key=lambda f: f["bic"])["distribution"] if valid else None++ # Also compute basic stats so the user can sanity-check the fits+ return {+ "n_observations": n,+ "data_mean": _safe_float(float(arr.mean())),+ "data_std": _safe_float(float(arr.std(ddof=1))),+ "data_skew": _safe_float(float(scstats.skew(arr))),+ "data_kurtosis": _safe_float(float(scstats.kurtosis(arr))),+ "data_min": _safe_float(float(arr.min())),+ "data_max": _safe_float(float(arr.max())),+ "best_by_aic": best_by_aic,+ "best_by_bic": best_by_bic,+ "fits": fits,+ }+++def op_evaluate_forecast(data):+ """+ Forecast accuracy + probabilistic-coverage evaluation.++ Inputs:+ actuals : list[float] (required, >= 5)+ point : list[float] (point forecast, same length)+ lower : list[float] (optional, lower band)+ upper : list[float] (optional, upper band)+ training : list[float] (optional historical series for MASE)+ season : int (default 1, used for MASE denominator)+ coverage_target_pct : float (default 80, only used for label)+ """+ actuals = _coerce_floats(data.get("actuals"), "actuals")+ point = _coerce_floats(data.get("point"), "point")+ _require_min_length(actuals, 5, "actuals")+ if len(actuals) != len(point):+ raise ValidationError(+ f"actuals ({len(actuals)}) and point ({len(point)}) must have the same length")++ a = np.asarray(actuals, dtype=float)+ p = np.asarray(point, dtype=float)+ err = a - p+ mae = float(np.mean(np.abs(err)))+ mse = float(np.mean(err ** 2))+ rmse = float(np.sqrt(mse))+ safe_a = np.where(np.abs(a) < 1e-12, np.nan, a)+ mape = float(np.nanmean(np.abs(err / safe_a)) * 100.0)+ denom = (np.abs(a) + np.abs(p))+ safe_denom = np.where(denom < 1e-12, np.nan, denom)+ smape = float(np.nanmean(2.0 * np.abs(err) / safe_denom) * 100.0)+ bias = float(err.mean())++ # MASE — naive seasonal benchmark from training history if provided+ mase = None+ training_raw = data.get("training")+ if training_raw is not None:+ training = _coerce_floats(training_raw, "training")+ if len(training) > 1:+ season = max(1, _safe_int(data.get("season", 1)))+ train_arr = np.asarray(training, dtype=float)+ if len(train_arr) > season:+ naive_err = np.abs(train_arr[season:] - train_arr[:-season])+ naive_scale = float(naive_err.mean())+ if naive_scale > 0:+ mase = float(mae / naive_scale)++ # Coverage + interval metrics+ has_intervals = data.get("lower") is not None and data.get("upper") is not None+ coverage_pct = None+ avg_width = None+ interval_score = None+ if has_intervals:+ lower = _coerce_floats(data.get("lower"), "lower")+ upper = _coerce_floats(data.get("upper"), "upper")+ if len(lower) != len(actuals) or len(upper) != len(actuals):+ raise ValidationError("lower/upper bands must match actuals length")+ l = np.asarray(lower, dtype=float)+ u = np.asarray(upper, dtype=float)+ within = (a >= l) & (a <= u)+ coverage_pct = float(within.mean() * 100.0)+ avg_width = float((u - l).mean())+ # Winkler/interval score with target alpha = 1 - coverage_target/100+ coverage_target = _safe_float(data.get("coverage_target_pct", 80.0))+ alpha = max(1e-9, 1.0 - coverage_target / 100.0)+ below = a < l+ above = a > u+ score = (u - l) + (2.0 / alpha) * (l - a) * below + (2.0 / alpha) * (a - u) * above+ interval_score = float(score.mean())++ # Direction accuracy on first differences+ if len(a) > 1:+ actual_dir = np.sign(np.diff(a))+ pred_dir = np.sign(np.diff(p))+ direction_acc = float(np.mean(actual_dir == pred_dir) * 100.0)+ else:+ direction_acc = 0.0++ return {+ "n_observations": len(actuals),+ "mae": _safe_float(mae),+ "mse": _safe_float(mse),+ "rmse": _safe_float(rmse),+ "mape_pct": _safe_float(mape),+ "smape_pct": _safe_float(smape),+ "mase": _safe_float(mase) if mase is not None else None,+ "bias": _safe_float(bias),+ "direction_accuracy_pct": _safe_float(direction_acc),+ "has_intervals": has_intervals,+ "coverage_pct": _safe_float(coverage_pct) if coverage_pct is not None else None,+ "coverage_target_pct": _safe_float(data.get("coverage_target_pct", 80.0)),+ "avg_interval_width": _safe_float(avg_width) if avg_width is not None else None,+ "interval_score": _safe_float(interval_score) if interval_score is not None else None,+ }+++def op_seasonal_naive(data):+ """+ Seasonal naive baseline: repeat the last `season_length` observations forward.-# ----------------------------------------------------------------------------# Deep Learning Forecasters-# -----------------------------------------------------------------------------def _forecast_feedforward(data):- result = forecast_feedforward(- data=data["data"],- prediction_length=data.get("prediction_length", 10),- epochs=data.get("epochs", 10)- )- return json.dumps(result)---def _forecast_deepar(data):- result = forecast_deepar(- data=data["data"],- prediction_length=data.get("prediction_length", 10),- freq=data.get("freq", "D"),- epochs=data.get("epochs", 10)- )- return json.dumps(result)---def _forecast_tft(data):- result = forecast_tft(- data=data["data"],- prediction_length=data.get("prediction_length", 10),- freq=data.get("freq", "D"),- epochs=data.get("epochs", 10)- )- return json.dumps(result)---def _forecast_wavenet(data):- result = forecast_wavenet(- data=data["data"],- prediction_length=data.get("prediction_length", 10),- freq=data.get("freq", "D"),- epochs=data.get("epochs", 10)- )- return json.dumps(result)---def _forecast_dlinear(data):- result = forecast_dlinear(- data=data["data"],- prediction_length=data.get("prediction_length", 10),- epochs=data.get("epochs", 10)- )- return json.dumps(result)---def _forecast_patchtst(data):- result = forecast_patchtst(- data=data["data"],- prediction_length=data.get("prediction_length", 10),- freq=data.get("freq", "D"),- epochs=data.get("epochs", 10)- )- return json.dumps(result)---def _forecast_tide(data):- result = forecast_tide(- data=data["data"],- prediction_length=data.get("prediction_length", 10),- freq=data.get("freq", "D"),- epochs=data.get("epochs", 10)- )- return json.dumps(result)---def _forecast_lagtst(data):- result = forecast_lagtst(- data=data["data"],- prediction_length=data.get("prediction_length", 10),- freq=data.get("freq", "D"),- epochs=data.get("epochs", 10)- )- return json.dumps(result)---def _forecast_deepnpts(data):- result = forecast_deepnpts(- data=data["data"],- prediction_length=data.get("prediction_length", 10),- freq=data.get("freq", "D"),- epochs=data.get("epochs", 10)- )- return json.dumps(result)---# ----------------------------------------------------------------------------# Baseline Predictors-# -----------------------------------------------------------------------------def _predict_seasonal_naive(data):- result = predict_seasonal_naive(- data=data["data"],- prediction_length=data.get("prediction_length", 10),- season_length=data.get("season_length", 7)- )- return json.dumps(result)---def _predict_mean(data):- result = predict_mean(- data=data["data"],- prediction_length=data.get("prediction_length", 10)- )- return json.dumps(result)---def _predict_constant(data):- result = predict_constant(- data=data["data"],- prediction_length=data.get("prediction_length", 10),- constant_value=data.get("constant_value", 0.0)- )- return json.dumps(result)---# ----------------------------------------------------------------------------# Evaluation-# -----------------------------------------------------------------------------def _evaluate(data):- result = evaluate_forecasts(- train_data=data["train_data"],- test_data=data["test_data"],- prediction_length=data.get("prediction_length", 10),- freq=data.get("freq", "D")- )- return json.dumps(result)+ Inputs:+ values : list[float] (required)+ horizon : int (default 14)+ season_length : int (default 1 = pure naive)+ """+ values = _coerce_floats(data.get("values"), "values")+ _require_min_length(values, 1, "values")+ horizon = max(1, min(_safe_int(data.get("horizon", 14)), 365))+ season = max(1, _safe_int(data.get("season_length", 1)))++ arr = np.asarray(values, dtype=float)+ if season > len(arr):+ raise ValidationError(+ f"season_length ({season}) exceeds series length ({len(arr)})")+ fc = _seasonal_naive_array(values, horizon, season)++ forecast = [{"step": i + 1, "value": _safe_float(v)} for i, v in enumerate(fc.tolist())]+ return {+ "n_observations": len(arr),+ "horizon": horizon,+ "season_length": season,+ "method": "pure naive (repeat last)" if season == 1 else f"seasonal naive (s={season})",+ "last_actual": _safe_float(float(arr[-1])),+ "first_forecast": _safe_float(float(fc[0])),+ "last_forecast": _safe_float(float(fc[-1])),+ "forecast_min": _safe_float(float(fc.min())),+ "forecast_max": _safe_float(float(fc.max())),+ "forecast_mean": _safe_float(float(fc.mean())),+ "forecast": forecast,+ }+++# ============================================================================+# DISPATCH TABLE+# ============================================================================++OPERATIONS = {+ "check_status": op_check_status,+ "probabilistic_forecast": op_probabilistic_forecast,+ "quantile_forecast": op_quantile_forecast,+ "distribution_fit": op_distribution_fit,+ "evaluate_forecast": op_evaluate_forecast,+ "seasonal_naive": op_seasonal_naive,+}+++def dispatch(operation, data):+ handler = OPERATIONS.get(operation)+ if handler is None:+ return {+ "success": False, "operation": operation,+ "error": f"Unknown operation: {operation}",+ "error_kind": "unknown_op",+ "available": list(OPERATIONS.keys()),+ }+ try:+ result = handler(data or {})+ return {"success": True, "operation": operation, "data": result}+ except ValidationError as e:+ return {"success": False, "operation": operation, "error": str(e),+ "error_kind": "validation"}+ except Exception as e:+ return {"success": False, "operation": operation, "error": str(e),+ "error_kind": "runtime", "traceback": traceback.format_exc()}+++def main(args):+ if len(args) < 1:+ print(json.dumps({+ "success": False,+ "error": "Usage: gluonts_service.py <operation> [json_data]",+ "error_kind": "usage",+ }))+ return+ operation = args[0]+ data = {}+ if len(args) > 1:+ try:+ data = json.loads(args[1])+ except json.JSONDecodeError as e:+ print(json.dumps({+ "success": False, "operation": operation,+ "error": f"Invalid JSON: {e}", "error_kind": "validation",+ }))+ return+ result = dispatch(operation, data)+ print(json.dumps(result, default=str))if __name__ == "__main__":- if len(sys.argv) > 1:- print(main(sys.argv[1:]))- else:- print("Usage: worker_handler.py <operation> <json_data>")+ main(sys.argv[1:])diff --git a/fincept-qt/scripts/Analytics/gluonts_wrapper/gluonts_service_legacy.py b/fincept-qt/scripts/Analytics/gluonts_wrapper/gluonts_service_legacy.pynew file mode 100644index 000000000..79436b712--- /dev/null+++ b/fincept-qt/scripts/Analytics/gluonts_wrapper/gluonts_service_legacy.py@@ -0,0 +1,206 @@+#!/usr/bin/env python3+"""+GluonTS Worker Handler+Covers all 13 operations: 9 deep-learning forecasters, 3 baseline predictors, 1 evaluation.+"""++import json+import sys+from pathlib import Path++sys.path.insert(0, str(Path(__file__).parent))++from forecasters import (+ forecast_feedforward, forecast_deepar, forecast_tft, forecast_wavenet,+ forecast_dlinear, forecast_patchtst, forecast_tide, forecast_lagtst, forecast_deepnpts+)+from predictors import predict_seasonal_naive, predict_mean, predict_constant+from evaluation import evaluate_forecasts+++def main(args):+ """+ Entry point: [operation, json_data]+ Returns: JSON string+ """+ try:+ if len(args) < 2:+ return json.dumps({"error": "Expected: [operation, json_data]"})++ operation = args[0]+ data = json.loads(args[1])++ dispatch = {+ # Deep learning forecasters+ "forecast_feedforward": _forecast_feedforward,+ "forecast_deepar": _forecast_deepar,+ "forecast_tft": _forecast_tft,+ "forecast_wavenet": _forecast_wavenet,+ "forecast_dlinear": _forecast_dlinear,+ "forecast_patchtst": _forecast_patchtst,+ "forecast_tide": _forecast_tide,+ "forecast_lagtst": _forecast_lagtst,+ "forecast_deepnpts": _forecast_deepnpts,+ # Baseline predictors+ "predict_seasonal_naive": _predict_seasonal_naive,+ "predict_mean": _predict_mean,+ "predict_constant": _predict_constant,+ # Evaluation+ "evaluate": _evaluate,+ }++ handler = dispatch.get(operation)+ if handler is None:+ return json.dumps({"error": f"Unknown operation: {operation}"})++ return handler(data)++ except Exception as e:+ import traceback+ return json.dumps({+ "error": f"GluonTS error: {str(e)}",+ "traceback": traceback.format_exc()+ })+++# ---------------------------------------------------------------------------+# Deep Learning Forecasters+# ---------------------------------------------------------------------------++def _forecast_feedforward(data):+ result = forecast_feedforward(+ data=data["data"],+ prediction_length=data.get("prediction_length", 10),+ epochs=data.get("epochs", 10)+ )+ return json.dumps(result)+++def _forecast_deepar(data):+ result = forecast_deepar(+ data=data["data"],+ prediction_length=data.get("prediction_length", 10),+ freq=data.get("freq", "D"),+ epochs=data.get("epochs", 10)+ )+ return json.dumps(result)+++def _forecast_tft(data):+ result = forecast_tft(+ data=data["data"],+ prediction_length=data.get("prediction_length", 10),+ freq=data.get("freq", "D"),+ epochs=data.get("epochs", 10)+ )+ return json.dumps(result)+++def _forecast_wavenet(data):+ result = forecast_wavenet(+ data=data["data"],+ prediction_length=data.get("prediction_length", 10),+ freq=data.get("freq", "D"),+ epochs=data.get("epochs", 10)+ )+ return json.dumps(result)+++def _forecast_dlinear(data):+ result = forecast_dlinear(+ data=data["data"],+ prediction_length=data.get("prediction_length", 10),+ epochs=data.get("epochs", 10)+ )+ return json.dumps(result)+++def _forecast_patchtst(data):+ result = forecast_patchtst(+ data=data["data"],+ prediction_length=data.get("prediction_length", 10),+ freq=data.get("freq", "D"),+ epochs=data.get("epochs", 10)+ )+ return json.dumps(result)+++def _forecast_tide(data):+ result = forecast_tide(+ data=data["data"],+ prediction_length=data.get("prediction_length", 10),+ freq=data.get("freq", "D"),+ epochs=data.get("epochs", 10)+ )+ return json.dumps(result)+++def _forecast_lagtst(data):+ result = forecast_lagtst(+ data=data["data"],+ prediction_length=data.get("prediction_length", 10),+ freq=data.get("freq", "D"),+ epochs=data.get("epochs", 10)+ )+ return json.dumps(result)+++def _forecast_deepnpts(data):+ result = forecast_deepnpts(+ data=data["data"],+ prediction_length=data.get("prediction_length", 10),+ freq=data.get("freq", "D"),+ epochs=data.get("epochs", 10)+ )+ return json.dumps(result)+++# ---------------------------------------------------------------------------+# Baseline Predictors+# ---------------------------------------------------------------------------++def _predict_seasonal_naive(data):+ result = predict_seasonal_naive(+ data=data["data"],+ prediction_length=data.get("prediction_length", 10),+ season_length=data.get("season_length", 7)+ )+ return json.dumps(result)+++def _predict_mean(data):+ result = predict_mean(+ data=data["data"],+ prediction_length=data.get("prediction_length", 10)+ )+ return json.dumps(result)+++def _predict_constant(data):+ result = predict_constant(+ data=data["data"],+ prediction_length=data.get("prediction_length", 10),+ constant_value=data.get("constant_value", 0.0)+ )+ return json.dumps(result)+++# ---------------------------------------------------------------------------+# Evaluation+# ---------------------------------------------------------------------------++def _evaluate(data):+ result = evaluate_forecasts(+ train_data=data["train_data"],+ test_data=data["test_data"],+ prediction_length=data.get("prediction_length", 10),+ freq=data.get("freq", "D")+ )+ return json.dumps(result)+++if __name__ == "__main__":+ if len(sys.argv) > 1:+ print(main(sys.argv[1:]))+ else:+ print("Usage: worker_handler.py <operation> <json_data>")diff --git a/fincept-qt/scripts/Analytics/gs_quant_wrapper/gs_quant_service.py b/fincept-qt/scripts/Analytics/gs_quant_wrapper/gs_quant_service.pyindex 8091f8939..d21e808f7 100644--- a/fincept-qt/scripts/Analytics/gs_quant_wrapper/gs_quant_service.py+++ b/fincept-qt/scripts/Analytics/gs_quant_wrapper/gs_quant_service.py@@ -1,14 +1,23 @@"""GS-Quant Wrapper Worker Handler================================-Dispatch router for C++ commands → Python gs_quant_wrapper operations.+Dispatch router for C++ commands -> Python gs_quant_wrapper operations.Pattern: main(args) dispatches [operation, json_data].++Response contract (all ops):+ success: bool+ operation: str+ data: dict (when success)+ error: str (when failure)+ error_kind: str | None (validation | runtime | unknown_op)+ traceback: str | None (only on uncaught exceptions)"""import sysimport osimport jsonimport traceback+import mathimport numpy as npimport pandas as pdfrom datetime import datetime@@ -20,8 +29,64 @@ if _parent_dir not in sys.path:sys.path.insert(0, _parent_dir)+# ============================================================================+# INPUT COERCION + VALIDATION+# ============================================================================++class ValidationError(ValueError):+ """Raised when an op's input doesn't pass coercion/length checks."""+ pass+++def _coerce_floats(value, field_name):+ """+ Accept list[number], tuple[number], np.ndarray, or a CSV / whitespace-separated string.+ Returns list[float]. Empty / None -> [].+ """+ if value is None:+ return []+ if isinstance(value, (list, tuple)):+ out = []+ for i, v in enumerate(value):+ try:+ out.append(float(v))+ except (TypeError, ValueError):+ raise ValidationError(+ f"{field_name}[{i}] is not numeric: {v!r}")+ return out+ if isinstance(value, np.ndarray):+ return [float(v) for v in value.tolist()]+ if isinstance(value, str):+ s = value.strip()+ if not s:+ return []+ # Accept comma-, semicolon-, whitespace-, or newline-separated+ for sep in [",", ";", "\t", "\n"]:+ s = s.replace(sep, " ")+ parts = [p for p in s.split(" ") if p.strip()]+ out = []+ for i, p in enumerate(parts):+ try:+ out.append(float(p))+ except ValueError:+ raise ValidationError(+ f"{field_name}[{i}] is not numeric: {p!r}")+ return out+ # Single scalar+ try:+ return [float(value)]+ except (TypeError, ValueError):+ raise ValidationError(f"{field_name} is not numeric: {value!r}")+++def _require_min_length(values, n, field_name):+ if len(values) < n:+ raise ValidationError(+ f"{field_name} needs at least {n} values, got {len(values)}")++def _series_from_list(values, dates=None, name="series"):- """Helper: Convert list of values (+ optional dates) to pd.Series."""+ """Helper: Convert list of values (+ optional dates) to pd.Series of floats."""if dates:idx = pd.to_datetime(dates)else:@@ -30,69 +95,56 @@ def _series_from_list(values, dates=None, name="series"):def _df_from_dict(data_dict, dates=None):- """Helper: Convert dict-of-lists to pd.DataFrame."""+ """Helper: Convert dict-of-lists to pd.DataFrame of floats, indexed by date."""if dates:idx = pd.to_datetime(dates)else:first_key = next(iter(data_dict))idx = pd.date_range("2020-01-01", periods=len(data_dict[first_key]), freq="B")- return pd.DataFrame(data_dict, index=idx)+ # Build column-by-column with positional float arrays (avoid pandas+ # auto-aligning to a default RangeIndex which would zero everything out).+ df = pd.DataFrame(index=idx)+ for k, v in data_dict.items():+ arr = np.asarray(v, dtype=float)+ if len(arr) != len(idx):+ raise ValidationError(+ f"prices[{k}] length {len(arr)} != index length {len(idx)}")+ df[k] = arr+ return df+++def _safe_float(v, default=0.0):+ """Convert a value to float, replacing NaN/inf with default."""+ try:+ f = float(v)+ except (TypeError, ValueError):+ return default+ if math.isnan(f) or math.isinf(f):+ return default+ return f+++def _safe_int(v, default=0):+ try:+ f = float(v)+ if math.isnan(f) or math.isinf(f):+ return default+ return int(f)+ except (TypeError, ValueError):+ return default# ============================================================================# OPERATION HANDLERS# ============================================================================-def op_performance_analysis(data):- """Full performance analysis: returns, risk, distribution metrics."""- from gs_quant_wrapper.timeseries_analytics import TimeseriesAnalytics, TimeseriesConfig-- prices = data.get("prices", [])- benchmark_prices = data.get("benchmark_prices", [])- risk_free_rate = data.get("risk_free_rate", 0.02)- window = data.get("window", 20)-- config = TimeseriesConfig(window=window)- ts = TimeseriesAnalytics(config)-- price_series = _series_from_list(prices, data.get("dates"))- returns = ts.calculate_returns(price_series)-- benchmark_ret = None- if benchmark_prices:- bench_series = _series_from_list(benchmark_prices, data.get("dates"))- benchmark_ret = ts.calculate_returns(bench_series)-- result = ts.full_performance_analysis(returns, benchmark_ret, risk_free_rate)- return result---def op_technical_analysis(data):- """Technical indicators summary: SMA, EMA, RSI, MACD, Bollinger Bands, ATR."""- from gs_quant_wrapper.timeseries_analytics import TimeseriesAnalytics, TimeseriesConfig-- prices = data.get("prices", [])- high = data.get("high", [])- low = data.get("low", [])- dates = data.get("dates")-- config = TimeseriesConfig(window=data.get("window", 20))- ts = TimeseriesAnalytics(config)-- price_series = _series_from_list(prices, dates)- high_series = _series_from_list(high, dates) if high else None- low_series = _series_from_list(low, dates) if low else None-- result = ts.technical_analysis_summary(price_series, high_series, low_series)- return result--def op_risk_metrics(data):"""Comprehensive risk metrics: volatility, VaR, CVaR, drawdown, ratios."""from gs_quant_wrapper import ts_risk_measures as risk- returns_list = data.get("returns", [])- risk_free_rate = data.get("risk_free_rate", 0.0)+ returns_list = _coerce_floats(data.get("returns"), "returns")+ _require_min_length(returns_list, 5, "returns")+ risk_free_rate = _safe_float(data.get("risk_free_rate", 0.0))dates = data.get("dates")ret = _series_from_list(returns_list, dates, "returns")@@ -110,464 +162,506 @@ def op_risk_metrics(data):dl = risk.drawdown_length(ret)mrp = risk.max_recovery_period(ret)- result = {- "volatility_annualized": float(vol),- "daily_risk": float(daily_r),- "annual_risk": float(annual_r),- "downside_risk": float(dside),- "max_drawdown": dd["max_drawdown"],- "max_drawdown_pct": dd["max_drawdown_pct"],- "peak_date": str(dd["peak_date"]),- "trough_date": str(dd["trough_date"]),- "recovery_date": str(dd.get("recovery_date")),- "max_drawdown_length": int(dl.max()),- "max_recovery_period": int(mrp),- "sharpe_ratio": float(sharpe),- "sortino_ratio": float(sortino_val),- "calmar_ratio": float(calmar_val),- "omega_ratio": float(omega_val),- "var_95": float(var_95),- "var_99": float(var_99),+ return {+ "n_observations": len(ret),+ "volatility_annualized": _safe_float(vol),+ "daily_risk": _safe_float(daily_r),+ "annual_risk": _safe_float(annual_r),+ "downside_risk": _safe_float(dside),+ "max_drawdown": _safe_float(dd.get("max_drawdown")),+ "max_drawdown_pct": _safe_float(dd.get("max_drawdown_pct")),+ "peak_date": str(dd.get("peak_date")) if dd.get("peak_date") is not None else None,+ "trough_date": str(dd.get("trough_date")) if dd.get("trough_date") is not None else None,+ "recovery_date": str(dd.get("recovery_date")) if dd.get("recovery_date") is not None else None,+ "max_drawdown_length": _safe_int(dl.max() if hasattr(dl, "max") else dl),+ "max_recovery_period": _safe_int(mrp),+ "sharpe_ratio": _safe_float(sharpe),+ "sortino_ratio": _safe_float(sortino_val),+ "calmar_ratio": _safe_float(calmar_val),+ "omega_ratio": _safe_float(omega_val),+ "var_95": _safe_float(var_95),+ "var_99": _safe_float(var_99),}- return resultdef op_portfolio_analytics(data):"""Portfolio analytics with benchmark comparison."""from gs_quant_wrapper import ts_portfolio_analytics as port- returns_list = data.get("returns", [])- benchmark_list = data.get("benchmark_returns", [])- risk_free_rate = data.get("risk_free_rate", 0.0)+ returns_list = _coerce_floats(data.get("returns"), "returns")+ benchmark_list = _coerce_floats(data.get("benchmark_returns"), "benchmark_returns")+ _require_min_length(returns_list, 5, "returns")+ _require_min_length(benchmark_list, 5, "benchmark_returns")+ if len(returns_list) != len(benchmark_list):+ raise ValidationError(+ f"returns ({len(returns_list)}) and benchmark_returns ({len(benchmark_list)}) "+ f"must have the same length")++ risk_free_rate = _safe_float(data.get("risk_free_rate", 0.0))dates = data.get("dates")port_ret = _series_from_list(returns_list, dates, "portfolio")bench_ret = _series_from_list(benchmark_list, dates, "benchmark")result = {- "pnl_final": float(port.portfolio_pnl(port_ret, 1.0).iloc[-1]),- "alpha": float(port.portfolio_alpha(port_ret, bench_ret, risk_free_rate)),- "annual_risk": float(port.portfolio_annual_risk(port_ret)),- "sharpe_ratio": float(port.portfolio_sharpe_ratio(port_ret, risk_free_rate)),- "sortino_ratio": float(port.portfolio_sortino_ratio(port_ret, risk_free_rate)),- "calmar_ratio": float(port.portfolio_calmar_ratio(port_ret)),- "treynor_measure": float(port.portfolio_treynor_measure(port_ret, bench_ret, risk_free_rate)),- "modigliani_ratio": float(port.portfolio_modigliani_ratio(port_ret, bench_ret, risk_free_rate)),- "max_drawdown": float(port.portfolio_max_drawdown(port_ret)),- "drawdown_length": int(port.portfolio_drawdown_length(port_ret)),- "tracking_error": float(port.portfolio_tracking_error(port_ret, bench_ret)),- "information_ratio": float(port.portfolio_information_ratio(port_ret, bench_ret)),- "hit_rate": float(port.portfolio_hit_rate(port_ret)),- "r_squared": float(port.portfolio_r_squared(port_ret, bench_ret)),- "skewness": float(port.portfolio_skewness(port_ret)),- "kurtosis": float(port.portfolio_kurtosis(port_ret)),- "jensen_alpha": float(port.portfolio_jensen_alpha(port_ret, bench_ret, risk_free_rate)),- "jensen_alpha_bull": float(port.portfolio_jensen_alpha_bull(port_ret, bench_ret, risk_free_rate)),- "jensen_alpha_bear": float(port.portfolio_jensen_alpha_bear(port_ret, bench_ret, risk_free_rate)),+ "n_observations": len(port_ret),+ "pnl_final": _safe_float(port.portfolio_pnl(port_ret, 1.0).iloc[-1]),+ "alpha": _safe_float(port.portfolio_alpha(port_ret, bench_ret, risk_free_rate)),+ "annual_risk": _safe_float(port.portfolio_annual_risk(port_ret)),+ "sharpe_ratio": _safe_float(port.portfolio_sharpe_ratio(port_ret, risk_free_rate)),+ "sortino_ratio": _safe_float(port.portfolio_sortino_ratio(port_ret, risk_free_rate)),+ "calmar_ratio": _safe_float(port.portfolio_calmar_ratio(port_ret)),+ "treynor_measure": _safe_float(port.portfolio_treynor_measure(port_ret, bench_ret, risk_free_rate)),+ "modigliani_ratio": _safe_float(port.portfolio_modigliani_ratio(port_ret, bench_ret, risk_free_rate)),+ "max_drawdown": _safe_float(port.portfolio_max_drawdown(port_ret)),+ "drawdown_length": _safe_int(port.portfolio_drawdown_length(port_ret)),+ "tracking_error": _safe_float(port.portfolio_tracking_error(port_ret, bench_ret)),+ "information_ratio": _safe_float(port.portfolio_information_ratio(port_ret, bench_ret)),+ "hit_rate": _safe_float(port.portfolio_hit_rate(port_ret)),+ "r_squared": _safe_float(port.portfolio_r_squared(port_ret, bench_ret)),+ "skewness": _safe_float(port.portfolio_skewness(port_ret)),+ "kurtosis": _safe_float(port.portfolio_kurtosis(port_ret)),+ "jensen_alpha": _safe_float(port.portfolio_jensen_alpha(port_ret, bench_ret, risk_free_rate)),+ "jensen_alpha_bull": _safe_float(port.portfolio_jensen_alpha_bull(port_ret, bench_ret, risk_free_rate)),+ "jensen_alpha_bear": _safe_float(port.portfolio_jensen_alpha_bear(port_ret, bench_ret, risk_free_rate)),}capture = port.portfolio_capture_ratio(port_ret, bench_ret)- result["up_capture"] = capture["up_capture"]- result["down_capture"] = capture["down_capture"]- result["capture_ratio"] = capture["capture_ratio"]-- return result---def op_volatility_surface(data):- """Forward volatility and variance term structure."""- from gs_quant_wrapper import ts_risk_measures as risk-- returns_list = data.get("returns", [])- tenors = data.get("tenors", [21, 63, 126, 252])- dates = data.get("dates")-- ret = _series_from_list(returns_list, dates, "returns")-- fvt = risk.forward_vol_term(ret, tenors)- fvar = risk.forward_var_term(ret, tenors)-- vol_term = []- for _, row in fvt.iterrows():- vol_term.append({- "tenor_days": int(row["tenor_days"]),- "realized_vol": float(row["realized_vol"]) if not np.isnan(row["realized_vol"]) else None,- "forward_vol": float(row["forward_vol"]) if not np.isnan(row["forward_vol"]) else None,- })-- var_term = []- for _, row in fvar.iterrows():- var_term.append({- "tenor_days": int(row["tenor_days"]),- "realized_var": float(row["realized_var"]) if not np.isnan(row["realized_var"]) else None,- "forward_var": float(row["forward_var"]) if not np.isnan(row["forward_var"]) else None,- })-- return {"vol_term_structure": vol_term, "var_term_structure": var_term}---def op_statistics(data):- """Descriptive statistics: mean, std, skew, kurtosis, percentiles, z-scores."""- from gs_quant_wrapper import ts_math_statistics as ms-- values = data.get("values", [])- dates = data.get("dates")- series = _series_from_list(values, dates, "data")-- pcts = ms.percentiles(series)-- result = {- "mean": ms.mean(series),- "median": ms.median(series),- "std": ms.std(series),- "variance": ms.var(series),- "min": ms.min_(series),- "max": ms.max_(series),- "range": ms.range_(series),- "skewness": ms.skewness(series),- "kurtosis": ms.kurtosis(series),- "count": ms.count(series),- "sum": ms.sum_(series),- "semi_variance": ms.semi_variance(series),- "realized_variance": ms.realized_var(series),- "percentiles": {str(int(k)): float(v) for k, v in pcts.items()},- }- return result---def op_correlation_analysis(data):- """Correlation, beta, R-squared between two series."""- from gs_quant_wrapper import ts_math_statistics as ms-- x_values = data.get("x", [])- y_values = data.get("y", [])- dates = data.get("dates")-- x = _series_from_list(x_values, dates, "x")- y = _series_from_list(y_values, dates, "y")-- result = {- "correlation": ms.correlation(x, y),- "covariance": ms.cov(x, y),- "beta": ms.beta(x, y),- "r_squared": ms.r_squared(x, y),- }- return result---def op_backtest(data):- """Run a backtest strategy: buy-and-hold, momentum, mean-reversion, rebalancing."""- from gs_quant_wrapper.backtest_analytics import BacktestEngine, BacktestConfig-- prices_dict = data.get("prices", {})- strategy = data.get("strategy", "buy_and_hold")- initial_capital = data.get("initial_capital", 100000)- commission = data.get("commission", 0.001)- lookback = data.get("lookback", 20)- rebalance_freq = data.get("rebalance_freq", 20)- dates = data.get("dates")-- config = BacktestConfig(- initial_capital=initial_capital,- commission=commission,- )- engine = BacktestEngine(config)-- # prices can be a dict of ticker->list or a single list- if isinstance(prices_dict, dict):- df = _df_from_dict(prices_dict, dates)- else:- df = pd.DataFrame({"asset": prices_dict}, index=pd.date_range("2020-01-01", periods=len(prices_dict), freq="B"))-- if strategy == "buy_and_hold":- ticker = data.get("ticker", df.columns[0])- prices_series = df[ticker] if ticker in df.columns else df.iloc[:, 0]- result = engine.backtest_buy_and_hold(prices_series)- elif strategy == "momentum":- ticker = data.get("ticker", df.columns[0])- prices_series = df[ticker] if ticker in df.columns else df.iloc[:, 0]- result = engine.backtest_momentum(prices_series, lookback=lookback)- elif strategy == "mean_reversion":- ticker = data.get("ticker", df.columns[0])- prices_series = df[ticker] if ticker in df.columns else df.iloc[:, 0]- result = engine.backtest_mean_reversion(prices_series, lookback=lookback)- elif strategy == "rebalancing":- weights = data.get("weights", {col: 1.0 / len(df.columns) for col in df.columns})- result = engine.backtest_rebalancing(df, weights, rebalance_freq=rebalance_freq)- else:- result = engine.backtest_buy_and_hold(df.iloc[:, 0])-- # Serialize- serializable = {}- for k, v in result.items():- if isinstance(v, pd.Series):- serializable[k] = {str(d): float(val) for d, val in v.items()}- elif isinstance(v, pd.DataFrame):- serializable[k] = {col: {str(d): float(val) for d, val in v[col].items()} for col in v.columns}- elif isinstance(v, (np.floating, np.integer)):- serializable[k] = float(v)- elif isinstance(v, dict):- serializable[k] = {str(kk): float(vv) if isinstance(vv, (float, int, np.floating, np.integer)) else str(vv) for kk, vv in v.items()}- else:- serializable[k] = v-- return serializable---def op_basket_backtest(data):- """Basket/composite portfolio backtest."""- from gs_quant_wrapper import ts_portfolio_analytics as port-- components_dict = data.get("components", {})- weights = data.get("weights")- initial_value = data.get("initial_value", 100.0)- rebalance = data.get("rebalance", "daily")- dates = data.get("dates")-- components_df = _df_from_dict(components_dict, dates)-- bt = port.backtest_basket(components_df, weights, initial_value, rebalance)-- result = {- "final_value": float(bt["basket_value"].iloc[-1]),- "total_return": float((bt["basket_value"].iloc[-1] / initial_value) - 1),- "max_drawdown": float(bt["drawdown"].min()),- "basket_values": {str(d): float(v) for d, v in bt["basket_value"].items()},- "drawdown_series": {str(d): float(v) for d, v in bt["drawdown"].items()},- }- return result---def op_datetime_utils(data):- """Date/time utilities: business days, day count fractions, date ranges."""- from gs_quant_wrapper.datetime_utils import DateTimeUtils-- dt = DateTimeUtils()- operation = data.get("sub_operation", "business_days")-- if operation == "business_days":- start = data.get("start_date", "2024-01-01")- end = data.get("end_date", "2024-12-31")- result = {"business_days": dt.count_business_days(start, end)}- elif operation == "day_count_fraction":- start = data.get("start_date", "2024-01-01")- end = data.get("end_date", "2024-12-31")- convention = data.get("convention", "ACT/365")- result = {"day_count_fraction": dt.calculate_day_count_fraction(start, end, convention)}- elif operation == "add_business_days":- date_str = data.get("date", "2024-01-01")- n = data.get("days", 10)- new_date = dt.add_business_days(date_str, n)- result = {"result_date": str(new_date)}- elif operation == "date_range":- start = data.get("start_date", "2024-01-01")- end = data.get("end_date", "2024-12-31")- rng = dt.generate_date_range(start, end)- result = {"dates": [str(d.date()) for d in rng], "count": len(rng)}- elif operation == "analyze":- start = data.get("start_date", "2024-01-01")- end = data.get("end_date", "2024-12-31")- result = dt.analyze_date_range(start, end)- else:- result = {"error": f"Unknown sub_operation: {operation}"}+ result["up_capture"] = _safe_float(capture.get("up_capture"))+ result["down_capture"] = _safe_float(capture.get("down_capture"))+ result["capture_ratio"] = _safe_float(capture.get("capture_ratio"))return resultdef op_greeks(data):- """Calculate Greeks for a derivative instrument."""+ """Calculate Greeks for an option (Black-Scholes)."""from gs_quant_wrapper.risk_analytics import RiskAnalytics, RiskConfig- risk = RiskAnalytics(RiskConfig())-- spot = data.get("spot", 100)- strike = data.get("strike", 100)- expiry = data.get("expiry", 0.25)- rate = data.get("rate", 0.05)- vol = data.get("vol", 0.2)- option_type = data.get("option_type", "call")+ spot = _safe_float(data.get("spot", 100.0))+ strike = _safe_float(data.get("strike", 100.0))+ expiry = _safe_float(data.get("expiry", 0.25))+ rate = _safe_float(data.get("rate", 0.05))+ vol = _safe_float(data.get("vol", 0.2))+ option_type = str(data.get("option_type", "call")).lower()++ if spot <= 0:+ raise ValidationError(f"spot must be > 0, got {spot}")+ if strike <= 0:+ raise ValidationError(f"strike must be > 0, got {strike}")+ if expiry <= 0:+ raise ValidationError(f"expiry must be > 0 (in years), got {expiry}")+ if vol <= 0:+ raise ValidationError(f"vol must be > 0, got {vol}")+ if option_type not in ("call", "put"):+ raise ValidationError(f"option_type must be 'call' or 'put', got {option_type!r}")- greeks = risk.calculate_all_greeks(spot, strike, expiry, rate, vol, option_type)- return greeks.__dict__ if hasattr(greeks, "__dict__") else greeks+ risk = RiskAnalytics(RiskConfig())+ # SIGNATURE: calculate_all_greeks(option_type, spot, strike, time_to_expiry, volatility, risk_free_rate)+ greeks = risk.calculate_all_greeks(option_type, spot, strike, expiry, vol, rate)++ raw = greeks.__dict__ if hasattr(greeks, "__dict__") else dict(greeks)+ return {+ "spot": spot,+ "strike": strike,+ "expiry_years": expiry,+ "rate": rate,+ "vol": vol,+ "option_type": option_type,+ "moneyness": _safe_float(spot / strike),+ "greeks": {k: _safe_float(v) for k, v in raw.items()},+ }def op_var_analysis(data):- """Value at Risk analysis: parametric, historical, Monte Carlo, CVaR."""+ """Value at Risk: parametric, historical, Monte Carlo, CVaR."""from gs_quant_wrapper.risk_analytics import RiskAnalytics, RiskConfig- returns_list = data.get("returns", [])- confidence = data.get("confidence", 0.95)- position_value = data.get("position_value", 1000000)+ returns_list = _coerce_floats(data.get("returns"), "returns")+ _require_min_length(returns_list, 30, "returns")+ confidence = _safe_float(data.get("confidence", 0.95))+ if not (0.0 < confidence < 1.0):+ raise ValidationError(f"confidence must be in (0, 1), got {confidence}")+ position_value = _safe_float(data.get("position_value", 1_000_000.0))+ if position_value <= 0:+ raise ValidationError(f"position_value must be > 0, got {position_value}")dates = data.get("dates")ret = _series_from_list(returns_list, dates, "returns")risk = RiskAnalytics(RiskConfig())- parametric = risk.calculate_parametric_var(ret, confidence)- historical = risk.calculate_historical_var(ret, confidence)- mc = risk.calculate_monte_carlo_var(ret, confidence)- cvar = risk.calculate_cvar(ret, confidence)+ # Real signatures (verified via inspect):+ # calculate_parametric_var(portfolio_value, returns, confidence_level)+ # calculate_historical_var(portfolio_value, returns, confidence_level)+ # calculate_monte_carlo_var(portfolio_value, mean_return, std_return, confidence_level)+ # calculate_cvar(portfolio_value, returns, confidence_level)+ parametric = risk.calculate_parametric_var(position_value, ret, confidence)+ historical = risk.calculate_historical_var(position_value, ret, confidence)+ mc = risk.calculate_monte_carlo_var(position_value, float(ret.mean()),+ float(ret.std()), confidence)+ cvar = risk.calculate_cvar(position_value, ret, confidence)def _var_to_dict(v):- if isinstance(v, dict):- return {k: float(val) if isinstance(val, (float, int, np.floating, np.integer)) else str(val) for k, val in v.items()}- if hasattr(v, "__dict__"):- return {k: float(val) if isinstance(val, (float, int, np.floating, np.integer)) else str(val) for k, val in v.__dict__.items()}- return {"value": float(v)}-- result = {+ raw = v.__dict__ if hasattr(v, "__dict__") else (+ v if isinstance(v, dict) else {"value": v})+ out = {}+ for k, val in raw.items():+ if isinstance(val, (int, float, np.floating, np.integer)):+ out[k] = _safe_float(val)+ else:+ out[k] = str(val)+ return out++ return {+ "n_observations": len(ret),+ "position_value": position_value,+ "confidence": confidence,"parametric_var": _var_to_dict(parametric),"historical_var": _var_to_dict(historical),"monte_carlo_var": _var_to_dict(mc),"cvar": _var_to_dict(cvar),- "position_value": position_value,- "confidence": confidence,}- return resultdef op_stress_test(data):- """Stress testing with standard market scenarios."""+ """Standard market stress scenarios applied to a single position."""from gs_quant_wrapper.risk_analytics import RiskAnalytics, RiskConfig- returns_list = data.get("returns", [])- position_value = data.get("position_value", 1000000)- dates = data.get("dates")+ position_value = _safe_float(data.get("position_value", 1_000_000.0))+ if position_value <= 0:+ raise ValidationError(f"position_value must be > 0, got {position_value}")++ # run_all_standard_scenarios classifies positions by substring on the asset+ # name ('equity', 'bond', 'fx', 'credit', 'commodity', 'vol'/'option') and+ # applies canned shocks (2008, COVID, etc.) to notional. We accept either:+ # - explicit `positions` dict (asset_name -> notional), or+ # - a `mix` dict of weights to split position_value across asset classes+ # (default: balanced 60% equity / 30% bond / 10% commodity).+ positions = data.get("positions")+ if positions:+ positions = {str(k): _safe_float(v) for k, v in positions.items()}+ else:+ mix = data.get("mix") or {"equity": 0.60, "bond": 0.30, "commodity": 0.10}+ # Normalize weights to sum to 1+ total_w = sum(_safe_float(v) for v in mix.values()) or 1.0+ positions = {str(k): position_value * (_safe_float(v) / total_w) for k, v in mix.items()}- ret = _series_from_list(returns_list, dates, "returns")risk_analytics = RiskAnalytics(RiskConfig())-- scenarios = risk_analytics.run_all_standard_scenarios(ret, position_value)-- # Serialize scenario results- serializable = {}- for name, scenario in scenarios.items():- if isinstance(scenario, dict):- s = {}- for k, v in scenario.items():- if isinstance(v, (float, int, np.floating, np.integer)):- s[k] = float(v)- elif isinstance(v, pd.Series):- s[k] = float(v.iloc[-1]) if len(v) > 0 else 0+ scenarios = risk_analytics.run_all_standard_scenarios(position_value, positions)++ serialized = []+ if isinstance(scenarios, list):+ for sc in scenarios:+ if not isinstance(sc, dict):+ serialized.append({"scenario": str(sc)})+ continue+ row = {}+ for k, v in sc.items():+ if isinstance(v, (int, float, np.floating, np.integer)):+ row[k] = _safe_float(v)+ elif isinstance(v, dict):+ row[k] = {kk: _safe_float(vv) if isinstance(vv, (int, float, np.floating, np.integer)) else str(vv)+ for kk, vv in v.items()}else:- s[k] = str(v)- serializable[name] = s- else:- serializable[name] = str(scenario)-- return serializable---def op_instrument_create(data):- """Create and summarize a financial instrument."""- from gs_quant_wrapper.instrument_wrapper import InstrumentFactory-- factory = InstrumentFactory()- instrument_type = data.get("instrument_type", "equity")-- creators = {- "equity": lambda: factory.create_equity(data.get("ticker", "AAPL"), data.get("exchange", "NYSE")),- "etf": lambda: factory.create_etf(data.get("ticker", "SPY"), data.get("exchange", "NYSE")),- "bond": lambda: factory.create_bond(- data.get("issuer", "US TREASURY"),- data.get("coupon", 0.05),- data.get("maturity_years", 10),- ),- "option": lambda: factory.create_equity_option(- data.get("underlier", "AAPL"),- data.get("strike", 150),- data.get("expiry", "2025-06-20"),- data.get("option_type", "call"),- ),- "swap": lambda: factory.create_interest_rate_swap(- data.get("notional", 1000000),- data.get("fixed_rate", 0.03),- data.get("tenor", "5y"),- ),- "fx_spot": lambda: factory.create_fx_spot(- data.get("pair", "EUR/USD"),- ),- "cds": lambda: factory.create_cds(- data.get("reference_entity", "AAPL"),- data.get("notional", 10000000),- ),- "future": lambda: factory.create_equity_future(- data.get("underlier", "SPX"),- data.get("expiry", "2025-03-21"),- ),+ row[k] = str(v)+ serialized.append(row)+ elif isinstance(scenarios, dict):+ # Older shape: {scenario_name: {fields...}} -- normalize to list+ for name, sc in scenarios.items():+ row = {"scenario": name}+ if isinstance(sc, dict):+ for k, v in sc.items():+ if isinstance(v, (int, float, np.floating, np.integer)):+ row[k] = _safe_float(v)+ else:+ row[k] = str(v)+ else:+ row["value"] = str(sc)+ serialized.append(row)++ return {+ "position_value": position_value,+ "n_scenarios": len(serialized),+ "scenarios": serialized,+ "positions": positions,}- creator = creators.get(instrument_type)- if creator:- instrument = creator()- summary = factory.get_instrument_summary(instrument)- if isinstance(summary, dict):- return summary- return {"instrument": str(summary)}- else:- return {"error": f"Unknown instrument type: {instrument_type}"}+def _bt_buy_and_hold(prices, capital, commission):+ """Buy on day 0, hold to end. Returns (portfolio_series, trades_count)."""+ px = prices.iloc[:, 0] # use first column+ initial_price = float(px.iloc[0])+ fee = capital * commission+ invested = capital - fee+ shares = invested / initial_price+ series = (shares * px).rename("portfolio_value")+ return series, 1+++def _bt_momentum(prices, capital, commission, lookback):+ """Long top performer in trailing window, equal-weight if multiple. Daily rebalance."""+ px = prices.copy()+ n = len(px)+ cash = capital+ shares = {c: 0.0 for c in px.columns}+ values = []+ trades = 0+ for i in range(n):+ date = px.index[i]+ # Mark-to-market current value+ mv = sum(shares[c] * px.iloc[i][c] for c in px.columns)+ values.append((date, cash + mv))+ if i < lookback:+ continue+ # Compute trailing returns; pick top+ window = px.iloc[i - lookback:i]+ rets = (window.iloc[-1] / window.iloc[0] - 1.0).dropna()+ if rets.empty:+ continue+ winner = rets.idxmax()+ if rets[winner] <= 0:+ continue+ # Liquidate everything, buy winner+ for c in px.columns:+ if shares[c] > 0:+ cash += shares[c] * px.iloc[i][c] * (1 - commission)+ shares[c] = 0+ trades += 1+ target_cash = cash * (1 - commission)+ shares[winner] = target_cash / px.iloc[i][winner]+ cash = 0.0+ trades += 1+ return pd.Series(dict(values), name="portfolio_value"), trades+++def _bt_mean_reversion(prices, capital, commission, window):+ """Buy first ticker when it dips below MA-1*std, sell when above MA+1*std."""+ px = prices.iloc[:, 0]+ ma = px.rolling(window).mean()+ sd = px.rolling(window).std()+ cash = capital+ shares = 0.0+ values = []+ trades = 0+ for i in range(len(px)):+ date = px.index[i]+ price = float(px.iloc[i])+ if i >= window and not math.isnan(ma.iloc[i]):+ lower = ma.iloc[i] - sd.iloc[i]+ upper = ma.iloc[i] + sd.iloc[i]+ if shares == 0 and price < lower and cash > 0:+ spend = cash * (1 - commission)+ shares = spend / price+ cash = 0.0+ trades += 1+ elif shares > 0 and price > upper:+ cash = shares * price * (1 - commission)+ shares = 0.0+ trades += 1+ values.append((date, cash + shares * price))+ return pd.Series(dict(values), name="portfolio_value"), trades+++def _bt_rebalancing(prices, capital, commission, weights, freq_days=21):+ """Hold target weights, rebalance every freq_days."""+ cols = list(prices.columns)+ w = {c: float(weights.get(c, 0.0)) for c in cols}+ total = sum(w.values()) or 1.0+ w = {c: v / total for c, v in w.items()}+ cash = capital+ shares = {c: 0.0 for c in cols}+ values = []+ trades = 0+ for i in range(len(prices)):+ date = prices.index[i]+ row = prices.iloc[i]+ if i % freq_days == 0:+ # Liquidate to cash+ mv = sum(shares[c] * row[c] for c in cols)+ cash += mv * (1 - commission)+ shares = {c: 0.0 for c in cols}+ # Buy targets+ for c in cols:+ if w[c] > 0 and not math.isnan(row[c]) and row[c] > 0:+ spend = cash * w[c] * (1 - commission)+ shares[c] = spend / float(row[c])+ trades += 1+ cash -= sum(shares[c] * row[c] for c in cols)+ mv = sum(shares[c] * row[c] for c in cols)+ values.append((date, cash + mv))+ return pd.Series(dict(values), name="portfolio_value"), trades+++def _curve_metrics(curve, initial_capital):+ """Compute summary metrics from an equity curve series."""+ if len(curve) < 2:+ return {}+ final_value = float(curve.iloc[-1])+ total_return = final_value / initial_capital - 1.0+ daily_rets = curve.pct_change(fill_method=None).dropna()+ n_days = len(curve)+ years = max(n_days / 252.0, 1e-6)+ annualized_return = (1.0 + total_return) ** (1.0 / years) - 1.0 if final_value > 0 else -1.0+ vol = float(daily_rets.std() * math.sqrt(252)) if len(daily_rets) > 1 else 0.0+ sharpe = float(daily_rets.mean() / daily_rets.std() * math.sqrt(252)) if daily_rets.std() > 0 else 0.0+ # Drawdown+ peak = curve.cummax()+ dd = (curve - peak) / peak+ max_dd = float(dd.min())+ # Best / worst day+ best = float(daily_rets.max()) if len(daily_rets) else 0.0+ worst = float(daily_rets.min()) if len(daily_rets) else 0.0+ win_rate = float((daily_rets > 0).mean() * 100) if len(daily_rets) else 0.0+ return {+ "final_value": _safe_float(final_value),+ "total_return": _safe_float(total_return),+ "annualized_return": _safe_float(annualized_return),+ "volatility": _safe_float(vol),+ "sharpe_ratio": _safe_float(sharpe),+ "max_drawdown": _safe_float(max_dd),+ "best_day": _safe_float(best),+ "worst_day": _safe_float(worst),+ "win_rate_pct": _safe_float(win_rate),+ "n_days": int(n_days),+ }-def op_comprehensive_risk_report(data):- """Full risk report combining Greeks, VaR, scenarios."""- from gs_quant_wrapper.risk_analytics import RiskAnalytics, RiskConfig- returns_list = data.get("returns", [])- position_value = data.get("position_value", 1000000)- confidence = data.get("confidence", 0.95)+def op_backtest(data):+ """Run a simple strategy backtest on price history."""+ strategy = str(data.get("strategy", "buy_and_hold")).lower()+ # Normalize C++ aliases to canonical names+ aliases = {"buy_hold": "buy_and_hold", "buy-and-hold": "buy_and_hold",+ "meanreversion": "mean_reversion", "mean-reversion": "mean_reversion"}+ strategy = aliases.get(strategy, strategy)++ initial_capital = _safe_float(data.get("initial_capital", 100_000.0))+ if initial_capital <= 0:+ raise ValidationError(f"initial_capital must be > 0, got {initial_capital}")+ commission = _safe_float(data.get("commission", 0.001))+ lookback = _safe_int(data.get("lookback", 20))+ rebalance_freq = data.get("rebalance_freq", "monthly")dates = data.get("dates")- ret = _series_from_list(returns_list, dates, "returns")- risk_analytics = RiskAnalytics(RiskConfig())+ # ── Build the price DataFrame ────────────────────────────────────────────+ prices_input = data.get("prices")+ ticker = str(data.get("ticker", "")).strip().upper()++ if isinstance(prices_input, dict) and prices_input:+ # Already a dict of ticker -> list[float]+ cleaned = {k: _coerce_floats(v, f"prices[{k}]") for k, v in prices_input.items()}+ df = _df_from_dict(cleaned, dates)+ elif isinstance(prices_input, (list, tuple)) and prices_input:+ prices_list = _coerce_floats(prices_input, "prices")+ col = ticker or "ASSET"+ df = pd.DataFrame({col: prices_list},+ index=pd.date_range("2020-01-01", periods=len(prices_list), freq="B"))+ elif ticker:+ # Fetch from yfinance as a convenience for the UI+ try:+ import yfinance as yf+ except ImportError:+ raise ValidationError(+ "ticker provided but neither 'prices' supplied nor yfinance available")+ period = str(data.get("period", "2y"))+ hist = yf.Ticker(ticker).history(period=period, auto_adjust=True)+ if hist.empty or "Close" not in hist.columns:+ raise ValidationError(+ f"yfinance returned no price history for ticker {ticker!r} (period={period})")+ df = pd.DataFrame({ticker: hist["Close"].astype(float).values},+ index=hist.index.tz_localize(None) if hist.index.tz is not None else hist.index)+ else:+ raise ValidationError(+ "backtest needs either 'prices' (list or dict) or a 'ticker' to fetch")- report = risk_analytics.comprehensive_risk_report(ret, position_value, confidence)-- # Serialize- def _serialize(obj):- if isinstance(obj, dict):- return {k: _serialize(v) for k, v in obj.items()}- elif isinstance(obj, (list, tuple)):- return [_serialize(v) for v in obj]- elif isinstance(obj, pd.Series):- return {str(d): float(v) for d, v in obj.head(50).items()}- elif isinstance(obj, pd.DataFrame):- return {col: {str(d): float(v) for d, v in obj[col].head(50).items()} for col in obj.columns}- elif isinstance(obj, (np.floating, np.integer)):- return float(obj)- elif isinstance(obj, np.ndarray):- return obj.tolist()- elif hasattr(obj, "__dict__"):- return _serialize(obj.__dict__)- elif isinstance(obj, (datetime,)):- return str(obj)- else:- return obj-- return _serialize(report)---def op_historical_simulation(data):- """Historical simulation for PnL estimation."""- from gs_quant_wrapper import ts_portfolio_analytics as port+ if len(df) < max(lookback + 5, 30):+ raise ValidationError(+ f"need at least {max(lookback + 5, 30)} price observations, got {len(df)}")++ # Pick the active ticker for single-asset strategies+ if ticker and ticker in df.columns:+ single_df = df[[ticker]]+ else:+ single_df = df.iloc[:, [0]]+ ticker = single_df.columns[0]++ if strategy == "buy_and_hold":+ curve, trades_count = _bt_buy_and_hold(single_df, initial_capital, commission)+ active = [ticker]+ elif strategy == "momentum":+ curve, trades_count = _bt_momentum(df, initial_capital, commission, lookback)+ active = list(df.columns)+ elif strategy == "mean_reversion":+ curve, trades_count = _bt_mean_reversion(single_df, initial_capital, commission, lookback)+ active = [ticker]+ elif strategy == "rebalancing":+ weights = data.get("weights")+ if not weights:+ n = len(df.columns)+ weights = {col: 1.0 / n for col in df.columns}+ rebal_days = _safe_int(data.get("rebalance_days", 21))+ curve, trades_count = _bt_rebalancing(df, initial_capital, commission, weights, rebal_days)+ active = list(df.columns)+ else:+ raise ValidationError(+ f"unknown strategy {strategy!r}; expected one of: "+ "buy_and_hold, momentum, mean_reversion, rebalancing")++ # Sample curve to ~250 points for the wire+ step = max(1, len(curve) // 250)+ equity_curve = [+ {"date": str(d)[:10], "value": _safe_float(v)}+ for i, (d, v) in enumerate(curve.items()) if i % step == 0+ ]+ # Always include the very last point+ if equity_curve and equity_curve[-1]["date"] != str(curve.index[-1])[:10]:+ equity_curve.append({"date": str(curve.index[-1])[:10],+ "value": _safe_float(curve.iloc[-1])})++ metrics = _curve_metrics(curve, initial_capital)+ metrics["initial_capital"] = _safe_float(initial_capital)+ metrics["num_trades"] = int(trades_count)++ return {+ "strategy": strategy,+ "ticker": ticker,+ "tickers": active,+ "initial_capital": initial_capital,+ "n_observations": int(len(df)),+ "start_date": str(df.index[0])[:10],+ "end_date": str(df.index[-1])[:10],+ "metrics": metrics,+ "equity_curve": equity_curve,+ }- returns_list = data.get("returns", [])- position_value = data.get("position_value", 1000000)- scenarios = data.get("scenarios")++def op_statistics(data):+ """Descriptive statistics of a single series."""+ from gs_quant_wrapper import ts_math_statistics as ms++ values = _coerce_floats(data.get("values"), "values")+ _require_min_length(values, 2, "values")dates = data.get("dates")+ series = _series_from_list(values, dates, "data")- ret = _series_from_list(returns_list, dates, "returns")- sim = port.historical_simulation_estimated_pnl(ret, position_value, scenarios)+ pcts = ms.percentiles(series)- result = {- "scenarios_count": len(sim),- "var_5_pnl": float(sim[sim["percentile"] <= 5]["pnl"].iloc[-1]) if len(sim[sim["percentile"] <= 5]) > 0 else 0,- "var_1_pnl": float(sim[sim["percentile"] <= 1]["pnl"].iloc[-1]) if len(sim[sim["percentile"] <= 1]) > 0 else 0,- "median_pnl": float(sim[sim["percentile"].between(49, 51)]["pnl"].mean()) if len(sim[sim["percentile"].between(49, 51)]) > 0 else 0,- "best_pnl": float(sim["pnl"].max()),- "worst_pnl": float(sim["pnl"].min()),- "pnl_distribution": sim[["percentile", "pnl"]].to_dict(orient="records"),+ return {+ "n_observations": len(series),+ "mean": _safe_float(ms.mean(series)),+ "median": _safe_float(ms.median(series)),+ "std": _safe_float(ms.std(series)),+ "variance": _safe_float(ms.var(series)),+ "min": _safe_float(ms.min_(series)),+ "max": _safe_float(ms.max_(series)),+ "range": _safe_float(ms.range_(series)),+ "skewness": _safe_float(ms.skewness(series)),+ "kurtosis": _safe_float(ms.kurtosis(series)),+ "count": _safe_int(ms.count(series)),+ "sum": _safe_float(ms.sum_(series)),+ "semi_variance": _safe_float(ms.semi_variance(series)),+ "realized_variance": _safe_float(ms.realized_var(series)),+ "percentiles": {str(_safe_int(k)): _safe_float(v) for k, v in pcts.items()},}- return result# ============================================================================@@ -575,54 +669,75 @@ def op_historical_simulation(data):# ============================================================================OPERATIONS = {- "performance_analysis": op_performance_analysis,- "technical_analysis": op_technical_analysis,"risk_metrics": op_risk_metrics,"portfolio_analytics": op_portfolio_analytics,- "volatility_surface": op_volatility_surface,- "statistics": op_statistics,- "correlation_analysis": op_correlation_analysis,- "backtest": op_backtest,- "basket_backtest": op_basket_backtest,- "datetime_utils": op_datetime_utils,"greeks": op_greeks,"var_analysis": op_var_analysis,"stress_test": op_stress_test,- "instrument_create": op_instrument_create,- "comprehensive_risk_report": op_comprehensive_risk_report,- "historical_simulation": op_historical_simulation,+ "backtest": op_backtest,+ "statistics": op_statistics,}def dispatch(operation, data):- """Dispatch to operation handler."""+ """Dispatch to operation handler. Always returns a dict with a `success` key."""handler = OPERATIONS.get(operation)if handler is None:- return {"error": f"Unknown operation: {operation}", "available": list(OPERATIONS.keys())}- return handler(data)+ return {+ "success": False,+ "operation": operation,+ "error": f"Unknown operation: {operation}",+ "error_kind": "unknown_op",+ "available": list(OPERATIONS.keys()),+ }+ try:+ result = handler(data or {})+ return {+ "success": True,+ "operation": operation,+ "data": result,+ }+ except ValidationError as e:+ return {+ "success": False,+ "operation": operation,+ "error": str(e),+ "error_kind": "validation",+ }+ except Exception as e:+ return {+ "success": False,+ "operation": operation,+ "error": str(e),+ "error_kind": "runtime",+ "traceback": traceback.format_exc(),+ }def main(args):"""Entry point: args = [operation, json_data]"""if len(args) < 2:- result = {"error": "Usage: worker_handler.py <operation> <json_data>"}- print(json.dumps(result))+ print(json.dumps({+ "success": False,+ "error": "Usage: gs_quant_service.py <operation> <json_data>",+ "error_kind": "usage",+ }))returnoperation = args[0]try:data = json.loads(args[1])except json.JSONDecodeError as e:- result = {"error": f"Invalid JSON: {e}"}- print(json.dumps(result))+ print(json.dumps({+ "success": False,+ "operation": operation,+ "error": f"Invalid JSON input: {e}",+ "error_kind": "validation",+ }))return- try:- result = dispatch(operation, data)- print(json.dumps(result, default=str))- except Exception as e:- result = {"error": str(e), "traceback": traceback.format_exc()}- print(json.dumps(result, default=str))+ result = dispatch(operation, data)+ print(json.dumps(result, default=str))if __name__ == "__main__":diff --git a/fincept-qt/scripts/Analytics/quant/__init__.py b/fincept-qt/scripts/Analytics/quant/__init__.pyindex 4abb7e021..544788b95 100644--- a/fincept-qt/scripts/Analytics/quant/__init__.py+++ b/fincept-qt/scripts/Analytics/quant/__init__.py@@ -2,7 +2,7 @@Quantitative Analytics Module============================-CFA-level quantitative analysis for financial modeling and analysis.+Quantitative analysis for financial modeling and analysis.Modules:- base_calculator: Base class for all quantitative calculatorsdiff --git a/fincept-qt/scripts/Analytics/quant_analytics_cli.py b/fincept-qt/scripts/Analytics/quant_analytics_cli.pyindex 26034f8a0..279647f80 100644--- a/fincept-qt/scripts/Analytics/quant_analytics_cli.py+++ b/fincept-qt/scripts/Analytics/quant_analytics_cli.py@@ -1,6 +1,6 @@"""-CFA Quant Analytics CLI - Unified Command Line Interface-Provides a unified entry point for CFA-level quantitative analytics in Fincept Terminal.+Quant Analytics CLI - Unified Command Line Interface+Provides a unified entry point for quantitative analytics in Fincept Terminal.Categories:- Time Series: Trend analysis, stationarity tests, ARIMA, forecastingdiff --git a/fincept-qt/scripts/Analytics/statsmodels_wrapper/statsmodels_service.py b/fincept-qt/scripts/Analytics/statsmodels_wrapper/statsmodels_service.pynew file mode 100644index 000000000..2a9530c8b--- /dev/null+++ b/fincept-qt/scripts/Analytics/statsmodels_wrapper/statsmodels_service.py@@ -0,0 +1,629 @@+"""+Statsmodels Service (econometrics backend)+===========================================+Self-contained econometric service for the Fincept Terminal "Statsmodels"+sub-tab. Same response contract as gs_quant_service / functime_service.++Response contract (all ops):+ success: bool+ operation: str+ data: dict (when success)+ error: str (when failure)+ error_kind: str | None (validation | runtime | unknown_op)+ traceback: str | None (only on uncaught exceptions)+"""++import sys+import os+import json+import math+import traceback+import warnings+from typing import Dict, List, Any++import numpy as np+import pandas as pd++# Fail loudly only on truly missing essentials.+try:+ import statsmodels.api as sm+ from statsmodels.tsa.arima.model import ARIMA+ from statsmodels.tsa.stattools import adfuller, kpss, acf, pacf, grangercausalitytests+ from statsmodels.stats.stattools import durbin_watson, jarque_bera as jb_test+ from statsmodels.stats.diagnostic import het_breuschpagan+ STATSMODELS_OK = True+except ImportError:+ STATSMODELS_OK = False++try:+ from scipy import stats as scstats+ SCIPY_OK = True+except ImportError:+ SCIPY_OK = False++# Suppress statsmodels' chatty warnings — they're for advanced users, not the UI.+warnings.filterwarnings("ignore", category=UserWarning)+warnings.filterwarnings("ignore", category=FutureWarning)+++# ============================================================================+# INPUT COERCION + VALIDATION+# ============================================================================++class ValidationError(ValueError):+ """Raised when an op's input doesn't pass coercion/length checks."""+ pass+++def _coerce_floats(value, field_name):+ """Accept list[number], ndarray, or CSV/whitespace string. Returns list[float]."""+ if value is None:+ return []+ if isinstance(value, (list, tuple)):+ out = []+ for i, v in enumerate(value):+ try:+ out.append(float(v))+ except (TypeError, ValueError):+ raise ValidationError(f"{field_name}[{i}] is not numeric: {v!r}")+ return out+ if isinstance(value, np.ndarray):+ return [float(v) for v in value.tolist()]+ if isinstance(value, str):+ s = value.strip()+ if not s:+ return []+ for sep in [",", ";", "\t", "\n"]:+ s = s.replace(sep, " ")+ parts = [p for p in s.split(" ") if p.strip()]+ out = []+ for i, p in enumerate(parts):+ try:+ out.append(float(p))+ except ValueError:+ raise ValidationError(f"{field_name}[{i}] is not numeric: {p!r}")+ return out+ try:+ return [float(value)]+ except (TypeError, ValueError):+ raise ValidationError(f"{field_name} is not numeric: {value!r}")+++def _require_min_length(values, n, field_name):+ if len(values) < n:+ raise ValidationError(+ f"{field_name} needs at least {n} values, got {len(values)}")+++def _safe_float(v, default=0.0):+ try:+ f = float(v)+ except (TypeError, ValueError):+ return default+ if math.isnan(f) or math.isinf(f):+ return default+ return f+++def _safe_int(v, default=0):+ try:+ f = float(v)+ if math.isnan(f) or math.isinf(f):+ return default+ return int(f)+ except (TypeError, ValueError):+ return default+++def _require_statsmodels():+ if not STATSMODELS_OK:+ raise ValidationError("statsmodels is not installed in the venv")+++# ============================================================================+# OPERATION HANDLERS+# ============================================================================++def op_check_status(_data):+ return {+ "statsmodels": STATSMODELS_OK,+ "scipy": SCIPY_OK,+ "backend": "statsmodels + scipy",+ "ops_available": list(OPERATIONS.keys()),+ }+++def op_ols(data):+ """+ OLS regression with full diagnostic suite.+ Inputs:+ y : list[float] (dependent, required, >= 10)+ x : list[float] | list[list[float]] (regressors; if 1-D treated as a single column)+ add_constant: bool (default True)+ """+ _require_statsmodels()+ y_vals = _coerce_floats(data.get("y"), "y")+ _require_min_length(y_vals, 10, "y")+ add_const = bool(data.get("add_constant", True))++ raw_x = data.get("x")+ if raw_x is None:+ raise ValidationError("x is required (regressor matrix or single column)")++ # Normalize x to a 2-D list+ if isinstance(raw_x, list) and raw_x and isinstance(raw_x[0], (list, tuple)):+ # 2-D: list of rows+ x_rows = [_coerce_floats(row, f"x[{i}]") for i, row in enumerate(raw_x)]+ if len(x_rows) != len(y_vals):+ raise ValidationError(+ f"x has {len(x_rows)} rows but y has {len(y_vals)} observations")+ n_features = len(x_rows[0]) if x_rows else 0+ for i, r in enumerate(x_rows):+ if len(r) != n_features:+ raise ValidationError(f"x[{i}] has {len(r)} columns, expected {n_features}")+ X = np.asarray(x_rows, dtype=float)+ else:+ # 1-D: single regressor column+ x_vals = _coerce_floats(raw_x, "x")+ if len(x_vals) != len(y_vals):+ raise ValidationError(+ f"x ({len(x_vals)}) and y ({len(y_vals)}) must have the same length")+ X = np.asarray(x_vals, dtype=float).reshape(-1, 1)+ n_features = 1++ y = np.asarray(y_vals, dtype=float)+ X_mat = sm.add_constant(X) if add_const else X+ model = sm.OLS(y, X_mat).fit()++ coef_names = []+ if add_const:+ coef_names.append("const")+ coef_names.extend([f"x{i + 1}" for i in range(n_features)])++ coefficients = []+ for i, name in enumerate(coef_names):+ coefficients.append({+ "name": name,+ "estimate": _safe_float(model.params[i]),+ "std_error": _safe_float(model.bse[i]),+ "t_stat": _safe_float(model.tvalues[i]),+ "p_value": _safe_float(model.pvalues[i]),+ "ci_lower": _safe_float(model.conf_int()[i][0]),+ "ci_upper": _safe_float(model.conf_int()[i][1]),+ "significant_5pct": bool(model.pvalues[i] < 0.05),+ })++ # Durbin-Watson + Breusch-Pagan+ dw = _safe_float(durbin_watson(model.resid))+ try:+ bp_lm, bp_lm_p, _, _ = het_breuschpagan(model.resid, X_mat)+ except Exception:+ bp_lm, bp_lm_p = float("nan"), float("nan")++ return {+ "n_observations": int(model.nobs),+ "n_features": n_features,+ "has_constant": add_const,+ "coefficients": coefficients,+ "r_squared": _safe_float(model.rsquared),+ "adj_r_squared": _safe_float(model.rsquared_adj),+ "f_statistic": _safe_float(model.fvalue),+ "f_p_value": _safe_float(model.f_pvalue),+ "aic": _safe_float(model.aic),+ "bic": _safe_float(model.bic),+ "log_likelihood": _safe_float(model.llf),+ "residual_std_error": _safe_float(np.sqrt(model.mse_resid)),+ "df_residual": _safe_int(model.df_resid),+ "df_model": _safe_int(model.df_model),+ "durbin_watson": dw,+ "dw_interpretation": (+ "no autocorrelation" if 1.5 <= dw <= 2.5+ else "positive autocorrelation" if dw < 1.5+ else "negative autocorrelation"),+ "breusch_pagan_lm": _safe_float(bp_lm),+ "breusch_pagan_p": _safe_float(bp_lm_p),+ "homoscedastic_5pct": bool(bp_lm_p > 0.05) if not math.isnan(bp_lm_p) else None,+ }+++def op_arima(data):+ """+ Fit an ARIMA(p,d,q) model and produce out-of-sample forecasts.+ Inputs:+ values : list[float] (required, >= 30)+ p, d, q : int (default 1, 1, 1)+ horizon : int (default 14)+ """+ _require_statsmodels()+ values = _coerce_floats(data.get("values"), "values")+ _require_min_length(values, 30, "values")+ p = max(0, _safe_int(data.get("p", 1)))+ d = max(0, _safe_int(data.get("d", 1)))+ q = max(0, _safe_int(data.get("q", 1)))+ horizon = max(1, min(_safe_int(data.get("horizon", 14)), 365))++ arr = np.asarray(values, dtype=float)+ try:+ model = ARIMA(arr, order=(p, d, q)).fit()+ except Exception as e:+ raise ValidationError(f"ARIMA({p},{d},{q}) fit failed: {e}")++ fitted = model.fittedvalues+ resid = model.resid+ ss_res = float(np.sum(resid ** 2))+ ss_tot = float(np.sum((arr - arr.mean()) ** 2)) or 1.0+ r2 = 1.0 - ss_res / ss_tot++ # Forecast with prediction intervals+ fc_res = model.get_forecast(steps=horizon)+ point = fc_res.predicted_mean+ ci = fc_res.conf_int(alpha=0.05)+ forecast = []+ for i in range(horizon):+ lo = float(ci[i][0]) if ci.ndim == 2 else float(ci.iloc[i, 0])+ up = float(ci[i][1]) if ci.ndim == 2 else float(ci.iloc[i, 1])+ forecast.append({+ "step": i + 1,+ "point": _safe_float(point[i]),+ "lower_95": _safe_float(lo),+ "upper_95": _safe_float(up),+ })++ # Residual diagnostics (Ljung-Box at lag 10)+ try:+ from statsmodels.stats.diagnostic import acorr_ljungbox+ lb = acorr_ljungbox(resid, lags=[10], return_df=True)+ lb_stat = _safe_float(lb["lb_stat"].iloc[0])+ lb_p = _safe_float(lb["lb_pvalue"].iloc[0])+ except Exception:+ lb_stat, lb_p = 0.0, 0.0++ return {+ "n_observations": int(len(arr)),+ "order": [p, d, q],+ "horizon": horizon,+ "aic": _safe_float(model.aic),+ "bic": _safe_float(model.bic),+ "hqic": _safe_float(model.hqic),+ "log_likelihood": _safe_float(model.llf),+ "in_sample_r2": _safe_float(r2),+ "residual_mean": _safe_float(float(resid.mean())),+ "residual_std": _safe_float(float(resid.std())),+ "ljung_box_lag10_stat": lb_stat,+ "ljung_box_lag10_p": lb_p,+ "ljung_box_residuals_white_noise": bool(lb_p > 0.05),+ "params": [+ {"name": str(name), "estimate": _safe_float(val)}+ for name, val in zip(model.param_names, model.params)+ ],+ "last_actual": _safe_float(arr[-1]),+ "first_forecast": _safe_float(point[0] if len(point) else 0.0),+ "last_forecast": _safe_float(point[-1] if len(point) else 0.0),+ "forecast": forecast,+ }+++def op_stationarity_tests(data):+ """+ ADF + KPSS at a single differencing order, with full critical-value tables.+ Inputs:+ values : list[float] (required, >= 30)+ d : int (differencing order, default 0)+ adf_regression : 'c' | 'ct' | 'ctt' | 'n' (default 'c')+ kpss_regression: 'c' | 'ct' (default 'c')+ """+ _require_statsmodels()+ values = _coerce_floats(data.get("values"), "values")+ _require_min_length(values, 30, "values")+ d = max(0, min(3, _safe_int(data.get("d", 0))))+ adf_reg = str(data.get("adf_regression", "c"))+ kpss_reg = str(data.get("kpss_regression", "c"))++ s = pd.Series(values, dtype=float)+ for _ in range(d):+ s = s.diff().dropna()+ if len(s) < 10:+ raise ValidationError(+ f"after differencing d={d}, only {len(s)} observations remain")++ # ADF+ try:+ adf_stat, adf_p, adf_lag, adf_nobs, adf_crit, adf_icbest = adfuller(+ s, autolag="AIC", regression=adf_reg)+ adf_stationary = adf_p < 0.05+ except Exception as e:+ adf_stat, adf_p, adf_lag, adf_nobs, adf_crit = float("nan"), 1.0, 0, 0, {}+ adf_stationary = False++ # KPSS+ try:+ kpss_stat, kpss_p, kpss_lag, kpss_crit = kpss(+ s, regression=kpss_reg, nlags="auto")+ kpss_stationary = kpss_p >= 0.05+ except Exception:+ kpss_stat, kpss_p, kpss_lag, kpss_crit = float("nan"), 0.0, 0, {}+ kpss_stationary = False++ verdict = "STATIONARY" if (adf_stationary and kpss_stationary) else "NON-STATIONARY"+ if adf_stationary and not kpss_stationary:+ verdict = "DIFFERENCE-STATIONARY (trend present)"+ elif kpss_stationary and not adf_stationary:+ verdict = "TREND-STATIONARY (no unit root rejected)"++ return {+ "n_observations": int(len(s)),+ "differencing_order": d,+ "verdict": verdict,+ "adf": {+ "statistic": _safe_float(adf_stat),+ "p_value": _safe_float(adf_p),+ "lags_used": _safe_int(adf_lag),+ "n_obs_used": _safe_int(adf_nobs),+ "critical_1pct": _safe_float(adf_crit.get("1%")) if isinstance(adf_crit, dict) else 0.0,+ "critical_5pct": _safe_float(adf_crit.get("5%")) if isinstance(adf_crit, dict) else 0.0,+ "critical_10pct": _safe_float(adf_crit.get("10%")) if isinstance(adf_crit, dict) else 0.0,+ "stationary_5pct": bool(adf_stationary),+ "regression": adf_reg,+ },+ "kpss": {+ "statistic": _safe_float(kpss_stat),+ "p_value": _safe_float(kpss_p),+ "lags_used": _safe_int(kpss_lag),+ "critical_1pct": _safe_float(kpss_crit.get("1%")) if isinstance(kpss_crit, dict) else 0.0,+ "critical_5pct": _safe_float(kpss_crit.get("5%")) if isinstance(kpss_crit, dict) else 0.0,+ "critical_10pct": _safe_float(kpss_crit.get("10%")) if isinstance(kpss_crit, dict) else 0.0,+ "stationary_5pct": bool(kpss_stationary),+ "regression": kpss_reg,+ },+ }+++def op_acf_pacf(data):+ """+ ACF and PACF together with significance bands — used for ARIMA(p,q) order selection.+ Inputs:+ values : list[float] (required, >= 20)+ nlags : int (default 30)+ """+ _require_statsmodels()+ values = _coerce_floats(data.get("values"), "values")+ _require_min_length(values, 20, "values")+ nlags = max(2, min(_safe_int(data.get("nlags", 30)), len(values) // 2))++ arr = np.asarray(values, dtype=float)+ try:+ acf_vals, acf_confint = acf(arr, nlags=nlags, alpha=0.05, fft=True)+ except Exception as e:+ raise ValidationError(f"ACF failed: {e}")+ try:+ pacf_vals, pacf_confint = pacf(arr, nlags=nlags, alpha=0.05)+ except Exception as e:+ raise ValidationError(f"PACF failed: {e}")++ # 95% significance band ≈ ±1.96 / sqrt(n)+ sig_band = 1.96 / math.sqrt(len(arr))++ lags = []+ significant_acf_lags = []+ significant_pacf_lags = []+ for k in range(len(acf_vals)):+ a_v = float(acf_vals[k])+ p_v = float(pacf_vals[k]) if k < len(pacf_vals) else float("nan")+ a_sig = abs(a_v) > sig_band+ p_sig = (not math.isnan(p_v)) and abs(p_v) > sig_band+ if k > 0:+ if a_sig:+ significant_acf_lags.append(k)+ if p_sig:+ significant_pacf_lags.append(k)+ lags.append({+ "lag": k,+ "acf": _safe_float(a_v),+ "pacf": _safe_float(p_v),+ "acf_significant": a_sig,+ "pacf_significant": p_sig,+ })++ # Crude ARIMA suggestion: count significant lags before first cutoff+ suggested_p = next((k - 1 for k in range(1, len(lags))+ if not lags[k]["pacf_significant"]), 0)+ suggested_q = next((k - 1 for k in range(1, len(lags))+ if not lags[k]["acf_significant"]), 0)+ suggested_p = max(0, min(suggested_p, 5))+ suggested_q = max(0, min(suggested_q, 5))++ return {+ "n_observations": len(arr),+ "nlags": nlags,+ "significance_band_95pct": _safe_float(sig_band),+ "lags": lags,+ "n_significant_acf_lags": len(significant_acf_lags),+ "n_significant_pacf_lags": len(significant_pacf_lags),+ "first_significant_acf_lag": significant_acf_lags[0] if significant_acf_lags else None,+ "first_significant_pacf_lag": significant_pacf_lags[0] if significant_pacf_lags else None,+ "suggested_arima_p": int(suggested_p),+ "suggested_arima_q": int(suggested_q),+ }+++def op_granger_causality(data):+ """+ Test whether one series Granger-causes another.+ Inputs:+ y : list[float] (effect series, required, >= 30)+ x : list[float] (potential cause, required, same length)+ max_lag : int (default 4)+ """+ _require_statsmodels()+ y_vals = _coerce_floats(data.get("y"), "y")+ x_vals = _coerce_floats(data.get("x"), "x")+ _require_min_length(y_vals, 30, "y")+ if len(y_vals) != len(x_vals):+ raise ValidationError(+ f"y ({len(y_vals)}) and x ({len(x_vals)}) must have the same length")+ max_lag = max(1, min(_safe_int(data.get("max_lag", 4)), 20))++ arr = np.column_stack([y_vals, x_vals])+ try:+ # statsmodels prints chatty warnings; silence them+ results = grangercausalitytests(arr, maxlag=max_lag, verbose=False)+ except Exception as e:+ raise ValidationError(f"Granger test failed: {e}")++ rows = []+ causal_lags = []+ for lag in range(1, max_lag + 1):+ if lag not in results:+ continue+ f_test = results[lag][0]["ssr_ftest"]+ chi2_test = results[lag][0]["ssr_chi2test"]+ f_stat, f_p = float(f_test[0]), float(f_test[1])+ chi2_stat, chi2_p = float(chi2_test[0]), float(chi2_test[1])+ causal = f_p < 0.05+ if causal:+ causal_lags.append(lag)+ rows.append({+ "lag": lag,+ "f_statistic": _safe_float(f_stat),+ "f_p_value": _safe_float(f_p),+ "chi2_statistic": _safe_float(chi2_stat),+ "chi2_p_value": _safe_float(chi2_p),+ "x_causes_y_5pct": bool(causal),+ })++ return {+ "n_observations": len(y_vals),+ "max_lag": max_lag,+ "causal_lags": causal_lags,+ "x_causes_y_at_any_lag": len(causal_lags) > 0,+ "tests": rows,+ "interpretation": (+ f"x Granger-causes y at lag(s) {causal_lags}" if causal_lags+ else "no Granger-causality from x to y at any tested lag"),+ }+++def op_descriptive(data):+ """+ Descriptive statistics + normality tests (Jarque-Bera, Shapiro-Wilk).+ Inputs:+ values : list[float] (required, >= 8)+ """+ _require_statsmodels()+ values = _coerce_floats(data.get("values"), "values")+ _require_min_length(values, 8, "values")++ arr = np.asarray(values, dtype=float)+ n = len(arr)++ mean = float(arr.mean())+ median = float(np.median(arr))+ std = float(arr.std(ddof=1))+ var = float(arr.var(ddof=1))+ skew = _safe_float(scstats.skew(arr) if SCIPY_OK else 0.0)+ kurt = _safe_float(scstats.kurtosis(arr) if SCIPY_OK else 0.0)+ p25, p50, p75 = np.percentile(arr, [25, 50, 75])+ iqr = float(p75 - p25)++ # Jarque-Bera+ try:+ jb_stat, jb_p, jb_skew, jb_kurt = jb_test(arr)+ except Exception:+ jb_stat, jb_p, jb_skew, jb_kurt = float("nan"), 1.0, skew, kurt++ # Shapiro-Wilk (scipy)+ sw_stat, sw_p = float("nan"), float("nan")+ if SCIPY_OK and n <= 5000:+ try:+ sw_stat, sw_p = scstats.shapiro(arr)+ except Exception:+ pass++ return {+ "n_observations": n,+ "mean": _safe_float(mean),+ "median": _safe_float(median),+ "std": _safe_float(std),+ "variance": _safe_float(var),+ "min": _safe_float(float(arr.min())),+ "max": _safe_float(float(arr.max())),+ "range": _safe_float(float(arr.max() - arr.min())),+ "p25": _safe_float(p25),+ "p50": _safe_float(p50),+ "p75": _safe_float(p75),+ "iqr": _safe_float(iqr),+ "skewness": _safe_float(skew),+ "kurtosis_excess": _safe_float(kurt),+ "sum": _safe_float(float(arr.sum())),+ "coefficient_of_variation": _safe_float(std / mean) if abs(mean) > 1e-12 else None,+ "jarque_bera_stat": _safe_float(jb_stat),+ "jarque_bera_p": _safe_float(jb_p),+ "jarque_bera_normal_5pct": bool(jb_p > 0.05) if not math.isnan(jb_p) else None,+ "shapiro_wilk_stat": _safe_float(sw_stat),+ "shapiro_wilk_p": _safe_float(sw_p),+ "shapiro_wilk_normal_5pct": (+ bool(sw_p > 0.05) if not math.isnan(sw_p) else None),+ }+++# ============================================================================+# DISPATCH TABLE+# ============================================================================++OPERATIONS = {+ "check_status": op_check_status,+ "ols": op_ols,+ "arima": op_arima,+ "stationarity_tests": op_stationarity_tests,+ "acf_pacf": op_acf_pacf,+ "granger_causality": op_granger_causality,+ "descriptive": op_descriptive,+}+++def dispatch(operation, data):+ handler = OPERATIONS.get(operation)+ if handler is None:+ return {+ "success": False,+ "operation": operation,+ "error": f"Unknown operation: {operation}",+ "error_kind": "unknown_op",+ "available": list(OPERATIONS.keys()),+ }+ try:+ result = handler(data or {})+ return {"success": True, "operation": operation, "data": result}+ except ValidationError as e:+ return {"success": False, "operation": operation, "error": str(e),+ "error_kind": "validation"}+ except Exception as e:+ return {"success": False, "operation": operation, "error": str(e),+ "error_kind": "runtime", "traceback": traceback.format_exc()}+++def main(args):+ if len(args) < 1:+ print(json.dumps({+ "success": False,+ "error": "Usage: statsmodels_service.py <operation> [json_data]",+ "error_kind": "usage",+ }))+ return+ operation = args[0]+ data = {}+ if len(args) > 1:+ try:+ data = json.loads(args[1])+ except json.JSONDecodeError as e:+ print(json.dumps({+ "success": False, "operation": operation,+ "error": f"Invalid JSON: {e}", "error_kind": "validation",+ }))+ return+ result = dispatch(operation, data)+ print(json.dumps(result, default=str))+++if __name__ == "__main__":+ main(sys.argv[1:])diff --git a/fincept-qt/scripts/ai_quant_lab/qlib_reporting.py b/fincept-qt/scripts/ai_quant_lab/qlib_reporting.pyindex 8aa054049..29403f375 100644--- a/fincept-qt/scripts/ai_quant_lab/qlib_reporting.py+++ b/fincept-qt/scripts/ai_quant_lab/qlib_reporting.py@@ -1,573 +1,637 @@"""-AI Quant Lab - Reporting & Visualization Module-Analysis and visualization tools for backtest results--Features:-- Position Analysis Reports-- IC Analysis Graphs-- Cumulative Return Visualization-- Risk Analysis Charts-- Model Performance Reports-- Factor Analysis Visualization+Quant Reporting Service (factor / model report builder)+========================================================+Self-contained reporting service for the Fincept Terminal "Quant Reporting"+sub-tab. Same response contract as gs_quant_service / functime_service /+statsmodels_service / fortitudo_service.++Operates on flat numeric arrays (the wire format the C++ panel sends),+unlike the legacy panel-data DataFrame variant preserved as+qlib_reporting_legacy.py.++Response contract (all ops):+ success: bool+ operation: str+ data: dict (when success)+ error: str (when failure)+ error_kind: str | None (validation | runtime | unknown_op)+ traceback: str | None (only on uncaught exceptions)"""-import jsonimport sys-from typing import Dict, List, Any, Optional, Union, Tuple-from datetime import datetime-import warnings-warnings.filterwarnings('ignore')--try:- import pandas as pd- import numpy as np- PANDAS_AVAILABLE = True-except ImportError:- PANDAS_AVAILABLE = False- pd = None- np = None+import os+import json+import math+import traceback+from typing import Dict, List, Any-# Plotting libraries-PLOTLY_AVAILABLE = False-MATPLOTLIB_AVAILABLE = False+import numpy as np+# Optional: scipy for proper rank/Pearson p-values. Falls back to numpy.corrcoef.try:- import plotly.graph_objects as go- import plotly.express as px- from plotly.subplots import make_subplots- PLOTLY_AVAILABLE = True+ from scipy.stats import pearsonr, spearmanr+ SCIPY_OK = Trueexcept ImportError:- pass+ SCIPY_OK = False+# Optional: pandas for rolling window operations. Falls back to a numpy loop.try:- import matplotlib.pyplot as plt- import matplotlib.dates as mdates- MATPLOTLIB_AVAILABLE = True+ import pandas as pd+ PANDAS_OK = Trueexcept ImportError:- pass+ PANDAS_OK = False-class ReportingService:- """- Comprehensive reporting and visualization service.- """+# ============================================================================+# INPUT COERCION + VALIDATION+# ============================================================================- def __init__(self):- self.reports = {}+class ValidationError(ValueError):+ pass- def generate_position_analysis_report(self,- positions: pd.DataFrame,- returns: pd.DataFrame,- benchmark_returns: Optional[pd.Series] = None) -> Dict[str, Any]:- """- Generate position analysis report.- Args:- positions: Position weights over time (datetime x instruments)- returns: Asset returns (datetime x instruments)- benchmark_returns: Benchmark returns (optional)+def _coerce_floats(value, field_name):+ if value is None:+ return []+ if isinstance(value, (list, tuple)):+ out = []+ for i, v in enumerate(value):+ try:+ out.append(float(v))+ except (TypeError, ValueError):+ raise ValidationError(f"{field_name}[{i}] is not numeric: {v!r}")+ return out+ if isinstance(value, np.ndarray):+ return [float(v) for v in value.tolist()]+ if isinstance(value, str):+ s = value.strip()+ if not s:+ return []+ for sep in [",", ";", "\t", "\n"]:+ s = s.replace(sep, " ")+ parts = [p for p in s.split(" ") if p.strip()]+ out = []+ for i, p in enumerate(parts):+ try:+ out.append(float(p))+ except ValueError:+ raise ValidationError(f"{field_name}[{i}] is not numeric: {p!r}")+ return out+ try:+ return [float(value)]+ except (TypeError, ValueError):+ raise ValidationError(f"{field_name} is not numeric: {value!r}")- Returns:- Complete position analysis report- """- if not PANDAS_AVAILABLE:- return {"success": False, "error": "Pandas not available"}- try:- # Calculate portfolio returns- portfolio_returns = (positions.shift(1) * returns).sum(axis=1)-- # Basic metrics- total_return = (1 + portfolio_returns).prod() - 1- annual_return = (1 + portfolio_returns).mean() * 252- volatility = portfolio_returns.std() * np.sqrt(252)- sharpe = annual_return / volatility if volatility > 0 else 0-- # Drawdown analysis- cumulative = (1 + portfolio_returns).cumprod()- running_max = cumulative.expanding().max()- drawdown = (cumulative - running_max) / running_max- max_drawdown = drawdown.min()-- report = {- "success": True,- "performance_metrics": {- "total_return": float(total_return),- "annual_return": float(annual_return),- "volatility": float(volatility),- "sharpe_ratio": float(sharpe),- "max_drawdown": float(max_drawdown)- },- "portfolio_stats": {- "num_positions": int(positions.shape[1]),- "avg_num_holdings": float((positions > 0).sum(axis=1).mean()),- "avg_position_size": float(positions[positions > 0].mean().mean()),- "concentration": float(positions.max(axis=1).mean())- }- }-- # Benchmark comparison if provided- if benchmark_returns is not None:- excess_returns = portfolio_returns - benchmark_returns- tracking_error = excess_returns.std() * np.sqrt(252)- information_ratio = excess_returns.mean() * 252 / tracking_error if tracking_error > 0 else 0-- report["benchmark_comparison"] = {- "excess_return": float(excess_returns.mean() * 252),- "tracking_error": float(tracking_error),- "information_ratio": float(information_ratio)- }-- # Generate visualization data- report["visualization_data"] = {- "cumulative_returns": cumulative.to_dict(),- "drawdown_series": drawdown.to_dict(),- "position_concentration": (positions > 0).sum(axis=1).to_dict()- }-- return report-- except Exception as e:- return {"success": False, "error": f"Report generation failed: {str(e)}"}-- def generate_ic_analysis_report(self,- predictions: pd.DataFrame,- returns: pd.DataFrame,- method: str = "both") -> Dict[str, Any]:- """- Generate IC analysis report with graphs.-- Args:- predictions: Model predictions- returns: Actual returns- method: 'pearson', 'spearman', or 'both'-- Returns:- IC analysis report with visualization data- """- if not PANDAS_AVAILABLE:- return {"success": False, "error": "Pandas not available"}+def _require_min_length(values, n, field_name):+ if len(values) < n:+ raise ValidationError(+ f"{field_name} needs at least {n} values, got {len(values)}")- try:- from scipy.stats import pearsonr, spearmanr-- common_dates = predictions.index.intersection(returns.index)- common_instruments = predictions.columns.intersection(returns.columns)-- # Calculate IC for each date- ic_series = []- rank_ic_series = []-- for date in common_dates:- pred_vals = predictions.loc[date, common_instruments].dropna()- ret_vals = returns.loc[date, common_instruments].dropna()-- common_inst = pred_vals.index.intersection(ret_vals.index)- if len(common_inst) < 10:- continue-- pred = pred_vals[common_inst].values- ret = ret_vals[common_inst].values-- # Pearson IC- if method in ['pearson', 'both']:- ic, _ = pearsonr(pred, ret)- ic_series.append({"date": str(date), "ic": float(ic)})-- # Spearman IC (Rank IC)- if method in ['spearman', 'both']:- rank_ic, _ = spearmanr(pred, ret)- rank_ic_series.append({"date": str(date), "rank_ic": float(rank_ic)})-- # Calculate statistics- if ic_series:- ic_values = [x["ic"] for x in ic_series]- ic_mean = np.mean(ic_values)- ic_std = np.std(ic_values)- ic_ir = ic_mean / ic_std if ic_std > 0 else 0- else:- ic_mean = ic_std = ic_ir = 0-- if rank_ic_series:- rank_ic_values = [x["rank_ic"] for x in rank_ic_series]- rank_ic_mean = np.mean(rank_ic_values)- rank_ic_std = np.std(rank_ic_values)- rank_ic_ir = rank_ic_mean / rank_ic_std if rank_ic_std > 0 else 0- else:- rank_ic_mean = rank_ic_std = rank_ic_ir = 0-- report = {- "success": True,- "ic_metrics": {- "ic_mean": float(ic_mean),- "ic_std": float(ic_std),- "icir": float(ic_ir),- "ic_positive_rate": float(sum(1 for ic in ic_values if ic > 0) / len(ic_values)) if ic_values else 0- },- "rank_ic_metrics": {- "rank_ic_mean": float(rank_ic_mean),- "rank_ic_std": float(rank_ic_std),- "rank_icir": float(rank_ic_ir)- },- "visualization_data": {- "ic_series": ic_series,- "rank_ic_series": rank_ic_series- }- }-- return report-- except Exception as e:- return {"success": False, "error": f"IC analysis failed: {str(e)}"}-- def generate_cumulative_return_graph(self,- returns: pd.Series,- benchmark_returns: Optional[pd.Series] = None,- title: str = "Cumulative Returns") -> Dict[str, Any]:- """- Generate cumulative return visualization data.-- Args:- returns: Portfolio returns- benchmark_returns: Benchmark returns (optional)- title: Graph title-- Returns:- Visualization data- """- if not PANDAS_AVAILABLE:- return {"success": False, "error": "Pandas not available"}- try:- cumulative_returns = (1 + returns).cumprod()-- graph_data = {- "success": True,- "title": title,- "dates": [str(d) for d in cumulative_returns.index],- "portfolio_returns": cumulative_returns.tolist(),- }-- if benchmark_returns is not None:- cumulative_benchmark = (1 + benchmark_returns).cumprod()- graph_data["benchmark_returns"] = cumulative_benchmark.tolist()-- # Plotly graph if available- if PLOTLY_AVAILABLE:- fig = go.Figure()-- fig.add_trace(go.Scatter(- x=cumulative_returns.index,- y=cumulative_returns.values,- mode='lines',- name='Portfolio',- line=dict(color='#2E86DE', width=2)- ))-- if benchmark_returns is not None:- fig.add_trace(go.Scatter(- x=cumulative_benchmark.index,- y=cumulative_benchmark.values,- mode='lines',- name='Benchmark',- line=dict(color='#EE5A6F', width=2, dash='dash')- ))-- fig.update_layout(- title=title,- xaxis_title="Date",- yaxis_title="Cumulative Return",- hovermode='x unified',- template='plotly_white'- )-- graph_data["plotly_json"] = fig.to_json()-- return graph_data-- except Exception as e:- return {"success": False, "error": f"Graph generation failed: {str(e)}"}-- def generate_risk_analysis_graph(self,- returns: pd.Series,- title: str = "Risk Analysis") -> Dict[str, Any]:- """- Generate risk analysis visualization.-- Args:- returns: Portfolio returns- title: Graph title-- Returns:- Risk analysis visualization data- """- if not PANDAS_AVAILABLE:- return {"success": False, "error": "Pandas not available"}+def _safe_float(v, default=0.0):+ try:+ f = float(v)+ except (TypeError, ValueError):+ return default+ if math.isnan(f) or math.isinf(f):+ return default+ return f++def _safe_int(v, default=0):+ try:+ f = float(v)+ if math.isnan(f) or math.isinf(f):+ return default+ return int(f)+ except (TypeError, ValueError):+ return default+++def _sample_curve(values, max_points=300):+ """Subsample [(label, value)] to ~max_points entries, always keeping the last."""+ if not values:+ return []+ n = len(values)+ step = max(1, n // max_points)+ out = []+ for i, (label, v) in enumerate(values):+ if i % step == 0:+ out.append({"index": i, "label": str(label), "value": _safe_float(v)})+ if out and out[-1]["index"] != n - 1:+ out.append({"index": n - 1, "label": str(values[-1][0]), "value": _safe_float(values[-1][1])})+ return out+++def _correlation(x, y):+ """Return (pearson_r, pearson_p, spearman_r, spearman_p), p-values 0/1 if scipy missing."""+ x_arr = np.asarray(x, dtype=float)+ y_arr = np.asarray(y, dtype=float)+ if SCIPY_OK:try:- # Calculate metrics- cumulative = (1 + returns).cumprod()- running_max = cumulative.expanding().max()- drawdown = (cumulative - running_max) / running_max-- # Rolling volatility- rolling_vol = returns.rolling(window=20).std() * np.sqrt(252)-- graph_data = {- "success": True,- "title": title,- "dates": [str(d) for d in returns.index],- "drawdown": drawdown.tolist(),- "rolling_volatility": rolling_vol.tolist(),- "max_drawdown": float(drawdown.min()),- "avg_volatility": float(rolling_vol.mean())- }-- # Plotly graph if available- if PLOTLY_AVAILABLE:- fig = make_subplots(- rows=2, cols=1,- subplot_titles=('Drawdown', 'Rolling Volatility'),- vertical_spacing=0.12- )-- # Drawdown- fig.add_trace(go.Scatter(- x=drawdown.index,- y=drawdown.values,- mode='lines',- name='Drawdown',- line=dict(color='#E74C3C', width=2),- fill='tozeroy'- ), row=1, col=1)-- # Rolling volatility- fig.add_trace(go.Scatter(- x=rolling_vol.index,- y=rolling_vol.values,- mode='lines',- name='Rolling Vol (20d)',- line=dict(color='#9B59B6', width=2)- ), row=2, col=1)-- fig.update_layout(- title=title,- hovermode='x unified',- template='plotly_white',- height=600- )-- graph_data["plotly_json"] = fig.to_json()-- return graph_data-- except Exception as e:- return {"success": False, "error": f"Risk graph generation failed: {str(e)}"}-- def generate_model_performance_report(self,- predictions: pd.DataFrame,- returns: pd.DataFrame,- model_name: str = "Model") -> Dict[str, Any]:- """- Generate model performance report.-- Args:- predictions: Model predictions- returns: Actual returns- model_name: Model name-- Returns:- Model performance report- """+ pr, pp = pearsonr(x_arr, y_arr)+ except Exception:+ pr, pp = float("nan"), 1.0try:- # IC analysis- ic_report = self.generate_ic_analysis_report(predictions, returns)-- # Quantile analysis- from qlib_evaluation import EvaluationService- eval_service = EvaluationService()- quantile_analysis = eval_service.analyze_factor_returns(predictions, returns, quantiles=5)-- report = {- "success": True,- "model_name": model_name,- "ic_analysis": ic_report,- "quantile_analysis": quantile_analysis,- "summary": {- "ic": ic_report.get("ic_metrics", {}).get("ic_mean", 0),- "icir": ic_report.get("ic_metrics", {}).get("icir", 0),- "long_short_sharpe": quantile_analysis.get("long_short_sharpe", 0),- "rating": self._get_model_rating(- ic_report.get("ic_metrics", {}).get("icir", 0),- quantile_analysis.get("long_short_sharpe", 0)- )- }- }-- return report-- except Exception as e:- return {"success": False, "error": f"Model performance report failed: {str(e)}"}-- def _get_model_rating(self, icir: float, sharpe: float) -> str:- """Calculate model rating based on ICIR and Sharpe"""- score = icir * 0.5 + sharpe * 0.5-- if score >= 2.5:- return "Excellent"- elif score >= 1.5:- return "Good"- elif score >= 0.8:- return "Fair"- elif score >= 0.3:- return "Poor"- else:- return "Very Poor"-- def export_report(self,- report_data: Dict[str, Any],- format: str = "json",- filepath: Optional[str] = None) -> Dict[str, Any]:- """- Export report to file.-- Args:- report_data: Report data to export- format: Export format ('json', 'html')- filepath: File path (optional)-- Returns:- Export result- """+ sr, sp = spearmanr(x_arr, y_arr)+ except Exception:+ sr, sp = float("nan"), 1.0+ return _safe_float(pr), _safe_float(pp), _safe_float(sr), _safe_float(sp)+ # Numpy fallback+ if x_arr.std() == 0 or y_arr.std() == 0:+ return 0.0, 1.0, 0.0, 1.0+ pr = float(np.corrcoef(x_arr, y_arr)[0, 1])+ # Spearman = Pearson on rank+ rx = np.argsort(np.argsort(x_arr)).astype(float)+ ry = np.argsort(np.argsort(y_arr)).astype(float)+ sr = float(np.corrcoef(rx, ry)[0, 1])+ return _safe_float(pr), 0.0, _safe_float(sr), 0.0+++# ============================================================================+# OPERATION HANDLERS+# ============================================================================++def op_check_status(_data):+ return {+ "scipy": SCIPY_OK,+ "pandas": PANDAS_OK,+ "backend": "numpy" + (" + scipy" if SCIPY_OK else "") + (" + pandas" if PANDAS_OK else ""),+ "ops_available": list(OPERATIONS.keys()),+ }+++def op_ic_analysis(data):+ """+ Information Coefficient analysis between predictions and realized returns.++ Inputs:+ predictions : list[float] (required, >= 10)+ returns : list[float] (required, same length as predictions)+ method : 'pearson' | 'spearman' | 'both' (default 'both')+ window : int (rolling-IC window size; default 20)+ """+ preds = _coerce_floats(data.get("predictions"), "predictions")+ rets = _coerce_floats(data.get("returns"), "returns")+ _require_min_length(preds, 10, "predictions")+ if len(preds) != len(rets):+ raise ValidationError(+ f"predictions ({len(preds)}) and returns ({len(rets)}) must have the same length")+ method = str(data.get("method", "both")).lower()+ if method not in ("pearson", "spearman", "both"):+ raise ValidationError(+ f"method must be 'pearson', 'spearman', or 'both'; got {method!r}")+ window = max(5, min(_safe_int(data.get("window", 20)), len(preds) // 2))++ pr, pp, sr, sp = _correlation(preds, rets)++ # Rolling IC over the requested window+ rolling = []+ for i in range(window, len(preds) + 1):+ win_p = preds[i - window:i]+ win_r = rets[i - window:i]try:- if format == "json":- if filepath:- with open(filepath, 'w') as f:- json.dump(report_data, f, indent=2)- return {- "success": True,- "format": "json",- "filepath": filepath,- "data": report_data- }-- elif format == "html":- html_content = self._generate_html_report(report_data)- if filepath:- with open(filepath, 'w') as f:- f.write(html_content)- return {- "success": True,- "format": "html",- "filepath": filepath,- "html": html_content- }-- else:- return {"success": False, "error": f"Unknown format: {format}"}-- except Exception as e:- return {"success": False, "error": f"Export failed: {str(e)}"}-- def _generate_html_report(self, report_data: Dict[str, Any]) -> str:- """Generate HTML report"""- html = f"""- <!DOCTYPE html>- <html>- <head>- <title>Qlib Analysis Report</title>- <style>- body {{ font-family: Arial, sans-serif; margin: 20px; }}- h1 {{ color: #2E86DE; }}- h2 {{ color: #555; }}- table {{ border-collapse: collapse; width: 100%; margin: 20px 0; }}- th, td {{ border: 1px solid #ddd; padding: 12px; text-align: left; }}- th {{ background-color: #2E86DE; color: white; }}- .metric {{ background-color: #f9f9f9; padding: 15px; margin: 10px 0; border-left: 4px solid #2E86DE; }}- </style>- </head>- <body>- <h1>Qlib Analysis Report</h1>- <p>Generated: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}</p>-- <h2>Summary</h2>- <pre>{json.dumps(report_data, indent=2)}</pre>- </body>- </html>- """- return html---def main():- """CLI interface"""- if len(sys.argv) < 2:- print(json.dumps({"success": False, "error": "No command specified"}))- sys.exit(1)-- command = sys.argv[1]- service = ReportingService()+ r_pr, _pp, r_sr, _sp = _correlation(win_p, win_r)+ except Exception:+ r_pr, r_sr = 0.0, 0.0+ row = {"end_index": i - 1}+ if method in ("pearson", "both"):+ row["ic"] = _safe_float(r_pr)+ if method in ("spearman", "both"):+ row["rank_ic"] = _safe_float(r_sr)+ rolling.append(row)++ # Aggregate stats from rolling+ ic_values = [r["ic"] for r in rolling if "ic" in r]+ rank_ic_values = [r["rank_ic"] for r in rolling if "rank_ic" in r]++ def _ir(vals):+ if not vals:+ return 0.0, 0.0, 0.0, 0.0+ arr = np.asarray(vals, dtype=float)+ mu = float(arr.mean())+ sd = float(arr.std()) or 0.0+ ir = mu / sd if sd > 0 else 0.0+ pos_rate = float((arr > 0).mean() * 100.0)+ return _safe_float(mu), _safe_float(sd), _safe_float(ir), _safe_float(pos_rate)++ ic_mean, ic_std, icir, ic_pos_pct = _ir(ic_values)+ rank_ic_mean, rank_ic_std, rank_icir, rank_ic_pos_pct = _ir(rank_ic_values)++ # Verdict heuristic on IR+ def _verdict(ir):+ if ir >= 0.75: return "STRONG"+ if ir >= 0.40: return "MODERATE"+ if ir >= 0.10: return "WEAK"+ if ir > 0: return "VERY WEAK"+ return "NO SIGNAL"++ return {+ "n_observations": len(preds),+ "method": method,+ "window": window,+ "n_rolling_points": len(rolling),+ "overall_pearson_ic": _safe_float(pr),+ "overall_pearson_p": _safe_float(pp),+ "overall_spearman_ic": _safe_float(sr),+ "overall_spearman_p": _safe_float(sp),+ "ic_mean": ic_mean,+ "ic_std": ic_std,+ "icir": icir,+ "ic_positive_pct": ic_pos_pct,+ "ic_verdict": _verdict(icir),+ "rank_ic_mean": rank_ic_mean,+ "rank_ic_std": rank_ic_std,+ "rank_icir": rank_icir,+ "rank_ic_positive_pct": rank_ic_pos_pct,+ "rank_ic_verdict": _verdict(rank_icir),+ "rolling_series": rolling,+ }+++def op_cumulative_returns(data):+ """+ Cumulative-return curve for portfolio + optional benchmark.- try:- params = json.loads(sys.argv[2]) if len(sys.argv) > 2 else {}-- if command == "check_status":- result = {- "success": True,- "pandas_available": PANDAS_AVAILABLE,- "plotly_available": PLOTLY_AVAILABLE,- "matplotlib_available": MATPLOTLIB_AVAILABLE- }-- elif command == "position_analysis":- result = service.generate_position_analysis_report(- positions=params.get("positions", {}),- returns=params.get("returns", []),- benchmark_returns=params.get("benchmark_returns")- )-- elif command == "ic_analysis":- result = service.generate_ic_analysis_report(- predictions=params.get("predictions", []),- returns=params.get("returns", []),- method=params.get("method", "both")- )-- elif command == "cumulative_return_graph":- result = service.generate_cumulative_return_graph(- returns=params.get("returns", []),- benchmark_returns=params.get("benchmark_returns"),- title=params.get("title", "Cumulative Returns")- )-- elif command == "risk_analysis_graph":- result = service.generate_risk_analysis_graph(- returns=params.get("returns", []),- title=params.get("title", "Risk Analysis")- )-- elif command == "model_performance":- result = service.generate_model_performance_report(- predictions=params.get("predictions", []),- returns=params.get("returns", []),- model_name=params.get("model_name", "Model")- )-- elif command == "export_report":- result = service.export_report(- report_data=params.get("report_data", {}),- format=params.get("format", "json"),- filepath=params.get("filepath")- )-- else:- result = {"success": False, "error": f"Unknown command: {command}"}-- print(json.dumps(result))+ Inputs:+ returns : list[float] (required, >= 5)+ benchmark_returns : list[float] (optional, must match length if provided)+ title : str (optional, label only)+ """+ rets = _coerce_floats(data.get("returns"), "returns")+ _require_min_length(rets, 5, "returns")+ title = str(data.get("title", "Cumulative Returns"))++ has_bench = data.get("benchmark_returns") is not None and \+ len(_coerce_floats(data.get("benchmark_returns"), "benchmark_returns")) > 0++ if has_bench:+ bench = _coerce_floats(data.get("benchmark_returns"), "benchmark_returns")+ if len(bench) != len(rets):+ raise ValidationError(+ f"returns ({len(rets)}) and benchmark_returns ({len(bench)}) must have the same length")+ else:+ bench = []++ arr = np.asarray(rets, dtype=float)+ cum = np.cumprod(1.0 + arr)+ n = len(arr)++ total_return = float(cum[-1] - 1.0)+ years = max(n / 252.0, 1e-6)+ ann_return = (1.0 + total_return) ** (1.0 / years) - 1.0 if cum[-1] > 0 else -1.0+ daily_vol = float(arr.std())+ ann_vol = daily_vol * math.sqrt(252)+ sharpe = (float(arr.mean()) / daily_vol * math.sqrt(252)) if daily_vol > 0 else 0.0+ win_rate = float((arr > 0).mean() * 100.0)+ best_day = float(arr.max())+ worst_day = float(arr.min())++ # Drawdown+ peak = np.maximum.accumulate(cum)+ dd = (cum - peak) / peak+ max_dd = float(dd.min())+ # Find max-DD location+ trough_idx = int(np.argmin(dd))+ peak_idx = int(np.argmax(cum[:trough_idx + 1])) if trough_idx > 0 else 0++ portfolio_curve = _sample_curve(list(zip(range(n), cum.tolist())), 300)++ payload = {+ "n_observations": n,+ "title": title,+ "has_benchmark": has_bench,+ "total_return": _safe_float(total_return),+ "total_return_pct": _safe_float(total_return * 100.0),+ "annualized_return": _safe_float(ann_return),+ "annualized_return_pct": _safe_float(ann_return * 100.0),+ "annualized_volatility": _safe_float(ann_vol),+ "annualized_volatility_pct": _safe_float(ann_vol * 100.0),+ "sharpe_ratio": _safe_float(sharpe),+ "max_drawdown": _safe_float(max_dd),+ "max_drawdown_pct": _safe_float(max_dd * 100.0),+ "max_drawdown_peak_index": peak_idx,+ "max_drawdown_trough_index": trough_idx,+ "best_day": _safe_float(best_day),+ "worst_day": _safe_float(worst_day),+ "win_rate_pct": _safe_float(win_rate),+ "final_value": _safe_float(cum[-1]),+ "portfolio_curve": portfolio_curve,+ }++ if has_bench:+ bench_arr = np.asarray(bench, dtype=float)+ bench_cum = np.cumprod(1.0 + bench_arr)+ bench_total = float(bench_cum[-1] - 1.0)+ bench_ann = (1.0 + bench_total) ** (1.0 / years) - 1.0 if bench_cum[-1] > 0 else -1.0+ excess = arr - bench_arr+ te = float(excess.std()) * math.sqrt(252)+ info_ratio = (float(excess.mean()) * math.sqrt(252) / te) if te > 0 else 0.0+ payload.update({+ "benchmark_total_return": _safe_float(bench_total),+ "benchmark_total_return_pct": _safe_float(bench_total * 100.0),+ "benchmark_annualized_return_pct": _safe_float(bench_ann * 100.0),+ "benchmark_final_value": _safe_float(bench_cum[-1]),+ "alpha_pct": _safe_float((total_return - bench_total) * 100.0),+ "tracking_error_pct": _safe_float(te * 100.0),+ "information_ratio": _safe_float(info_ratio),+ "benchmark_curve": _sample_curve(list(zip(range(n), bench_cum.tolist())), 300),+ })++ return payload+++def op_risk_report(data):+ """+ Drawdown + rolling volatility report for a return series.+ Inputs:+ returns : list[float] (required, >= 30)+ rolling_window: int (default 20, in trading days)+ """+ rets = _coerce_floats(data.get("returns"), "returns")+ _require_min_length(rets, 30, "returns")+ window = max(5, min(_safe_int(data.get("rolling_window", 20)), len(rets) // 2))++ arr = np.asarray(rets, dtype=float)+ n = len(arr)+ cum = np.cumprod(1.0 + arr)+ peak = np.maximum.accumulate(cum)+ dd = (cum - peak) / peak++ # Rolling vol via simple loop (matches numpy without pandas dependency for portability)+ rolling_vol = np.full(n, np.nan)+ for i in range(window - 1, n):+ rolling_vol[i] = float(arr[i - window + 1:i + 1].std()) * math.sqrt(252)++ max_dd = float(dd.min())+ trough_idx = int(np.argmin(dd))+ peak_idx = int(np.argmax(cum[:trough_idx + 1])) if trough_idx > 0 else 0++ # Recovery: first index after trough where cum >= peak[trough]+ recovery_idx = -1+ if trough_idx < n - 1:+ target = peak[trough_idx]+ rest = cum[trough_idx + 1:]+ recovered = np.where(rest >= target)[0]+ if len(recovered) > 0:+ recovery_idx = int(trough_idx + 1 + recovered[0])++ # Tail metrics+ var_5 = float(np.percentile(arr, 5))+ var_1 = float(np.percentile(arr, 1))+ cvar_5 = float(arr[arr <= var_5].mean()) if (arr <= var_5).any() else 0.0+ cvar_1 = float(arr[arr <= var_1].mean()) if (arr <= var_1).any() else 0.0++ # Volatility regime cards+ rv_clean = rolling_vol[~np.isnan(rolling_vol)]+ avg_vol = _safe_float(float(rv_clean.mean()) if len(rv_clean) else 0.0)+ max_vol = _safe_float(float(rv_clean.max()) if len(rv_clean) else 0.0)+ min_vol = _safe_float(float(rv_clean.min()) if len(rv_clean) else 0.0)+ cur_vol = _safe_float(float(rv_clean[-1]) if len(rv_clean) else 0.0)++ return {+ "n_observations": n,+ "rolling_window": window,+ "max_drawdown": _safe_float(max_dd),+ "max_drawdown_pct": _safe_float(max_dd * 100.0),+ "max_drawdown_peak_index": peak_idx,+ "max_drawdown_trough_index": trough_idx,+ "max_drawdown_recovery_index": recovery_idx,+ "max_drawdown_recovered": recovery_idx >= 0,+ "drawdown_duration_days": (recovery_idx if recovery_idx >= 0 else n - 1) - peak_idx,+ "current_drawdown_pct": _safe_float(float(dd[-1]) * 100.0),+ "var_5pct_daily": _safe_float(var_5),+ "var_1pct_daily": _safe_float(var_1),+ "cvar_5pct_daily": _safe_float(cvar_5),+ "cvar_1pct_daily": _safe_float(cvar_1),+ "avg_rolling_vol": avg_vol,+ "current_rolling_vol": cur_vol,+ "max_rolling_vol": max_vol,+ "min_rolling_vol": min_vol,+ "drawdown_curve": _sample_curve(list(zip(range(n), dd.tolist())), 300),+ "rolling_vol_curve": _sample_curve(+ [(i, v) for i, v in enumerate(rolling_vol.tolist()) if not math.isnan(v)], 300),+ }+++def op_model_performance(data):+ """+ Combined model evaluation: IC + quantile spread + summary verdict.++ Inputs:+ predictions : list[float] (required, >= 20)+ returns : list[float] (required, same length)+ model_name : str (label only)+ n_quantiles : int (default 5)+ """+ preds = _coerce_floats(data.get("predictions"), "predictions")+ rets = _coerce_floats(data.get("returns"), "returns")+ _require_min_length(preds, 20, "predictions")+ if len(preds) != len(rets):+ raise ValidationError(+ f"predictions ({len(preds)}) and returns ({len(rets)}) must have the same length")+ model_name = str(data.get("model_name", "Model"))+ n_q = max(2, min(_safe_int(data.get("n_quantiles", 5)), 10))++ p_arr = np.asarray(preds, dtype=float)+ r_arr = np.asarray(rets, dtype=float)+ n = len(p_arr)++ # IC+ pr, pp, sr, sp = _correlation(p_arr, r_arr)++ # Direction accuracy+ dir_acc = float(np.mean(np.sign(p_arr) == np.sign(r_arr)) * 100.0)+ # Hit rate (predicted positive, realized positive)+ pos_mask = p_arr > 0+ hit_rate = float(np.mean(r_arr[pos_mask] > 0) * 100.0) if pos_mask.any() else 0.0++ # Quantile decomposition+ quantile_rows = []+ if n >= n_q * 5:+ order = np.argsort(p_arr)+ chunks = np.array_split(order, n_q)+ for q_idx, idx_chunk in enumerate(chunks):+ sub = r_arr[idx_chunk]+ quantile_rows.append({+ "quantile": q_idx + 1,+ "n": int(len(idx_chunk)),+ "pred_min": _safe_float(float(p_arr[idx_chunk].min())),+ "pred_max": _safe_float(float(p_arr[idx_chunk].max())),+ "mean_return": _safe_float(float(sub.mean())),+ "median_return": _safe_float(float(np.median(sub))),+ "win_rate_pct": _safe_float(float((sub > 0).mean() * 100.0)),+ })++ long_short_ret = 0.0+ if quantile_rows:+ long_short_ret = quantile_rows[-1]["mean_return"] - quantile_rows[0]["mean_return"]++ # Verdict+ def _verdict(ic, ls):+ score = ic + (ls * 5.0) # heuristic blend+ if score >= 0.30: return "STRONG ALPHA"+ if score >= 0.15: return "MODERATE ALPHA"+ if score >= 0.05: return "WEAK ALPHA"+ if score > 0: return "MARGINAL SIGNAL"+ return "NO ALPHA"++ return {+ "n_observations": n,+ "model_name": model_name,+ "n_quantiles": n_q,+ "pearson_ic": _safe_float(pr),+ "pearson_p_value": _safe_float(pp),+ "spearman_ic": _safe_float(sr),+ "spearman_p_value": _safe_float(sp),+ "direction_accuracy_pct": _safe_float(dir_acc),+ "hit_rate_pct": _safe_float(hit_rate),+ "long_short_spread": _safe_float(long_short_ret),+ "long_short_spread_bps": _safe_float(long_short_ret * 10000.0),+ "quantile_table": quantile_rows,+ "monotonic": _is_monotonic([q["mean_return"] for q in quantile_rows]) if quantile_rows else False,+ "verdict": _verdict(sr, long_short_ret),+ }+++def _is_monotonic(values):+ """True when values are non-decreasing OR non-increasing (allow tiny float noise)."""+ if len(values) < 2:+ return False+ diffs = np.diff(values)+ return bool(np.all(diffs >= -1e-9)) or bool(np.all(diffs <= 1e-9))+++def op_factor_quantiles(data):+ """+ Sort predictions into N quantiles, show realized return spread + win rate per bucket.+ Cleaner standalone version of the quantile table inside model_performance.++ Inputs:+ predictions : list[float] (required, >= 20)+ returns : list[float] (required, same length)+ n_quantiles : int (default 5, capped at 10)+ """+ preds = _coerce_floats(data.get("predictions"), "predictions")+ rets = _coerce_floats(data.get("returns"), "returns")+ _require_min_length(preds, 20, "predictions")+ if len(preds) != len(rets):+ raise ValidationError(+ f"predictions ({len(preds)}) and returns ({len(rets)}) must have the same length")+ n_q = max(2, min(_safe_int(data.get("n_quantiles", 5)), 10))++ p_arr = np.asarray(preds, dtype=float)+ r_arr = np.asarray(rets, dtype=float)+ n = len(p_arr)+ if n < n_q * 5:+ raise ValidationError(+ f"need at least {n_q * 5} obs for {n_q} quantiles, got {n}")++ order = np.argsort(p_arr)+ chunks = np.array_split(order, n_q)+ quantile_rows = []+ for q_idx, idx_chunk in enumerate(chunks):+ sub = r_arr[idx_chunk]+ quantile_rows.append({+ "quantile": q_idx + 1,+ "n": int(len(idx_chunk)),+ "pred_min": _safe_float(float(p_arr[idx_chunk].min())),+ "pred_max": _safe_float(float(p_arr[idx_chunk].max())),+ "pred_mean": _safe_float(float(p_arr[idx_chunk].mean())),+ "ret_mean": _safe_float(float(sub.mean())),+ "ret_median": _safe_float(float(np.median(sub))),+ "ret_std": _safe_float(float(sub.std())),+ "win_rate_pct": _safe_float(float((sub > 0).mean() * 100.0)),+ })++ spread = quantile_rows[-1]["ret_mean"] - quantile_rows[0]["ret_mean"]+ monotone = _is_monotonic([q["ret_mean"] for q in quantile_rows])++ # Sharpe of long-top / short-bottom equally weighted+ top_idx = chunks[-1]+ bot_idx = chunks[0]+ ls_returns = r_arr[top_idx].mean() - r_arr[bot_idx].mean()+ ls_std = float(r_arr.std())+ ls_sharpe = ls_returns / ls_std * math.sqrt(252) if ls_std > 0 else 0.0++ # Verdict+ def _verdict(spread, mono):+ if mono and spread > 0.01: return "STRONG MONOTONE"+ if mono: return "MONOTONE — WEAK SPREAD"+ if spread > 0.01: return "STRONG SPREAD — NON-MONOTONE"+ if spread > 0: return "WEAK"+ return "INVERTED"++ return {+ "n_observations": n,+ "n_quantiles": n_q,+ "long_short_spread": _safe_float(spread),+ "long_short_spread_bps": _safe_float(spread * 10000.0),+ "long_short_sharpe_annualized": _safe_float(ls_sharpe),+ "monotonic": bool(monotone),+ "verdict": _verdict(spread, monotone),+ "quantiles": quantile_rows,+ }+++# ============================================================================+# DISPATCH TABLE+# ============================================================================++OPERATIONS = {+ "check_status": op_check_status,+ "ic_analysis": op_ic_analysis,+ "cumulative_returns": op_cumulative_returns,+ "risk_report": op_risk_report,+ "model_performance": op_model_performance,+ "factor_quantiles": op_factor_quantiles,+}+++def dispatch(operation, data):+ handler = OPERATIONS.get(operation)+ if handler is None:+ return {+ "success": False, "operation": operation,+ "error": f"Unknown operation: {operation}",+ "error_kind": "unknown_op",+ "available": list(OPERATIONS.keys()),+ }+ try:+ result = handler(data or {})+ return {"success": True, "operation": operation, "data": result}+ except ValidationError as e:+ return {"success": False, "operation": operation, "error": str(e),+ "error_kind": "validation"}except Exception as e:- print(json.dumps({"success": False, "error": str(e)}))- sys.exit(1)+ return {"success": False, "operation": operation, "error": str(e),+ "error_kind": "runtime", "traceback": traceback.format_exc()}+++def main(args):+ if len(args) < 1:+ print(json.dumps({+ "success": False,+ "error": "Usage: qlib_reporting.py <operation> [json_data]",+ "error_kind": "usage",+ }))+ return+ operation = args[0]+ data = {}+ if len(args) > 1:+ try:+ data = json.loads(args[1])+ except json.JSONDecodeError as e:+ print(json.dumps({+ "success": False, "operation": operation,+ "error": f"Invalid JSON: {e}", "error_kind": "validation",+ }))+ return+ result = dispatch(operation, data)+ print(json.dumps(result, default=str))if __name__ == "__main__":- main()+ main(sys.argv[1:])diff --git a/fincept-qt/scripts/ai_quant_lab/qlib_reporting_legacy.py b/fincept-qt/scripts/ai_quant_lab/qlib_reporting_legacy.pynew file mode 100644index 000000000..8aa054049--- /dev/null+++ b/fincept-qt/scripts/ai_quant_lab/qlib_reporting_legacy.py@@ -0,0 +1,573 @@+"""+AI Quant Lab - Reporting & Visualization Module+Analysis and visualization tools for backtest results++Features:+- Position Analysis Reports+- IC Analysis Graphs+- Cumulative Return Visualization+- Risk Analysis Charts+- Model Performance Reports+- Factor Analysis Visualization+"""++import json+import sys+from typing import Dict, List, Any, Optional, Union, Tuple+from datetime import datetime+import warnings+warnings.filterwarnings('ignore')++try:+ import pandas as pd+ import numpy as np+ PANDAS_AVAILABLE = True+except ImportError:+ PANDAS_AVAILABLE = False+ pd = None+ np = None++# Plotting libraries+PLOTLY_AVAILABLE = False+MATPLOTLIB_AVAILABLE = False++try:+ import plotly.graph_objects as go+ import plotly.express as px+ from plotly.subplots import make_subplots+ PLOTLY_AVAILABLE = True+except ImportError:+ pass++try:+ import matplotlib.pyplot as plt+ import matplotlib.dates as mdates+ MATPLOTLIB_AVAILABLE = True+except ImportError:+ pass+++class ReportingService:+ """+ Comprehensive reporting and visualization service.+ """++ def __init__(self):+ self.reports = {}++ def generate_position_analysis_report(self,+ positions: pd.DataFrame,+ returns: pd.DataFrame,+ benchmark_returns: Optional[pd.Series] = None) -> Dict[str, Any]:+ """+ Generate position analysis report.++ Args:+ positions: Position weights over time (datetime x instruments)+ returns: Asset returns (datetime x instruments)+ benchmark_returns: Benchmark returns (optional)++ Returns:+ Complete position analysis report+ """+ if not PANDAS_AVAILABLE:+ return {"success": False, "error": "Pandas not available"}++ try:+ # Calculate portfolio returns+ portfolio_returns = (positions.shift(1) * returns).sum(axis=1)++ # Basic metrics+ total_return = (1 + portfolio_returns).prod() - 1+ annual_return = (1 + portfolio_returns).mean() * 252+ volatility = portfolio_returns.std() * np.sqrt(252)+ sharpe = annual_return / volatility if volatility > 0 else 0++ # Drawdown analysis+ cumulative = (1 + portfolio_returns).cumprod()+ running_max = cumulative.expanding().max()+ drawdown = (cumulative - running_max) / running_max+ max_drawdown = drawdown.min()++ report = {+ "success": True,+ "performance_metrics": {+ "total_return": float(total_return),+ "annual_return": float(annual_return),+ "volatility": float(volatility),+ "sharpe_ratio": float(sharpe),+ "max_drawdown": float(max_drawdown)+ },+ "portfolio_stats": {+ "num_positions": int(positions.shape[1]),+ "avg_num_holdings": float((positions > 0).sum(axis=1).mean()),+ "avg_position_size": float(positions[positions > 0].mean().mean()),+ "concentration": float(positions.max(axis=1).mean())+ }+ }++ # Benchmark comparison if provided+ if benchmark_returns is not None:+ excess_returns = portfolio_returns - benchmark_returns+ tracking_error = excess_returns.std() * np.sqrt(252)+ information_ratio = excess_returns.mean() * 252 / tracking_error if tracking_error > 0 else 0++ report["benchmark_comparison"] = {+ "excess_return": float(excess_returns.mean() * 252),+ "tracking_error": float(tracking_error),+ "information_ratio": float(information_ratio)+ }++ # Generate visualization data+ report["visualization_data"] = {+ "cumulative_returns": cumulative.to_dict(),+ "drawdown_series": drawdown.to_dict(),+ "position_concentration": (positions > 0).sum(axis=1).to_dict()+ }++ return report++ except Exception as e:+ return {"success": False, "error": f"Report generation failed: {str(e)}"}++ def generate_ic_analysis_report(self,+ predictions: pd.DataFrame,+ returns: pd.DataFrame,+ method: str = "both") -> Dict[str, Any]:+ """+ Generate IC analysis report with graphs.++ Args:+ predictions: Model predictions+ returns: Actual returns+ method: 'pearson', 'spearman', or 'both'++ Returns:+ IC analysis report with visualization data+ """+ if not PANDAS_AVAILABLE:+ return {"success": False, "error": "Pandas not available"}++ try:+ from scipy.stats import pearsonr, spearmanr++ common_dates = predictions.index.intersection(returns.index)+ common_instruments = predictions.columns.intersection(returns.columns)++ # Calculate IC for each date+ ic_series = []+ rank_ic_series = []++ for date in common_dates:+ pred_vals = predictions.loc[date, common_instruments].dropna()+ ret_vals = returns.loc[date, common_instruments].dropna()++ common_inst = pred_vals.index.intersection(ret_vals.index)+ if len(common_inst) < 10:+ continue++ pred = pred_vals[common_inst].values+ ret = ret_vals[common_inst].values++ # Pearson IC+ if method in ['pearson', 'both']:+ ic, _ = pearsonr(pred, ret)+ ic_series.append({"date": str(date), "ic": float(ic)})++ # Spearman IC (Rank IC)+ if method in ['spearman', 'both']:+ rank_ic, _ = spearmanr(pred, ret)+ rank_ic_series.append({"date": str(date), "rank_ic": float(rank_ic)})++ # Calculate statistics+ if ic_series:+ ic_values = [x["ic"] for x in ic_series]+ ic_mean = np.mean(ic_values)+ ic_std = np.std(ic_values)+ ic_ir = ic_mean / ic_std if ic_std > 0 else 0+ else:+ ic_mean = ic_std = ic_ir = 0++ if rank_ic_series:+ rank_ic_values = [x["rank_ic"] for x in rank_ic_series]+ rank_ic_mean = np.mean(rank_ic_values)+ rank_ic_std = np.std(rank_ic_values)+ rank_ic_ir = rank_ic_mean / rank_ic_std if rank_ic_std > 0 else 0+ else:+ rank_ic_mean = rank_ic_std = rank_ic_ir = 0++ report = {+ "success": True,+ "ic_metrics": {+ "ic_mean": float(ic_mean),+ "ic_std": float(ic_std),+ "icir": float(ic_ir),+ "ic_positive_rate": float(sum(1 for ic in ic_values if ic > 0) / len(ic_values)) if ic_values else 0+ },+ "rank_ic_metrics": {+ "rank_ic_mean": float(rank_ic_mean),+ "rank_ic_std": float(rank_ic_std),+ "rank_icir": float(rank_ic_ir)+ },+ "visualization_data": {+ "ic_series": ic_series,+ "rank_ic_series": rank_ic_series+ }+ }++ return report++ except Exception as e:+ return {"success": False, "error": f"IC analysis failed: {str(e)}"}++ def generate_cumulative_return_graph(self,+ returns: pd.Series,+ benchmark_returns: Optional[pd.Series] = None,+ title: str = "Cumulative Returns") -> Dict[str, Any]:+ """+ Generate cumulative return visualization data.++ Args:+ returns: Portfolio returns+ benchmark_returns: Benchmark returns (optional)+ title: Graph title++ Returns:+ Visualization data+ """+ if not PANDAS_AVAILABLE:+ return {"success": False, "error": "Pandas not available"}++ try:+ cumulative_returns = (1 + returns).cumprod()++ graph_data = {+ "success": True,+ "title": title,+ "dates": [str(d) for d in cumulative_returns.index],+ "portfolio_returns": cumulative_returns.tolist(),+ }++ if benchmark_returns is not None:+ cumulative_benchmark = (1 + benchmark_returns).cumprod()+ graph_data["benchmark_returns"] = cumulative_benchmark.tolist()++ # Plotly graph if available+ if PLOTLY_AVAILABLE:+ fig = go.Figure()++ fig.add_trace(go.Scatter(+ x=cumulative_returns.index,+ y=cumulative_returns.values,+ mode='lines',+ name='Portfolio',+ line=dict(color='#2E86DE', width=2)+ ))++ if benchmark_returns is not None:+ fig.add_trace(go.Scatter(+ x=cumulative_benchmark.index,+ y=cumulative_benchmark.values,+ mode='lines',+ name='Benchmark',+ line=dict(color='#EE5A6F', width=2, dash='dash')+ ))++ fig.update_layout(+ title=title,+ xaxis_title="Date",+ yaxis_title="Cumulative Return",+ hovermode='x unified',+ template='plotly_white'+ )++ graph_data["plotly_json"] = fig.to_json()++ return graph_data++ except Exception as e:+ return {"success": False, "error": f"Graph generation failed: {str(e)}"}++ def generate_risk_analysis_graph(self,+ returns: pd.Series,+ title: str = "Risk Analysis") -> Dict[str, Any]:+ """+ Generate risk analysis visualization.++ Args:+ returns: Portfolio returns+ title: Graph title++ Returns:+ Risk analysis visualization data+ """+ if not PANDAS_AVAILABLE:+ return {"success": False, "error": "Pandas not available"}++ try:+ # Calculate metrics+ cumulative = (1 + returns).cumprod()+ running_max = cumulative.expanding().max()+ drawdown = (cumulative - running_max) / running_max++ # Rolling volatility+ rolling_vol = returns.rolling(window=20).std() * np.sqrt(252)++ graph_data = {+ "success": True,+ "title": title,+ "dates": [str(d) for d in returns.index],+ "drawdown": drawdown.tolist(),+ "rolling_volatility": rolling_vol.tolist(),+ "max_drawdown": float(drawdown.min()),+ "avg_volatility": float(rolling_vol.mean())+ }++ # Plotly graph if available+ if PLOTLY_AVAILABLE:+ fig = make_subplots(+ rows=2, cols=1,+ subplot_titles=('Drawdown', 'Rolling Volatility'),+ vertical_spacing=0.12+ )++ # Drawdown+ fig.add_trace(go.Scatter(+ x=drawdown.index,+ y=drawdown.values,+ mode='lines',+ name='Drawdown',+ line=dict(color='#E74C3C', width=2),+ fill='tozeroy'+ ), row=1, col=1)++ # Rolling volatility+ fig.add_trace(go.Scatter(+ x=rolling_vol.index,+ y=rolling_vol.values,+ mode='lines',+ name='Rolling Vol (20d)',+ line=dict(color='#9B59B6', width=2)+ ), row=2, col=1)++ fig.update_layout(+ title=title,+ hovermode='x unified',+ template='plotly_white',+ height=600+ )++ graph_data["plotly_json"] = fig.to_json()++ return graph_data++ except Exception as e:+ return {"success": False, "error": f"Risk graph generation failed: {str(e)}"}++ def generate_model_performance_report(self,+ predictions: pd.DataFrame,+ returns: pd.DataFrame,+ model_name: str = "Model") -> Dict[str, Any]:+ """+ Generate model performance report.++ Args:+ predictions: Model predictions+ returns: Actual returns+ model_name: Model name++ Returns:+ Model performance report+ """+ try:+ # IC analysis+ ic_report = self.generate_ic_analysis_report(predictions, returns)++ # Quantile analysis+ from qlib_evaluation import EvaluationService+ eval_service = EvaluationService()+ quantile_analysis = eval_service.analyze_factor_returns(predictions, returns, quantiles=5)++ report = {+ "success": True,+ "model_name": model_name,+ "ic_analysis": ic_report,+ "quantile_analysis": quantile_analysis,+ "summary": {+ "ic": ic_report.get("ic_metrics", {}).get("ic_mean", 0),+ "icir": ic_report.get("ic_metrics", {}).get("icir", 0),+ "long_short_sharpe": quantile_analysis.get("long_short_sharpe", 0),+ "rating": self._get_model_rating(+ ic_report.get("ic_metrics", {}).get("icir", 0),+ quantile_analysis.get("long_short_sharpe", 0)+ )+ }+ }++ return report++ except Exception as e:+ return {"success": False, "error": f"Model performance report failed: {str(e)}"}++ def _get_model_rating(self, icir: float, sharpe: float) -> str:+ """Calculate model rating based on ICIR and Sharpe"""+ score = icir * 0.5 + sharpe * 0.5++ if score >= 2.5:+ return "Excellent"+ elif score >= 1.5:+ return "Good"+ elif score >= 0.8:+ return "Fair"+ elif score >= 0.3:+ return "Poor"+ else:+ return "Very Poor"++ def export_report(self,+ report_data: Dict[str, Any],+ format: str = "json",+ filepath: Optional[str] = None) -> Dict[str, Any]:+ """+ Export report to file.++ Args:+ report_data: Report data to export+ format: Export format ('json', 'html')+ filepath: File path (optional)++ Returns:+ Export result+ """+ try:+ if format == "json":+ if filepath:+ with open(filepath, 'w') as f:+ json.dump(report_data, f, indent=2)+ return {+ "success": True,+ "format": "json",+ "filepath": filepath,+ "data": report_data+ }++ elif format == "html":+ html_content = self._generate_html_report(report_data)+ if filepath:+ with open(filepath, 'w') as f:+ f.write(html_content)+ return {+ "success": True,+ "format": "html",+ "filepath": filepath,+ "html": html_content+ }++ else:+ return {"success": False, "error": f"Unknown format: {format}"}++ except Exception as e:+ return {"success": False, "error": f"Export failed: {str(e)}"}++ def _generate_html_report(self, report_data: Dict[str, Any]) -> str:+ """Generate HTML report"""+ html = f"""+ <!DOCTYPE html>+ <html>+ <head>+ <title>Qlib Analysis Report</title>+ <style>+ body {{ font-family: Arial, sans-serif; margin: 20px; }}+ h1 {{ color: #2E86DE; }}+ h2 {{ color: #555; }}+ table {{ border-collapse: collapse; width: 100%; margin: 20px 0; }}+ th, td {{ border: 1px solid #ddd; padding: 12px; text-align: left; }}+ th {{ background-color: #2E86DE; color: white; }}+ .metric {{ background-color: #f9f9f9; padding: 15px; margin: 10px 0; border-left: 4px solid #2E86DE; }}+ </style>+ </head>+ <body>+ <h1>Qlib Analysis Report</h1>+ <p>Generated: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}</p>++ <h2>Summary</h2>+ <pre>{json.dumps(report_data, indent=2)}</pre>+ </body>+ </html>+ """+ return html+++def main():+ """CLI interface"""+ if len(sys.argv) < 2:+ print(json.dumps({"success": False, "error": "No command specified"}))+ sys.exit(1)++ command = sys.argv[1]+ service = ReportingService()++ try:+ params = json.loads(sys.argv[2]) if len(sys.argv) > 2 else {}++ if command == "check_status":+ result = {+ "success": True,+ "pandas_available": PANDAS_AVAILABLE,+ "plotly_available": PLOTLY_AVAILABLE,+ "matplotlib_available": MATPLOTLIB_AVAILABLE+ }++ elif command == "position_analysis":+ result = service.generate_position_analysis_report(+ positions=params.get("positions", {}),+ returns=params.get("returns", []),+ benchmark_returns=params.get("benchmark_returns")+ )++ elif command == "ic_analysis":+ result = service.generate_ic_analysis_report(+ predictions=params.get("predictions", []),+ returns=params.get("returns", []),+ method=params.get("method", "both")+ )++ elif command == "cumulative_return_graph":+ result = service.generate_cumulative_return_graph(+ returns=params.get("returns", []),+ benchmark_returns=params.get("benchmark_returns"),+ title=params.get("title", "Cumulative Returns")+ )++ elif command == "risk_analysis_graph":+ result = service.generate_risk_analysis_graph(+ returns=params.get("returns", []),+ title=params.get("title", "Risk Analysis")+ )++ elif command == "model_performance":+ result = service.generate_model_performance_report(+ predictions=params.get("predictions", []),+ returns=params.get("returns", []),+ model_name=params.get("model_name", "Model")+ )++ elif command == "export_report":+ result = service.export_report(+ report_data=params.get("report_data", {}),+ format=params.get("format", "json"),+ filepath=params.get("filepath")+ )++ else:+ result = {"success": False, "error": f"Unknown command: {command}"}++ print(json.dumps(result))++ except Exception as e:+ print(json.dumps({"success": False, "error": str(e)}))+ sys.exit(1)+++if __name__ == "__main__":+ main()diff --git a/fincept-qt/scripts/exchange/resolve_kraken_symbols.py b/fincept-qt/scripts/exchange/resolve_kraken_symbols.pynew file mode 100644index 000000000..b33eb309a--- /dev/null+++ b/fincept-qt/scripts/exchange/resolve_kraken_symbols.py@@ -0,0 +1,95 @@+"""+Resolve a list of Fincept symbols (e.g. ['BTC/USDT','MATIC/USDT']) to actual+Kraken-listed symbols using ccxt.kraken.load_markets(). One-shot helper for+the native KrakenWsClient — runs once at WS startup.++Usage: python resolve_kraken_symbols.py SYM1 SYM2 SYM3 ...+Output: one JSON object on stdout with shape:+ {"resolved": {"BTC/USDT": "BTC/USDT", "MATIC/USDT": "POL/USD", ...}}+Symbols with no match map to null.++Resolution strategy (in order):+ 1. Exact match in k.symbols+ 2. Same base, /USD quote+ 3. Known rebrand (MATIC -> POL)+ 4. Same base, any /USD-stable quote (USDC, USDT)+ 5. Same base, any quote (lowest-volume tiebreaker by alphabetical)+"""+import json+import sys++# Known rebrands. Kraken occasionally renames a base asset (e.g. Polygon's+# MATIC → POL on Sep 2024). When we ask for the old name and it's gone, fall+# back to the new one BEFORE the generic /USD search.+REBRANDS = {+ "MATIC": "POL",+ # add more here as Kraken keeps renaming things+}+++def resolve_one(symbol: str, market_symbols: set, markets: dict) -> str | None:+ if symbol in market_symbols:+ return symbol++ base, _, quote = symbol.partition("/")+ base = base.upper()+ if not base:+ return None++ # Strip any settle suffix the caller might have included (BTC/USDT:USDT).+ quote = quote.split(":")[0].upper() if quote else "USDT"++ candidates = [+ f"{base}/USD",+ f"{base}/USDT",+ f"{base}/USDC",+ ]++ rebranded = REBRANDS.get(base)+ if rebranded:+ candidates = [f"{rebranded}/USD", f"{rebranded}/USDT", f"{rebranded}/USDC"] + candidates++ for c in candidates:+ if c in market_symbols:+ return c++ # Final fallback: any /USD-stable, prefer the rebranded base if any.+ bases = [base]+ if rebranded:+ bases.insert(0, rebranded)+ for b in bases:+ for s in sorted(market_symbols):+ if s.startswith(b + "/"):+ return s+ return None+++def main() -> None:+ if len(sys.argv) < 2:+ print(json.dumps({"error": "usage: resolve_kraken_symbols.py SYM ..."}))+ sys.exit(1)++ requested = sys.argv[1:]++ try:+ import ccxt+ except ImportError:+ print(json.dumps({"error": "ccxt not installed"}))+ sys.exit(2)++ try:+ kraken = ccxt.kraken({"enableRateLimit": True})+ kraken.load_markets()+ except Exception as e:+ print(json.dumps({"error": f"load_markets failed: {e}"}))+ sys.exit(3)++ market_symbols = set(kraken.symbols or [])+ markets = kraken.markets or {}++ resolved = {sym: resolve_one(sym, market_symbols, markets) for sym in requested}+ print(json.dumps({"resolved": resolved}))+++if __name__ == "__main__":+ main()diff --git a/fincept-qt/src/ai_chat/AiChatBubble.cpp b/fincept-qt/src/ai_chat/AiChatBubble.cppindex 629811822..c57840905 100644--- a/fincept-qt/src/ai_chat/AiChatBubble.cpp+++ b/fincept-qt/src/ai_chat/AiChatBubble.cpp@@ -14,6 +14,7 @@#include "ai_chat/AiChatBubble.h"+#include "ai_chat/ChatBubbleFactory.h"#include "services/stt/SpeechService.h"#include "services/tts/TtsService.h"#include "services/voice_trigger/ClapDetectorService.h"@@ -25,7 +26,6 @@#include <QGraphicsOpacityEffect>#include <QHBoxLayout>#include <QLabel>-#include <QPalette>#include <QPropertyAnimation>#include <QRegularExpression>#include <QResizeEvent>@@ -48,42 +48,9 @@ static constexpr int HEADER_H = 56;static constexpr int INPUT_H = 60;static constexpr int STATUS_H = 26;-// Override Qt's default blue palette on QTextEdit to match the Obsidian theme.-static void apply_obsidian_palette(QTextEdit* edit) {- QPalette p = edit->palette();- p.setColor(QPalette::Link, QColor(col::AMBER()));- p.setColor(QPalette::LinkVisited, QColor(col::AMBER()));- p.setColor(QPalette::Highlight, QColor(col::AMBER_DIM()));- p.setColor(QPalette::HighlightedText, QColor(col::TEXT_PRIMARY()));- p.setColor(QPalette::Base, Qt::transparent);- p.setColor(QPalette::Text, QColor(col::TEXT_PRIMARY()));- edit->setPalette(p);-}--// Compact Markdown CSS used inside message bubbles.-static QString bubble_md_css(const QString& text_color) {- return QString("body { color: %1; line-height: 1.45; }"- "p { margin-top: 4px; margin-bottom: 4px; }"- "ul, ol { margin-top: 3px; margin-bottom: 3px; padding-left: 16px; }"- "li { margin-top: 2px; margin-bottom: 2px; }"- "h1, h2, h3, h4 { margin-top: 8px; margin-bottom: 3px; color: %2; font-weight: 700; }"- "hr { margin-top: 6px; margin-bottom: 6px; border: none; "- " border-top: 1px solid %3; }"- "a { color: %2; text-decoration: underline; }"- "code { background: %4; color: %2; padding: 1px 3px; "- " font-family: 'Consolas', 'Courier New', monospace; font-size: 12px; }"- "pre { background: %4; border: 1px solid %3; padding: 8px 10px; "- " margin-top: 4px; margin-bottom: 4px; "- " font-family: 'Consolas', 'Courier New', monospace; font-size: 12px; }"- "blockquote { border-left: 2px solid %2; padding-left: 8px; "- " margin-top: 4px; margin-bottom: 4px; color: %5; }"- "table { border-collapse: collapse; margin-top: 4px; margin-bottom: 4px; }"- "th { background: %4; border: 1px solid %3; padding: 3px 6px; "- " font-weight: 600; color: %2; }"- "td { border: 1px solid %3; padding: 3px 6px; }"- "strong { color: %1; font-weight: 700; }")- .arg(text_color, col::AMBER(), col::BORDER_MED(), col::BG_BASE(), col::TEXT_SECONDARY());-}+// Bubble visuals are owned by ChatBubbleFactory — shared with AiChatScreen.+// The bubble passes a smaller column max width than the full-width tab.+static constexpr int kBubbleColMaxWidth = static_cast<int>(PANEL_W * 0.84);// ── Constructor ───────────────────────────────────────────────────────────────AiChatBubble::AiChatBubble(QWidget* parent) : QWidget(parent) {@@ -559,8 +526,10 @@ void AiChatBubble::on_send() {// Defer streaming bubble creation to the first non-empty chunk.QPointer<AiChatBubble> self = this;auto first_chunk = std::make_shared<bool>(true);- // use_tools=false — the floating bubble must never trigger navigation- // or other tool side-effects that hijack the user's current screen.+ // ToolPolicy::NoNavigation — the floating bubble lets the model use tools+ // (so "add SPGI to my watchlist" works), but hides the `navigation`+ // category so the model can't yank the user out of their current screen+ // by calling navigate_to_tab / list_tabs / get_current_tab.ai_chat::LlmService::instance().chat_streaming(text, chat_history_,[self, first_chunk](const QString& chunk, bool done) {@@ -577,16 +546,15 @@ void AiChatBubble::on_send() {},Qt::QueuedConnection);},- /*use_tools=*/false);+ ai_chat::LlmService::ToolPolicy::NoNavigation);}void AiChatBubble::on_stream_chunk(const QString& chunk, bool done) {- QTextEdit* bubble = streaming_bubble_;+ QLabel* bubble = streaming_bubble_;if (!bubble)return;if (!chunk.isEmpty()) {- bubble->moveCursor(QTextCursor::End);- bubble->insertPlainText(chunk);+ fincept::ai_chat::ChatBubbleFactory::append_streaming_chunk(bubble, chunk);scroll_to_bottom();}Q_UNUSED(done)@@ -599,18 +567,13 @@ void AiChatBubble::on_streaming_done(ai_chat::LlmResponse response) {const QString content = response.success ? response.content: QString("Error: %1").arg(response.error);- if (!streaming_bubble_ && !content.isEmpty()) {+ if (!streaming_bubble_ && !content.isEmpty())streaming_bubble_ = add_streaming_bubble();- streaming_bubble_->setPlainText(content);- }if (streaming_bubble_) {- const QString final_text = streaming_bubble_->toPlainText();- if (!final_text.isEmpty()) {- streaming_bubble_->document()->setDefaultStyleSheet(bubble_md_css(col::TEXT_PRIMARY()));- streaming_bubble_->setMarkdown(final_text);- }- streaming_bubble_->setReadOnly(true);+ const QString acc = streaming_bubble_->property("acc").toString();+ const QString final_text = acc.isEmpty() ? content : acc;+ fincept::ai_chat::ChatBubbleFactory::finalize_streaming(streaming_bubble_, final_text);streaming_bubble_ = nullptr;}@@ -629,118 +592,27 @@ void AiChatBubble::on_streaming_done(ai_chat::LlmResponse response) {// ── Message bubbles ───────────────────────────────────────────────────────────void AiChatBubble::add_bubble(const QString& role, const QString& text) {- const bool is_user = (role == "user");-- auto* row = new QWidget;- row->setStyleSheet("background:transparent;");- auto* rl = new QHBoxLayout(row);- rl->setContentsMargins(0, 0, 0, 0);- rl->setSpacing(0);-- if (is_user)- rl->addStretch();-- auto* col_w = new QWidget;- col_w->setStyleSheet("background:transparent;");- col_w->setMaximumWidth(static_cast<int>(PANEL_W * 0.84));- auto* cvl = new QVBoxLayout(col_w);- cvl->setContentsMargins(0, 0, 0, 0);- cvl->setSpacing(3);-- auto* role_lbl = new QLabel(is_user ? "You" : "AI");- role_lbl->setAlignment(is_user ? Qt::AlignRight : Qt::AlignLeft);- role_lbl->setStyleSheet(QString("color:%1;font-size:10px;font-weight:700;background:transparent;")- .arg(col::AMBER()));- cvl->addWidget(role_lbl);-- auto* body = new QTextEdit;- body->setReadOnly(true);- body->setFrameShape(QFrame::NoFrame);- body->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);- body->document()->setDocumentMargin(0);- body->document()->setDefaultStyleSheet(bubble_md_css(is_user ? "#fff7ed" : col::TEXT_PRIMARY()));- apply_obsidian_palette(body);- body->setMarkdown(text);- body->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);- body->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);- const int inner_w = static_cast<int>(PANEL_W * 0.84) - 18;- body->document()->setTextWidth(inner_w);- body->setStyleSheet(QString("QTextEdit{background:transparent;color:%1;border:none;"- "font-size:13px;padding:0px;}")- .arg(is_user ? "#fff7ed" : col::TEXT_PRIMARY()));- const int doc_h = static_cast<int>(body->document()->size().height());- body->setFixedHeight(qMax(doc_h, 18));-- auto* bubble_frame = new QWidget;- bubble_frame->setStyleSheet(QString("background:%1;border:1px solid %2;border-radius:0px;")- .arg(is_user ? "rgba(120,53,15,0.45)" : col::BG_SURFACE(),- is_user ? "rgba(217,119,6,0.28)" : col::BORDER_DIM()));- auto* bvl = new QVBoxLayout(bubble_frame);- bvl->setContentsMargins(9, 6, 9, 6);- bvl->setSpacing(0);- bvl->addWidget(body);- cvl->addWidget(bubble_frame);-- rl->addWidget(col_w);- if (!is_user)- rl->addStretch();-- msg_layout_->insertWidget(msg_layout_->count() - 1, row);+ fincept::ai_chat::ChatBubbleFactory::Options opts;+ opts.role = role;+ opts.content = text;+ opts.show_footer = true;+ opts.user_col_max_width = kBubbleColMaxWidth;+ opts.ai_col_max_width = kBubbleColMaxWidth;+ auto b = fincept::ai_chat::ChatBubbleFactory::build(opts);+ msg_layout_->insertWidget(msg_layout_->count() - 1, b.row);scroll_to_bottom();}-QTextEdit* AiChatBubble::add_streaming_bubble() {- auto* row = new QWidget;- row->setStyleSheet("background:transparent;");- auto* rl = new QHBoxLayout(row);- rl->setContentsMargins(0, 0, 0, 0);-- auto* col_w = new QWidget;- col_w->setStyleSheet("background:transparent;");- col_w->setMaximumWidth(static_cast<int>(PANEL_W * 0.84));- auto* cvl = new QVBoxLayout(col_w);- cvl->setContentsMargins(0, 0, 0, 0);- cvl->setSpacing(3);-- auto* role_lbl = new QLabel("AI");- role_lbl->setAlignment(Qt::AlignLeft);- role_lbl->setStyleSheet(QString("color:%1;font-size:10px;font-weight:700;background:transparent;")- .arg(col::AMBER()));- cvl->addWidget(role_lbl);-- auto* body = new QTextEdit;- body->setReadOnly(false);- body->setFrameShape(QFrame::NoFrame);- body->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);- body->document()->setDocumentMargin(0);- body->document()->setDefaultStyleSheet(bubble_md_css(col::TEXT_PRIMARY()));- apply_obsidian_palette(body);- body->setFixedHeight(20);- body->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);- body->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);- body->setWordWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);- body->setStyleSheet(QString("QTextEdit{background:%1;color:%2;border:1px solid %3;"- "border-radius:0px;padding:6px 9px;font-size:13px;}")- .arg(col::BG_SURFACE(), col::TEXT_PRIMARY(), col::BORDER_DIM()));-- connect(body->document(), &QTextDocument::contentsChanged, body, [body, col_w, row]() {- const int vw = body->viewport()->width() > 0- ? body->viewport()->width()- : (static_cast<int>(PANEL_W * 0.84) - 18);- body->document()->setTextWidth(vw);- const int h = qMax(static_cast<int>(body->document()->size().height()), 20);- body->setFixedHeight(h);- col_w->adjustSize();- row->adjustSize();- });-- cvl->addWidget(body);- rl->addWidget(col_w);- rl->addStretch();-- msg_layout_->insertWidget(msg_layout_->count() - 1, row);+QLabel* AiChatBubble::add_streaming_bubble() {+ fincept::ai_chat::ChatBubbleFactory::Options opts;+ opts.role = "assistant";+ opts.show_footer = true;+ opts.user_col_max_width = kBubbleColMaxWidth;+ opts.ai_col_max_width = kBubbleColMaxWidth;+ auto b = fincept::ai_chat::ChatBubbleFactory::build_streaming(opts);+ msg_layout_->insertWidget(msg_layout_->count() - 1, b.row);scroll_to_bottom();- return body;+ return b.body;}void AiChatBubble::scroll_to_bottom() {diff --git a/fincept-qt/src/ai_chat/AiChatBubble.h b/fincept-qt/src/ai_chat/AiChatBubble.hindex 35b670dcb..74eed9742 100644--- a/fincept-qt/src/ai_chat/AiChatBubble.h+++ b/fincept-qt/src/ai_chat/AiChatBubble.h@@ -24,7 +24,6 @@#include <QPointer>#include <QPushButton>#include <QScrollArea>-#include <QTextEdit>#include <QTimer>#include <QVBoxLayout>#include <QWidget>@@ -95,7 +94,7 @@ class AiChatBubble : public QWidget {/// the bubble is to stay separate from the AI Chat tab.std::vector<ai_chat::ConversationMessage> chat_history_;- QPointer<QTextEdit> streaming_bubble_;+ QPointer<QLabel> streaming_bubble_;// ── Build helpers ────────────────────────────────────────────────────────void build_bubble_button();@@ -112,7 +111,7 @@ class AiChatBubble : public QWidget {void show_welcome_if_empty();void hide_welcome();void add_bubble(const QString& role, const QString& text);- QTextEdit* add_streaming_bubble();+ QLabel* add_streaming_bubble();void scroll_to_bottom();void set_input_enabled(bool enabled);void update_unread(int delta);diff --git a/fincept-qt/src/ai_chat/AiChatScreen.cpp b/fincept-qt/src/ai_chat/AiChatScreen.cppindex 0407ce89c..24f4879b0 100644--- a/fincept-qt/src/ai_chat/AiChatScreen.cpp+++ b/fincept-qt/src/ai_chat/AiChatScreen.cpp@@ -2,6 +2,7 @@#include "ai_chat/AiChatScreen.h"+#include "ai_chat/ChatBubbleFactory.h"#include "ai_chat/LlmService.h"#include "core/events/EventBus.h"#include "core/logging/Logger.h"@@ -48,51 +49,12 @@ static constexpr const char* TAG = "AiChatScreen";namespace fnt = fincept::ui::fonts;namespace col = fincept::ui::colors;-// ── Bubble sizing ─────────────────────────────────────────────────────────────-//-// Approach: QLabel with setWordWrap(true) + setMaximumWidth(N). QLabel's-// built-in heightForWidth() handles height computation natively — no manual-// measurement, no clone tricks, no crop risk. The label grows vertically as-// text is set, and the surrounding QVBoxLayout picks that up automatically.-//-// These are the only sizing numbers we need: the column max widths and the-// horizontal padding that bubble_style() bakes into the QFrame CSS. Inner-// label width = col - 2 * padding_x.--// Column widths (max). User bubbles are narrower so their right-aligned layout-// floats toward the right edge; AI bubbles get more room.+// Bubble visuals live in ChatBubbleFactory — shared with AiChatBubble.+// Only the column max widths are local config: the tab gets more horizontal+// room than the floating bubble.static constexpr int kUserColMaxWidth = 560;static constexpr int kAiColMaxWidth = 680;-// Horizontal CSS padding in bubble_style(): "padding:10px 14px".-static constexpr int kBubblePadX = 14;--// The width QLabel should wrap at — the bubble's inner text area.-static int bubble_inner_width(bool is_user) {- return (is_user ? kUserColMaxWidth : kAiColMaxWidth) - 2 * kBubblePadX;-}--// ── Style helpers ─────────────────────────────────────────────────────────────--static QString bubble_style(const QString& role) {- if (role == "user")- return "background:rgba(120,53,15,0.45);border:1px solid rgba(217,119,6,0.28);"- "border-radius:0px;padding:10px 14px;";- if (role == "system")- return "background:rgba(50,12,12,0.85);border:1px solid rgba(220,38,38,0.22);"- "border-radius:0px;padding:10px 14px;";- return QString("background:%1;border:1px solid %2;border-radius:0px;padding:10px 14px;")- .arg(col::BG_SURFACE(), col::BORDER_DIM());-}--static QString body_color(const QString& role) {- if (role == "user")- return "#fff7ed";- if (role == "system")- return "#fee2e2";- return col::TEXT_PRIMARY();-}-static QString generate_session_title() {static const QStringList prefixes = {"Amber", "Apex", "Atlas", "Echo", "Flux", "Nova", "Slate", "Vector"};static const QStringList nouns = {"Brief", "Drift", "Focus", "Ledger", "Macro", "Pulse", "Signal", "Tape"};@@ -1008,21 +970,13 @@ void AiChatScreen::on_stream_chunk(const QString& chunk, bool done) {// Tool-call clear sentinel: reset bubble content (removes partial XML)if (chunk.startsWith("\x01__TOOL_CALL_CLEAR__")) {- bubble->setProperty("acc", QString("Calling tool..."));- bubble->setText("Calling tool...");+ fincept::ai_chat::ChatBubbleFactory::replace_streaming_text(bubble, "Calling tool...");scroll_to_bottom();return;}if (!chunk.isEmpty()) {- QString acc = bubble->property("acc").toString();- // If bubble shows the "Calling tool..." placeholder, replace it- if (acc == "Calling tool...")- acc = chunk;- else- acc += chunk;- bubble->setProperty("acc", acc);- bubble->setText(acc);+ fincept::ai_chat::ChatBubbleFactory::append_streaming_chunk(bubble, chunk);scroll_to_bottom();}Q_UNUSED(done)@@ -1032,42 +986,51 @@ void AiChatScreen::on_streaming_done(ai_chat::LlmResponse response) {streaming_ = false;show_typing(false);- // If non-streaming path: create bubble now with full content- if (!streaming_bubble_ && response.success && !response.content.isEmpty()) {+ // Ensure a bubble exists for any terminal state (success + content,+ // failure with an error message, or success-but-empty). Without this,+ // a kimi/openai response that arrives via the non-streaming fallback+ // with no per-chunk emission, or fails before any chunk lands, would+ // be silently dropped — the typing indicator hides and the input is+ // re-enabled but nothing is shown.+ const bool need_bubble = !streaming_bubble_ &&+ ((response.success && !response.content.isEmpty()) ||+ !response.success ||+ response.content.isEmpty());+ if (need_bubble)streaming_bubble_ = add_streaming_bubble();- }set_input_enabled(true);if (!response.success) {if (streaming_bubble_) {- const QString err = "Error: " + response.error;- streaming_bubble_->setProperty("acc", err);- streaming_bubble_->setText(err);+ const QString err = response.error.isEmpty() ? QStringLiteral("Error: request failed")+ : (QStringLiteral("Error: ") + response.error);+ fincept::ai_chat::ChatBubbleFactory::replace_streaming_text(streaming_bubble_, err);}+ LOG_WARN("AiChat", QString("LLM request failed: %1").arg(response.error));streaming_bubble_ = nullptr;return;}- const QString content = response.content;- if (streaming_bubble_) {- // Get final text (either from response or what was streamed)- QString final_text = streaming_bubble_->property("acc").toString();- if (!content.isEmpty() && final_text.isEmpty())- final_text = content;- // Re-render as markdown so **bold**, - lists, code blocks, etc. display properly.- // Switching format on QLabel re-parses; no manual measurement needed.- if (!final_text.isEmpty()) {- streaming_bubble_->setTextFormat(Qt::MarkdownText);- streaming_bubble_->setText(final_text);- streaming_bubble_->setProperty("acc", final_text);+ // Success but empty body — surface a hint instead of silently doing nothing.+ if (response.content.isEmpty()) {+ if (streaming_bubble_) {+ const QString hint = QStringLiteral("(empty response — model returned no content)");+ fincept::ai_chat::ChatBubbleFactory::replace_streaming_text(streaming_bubble_, hint);}+ LOG_WARN("AiChat", "LLM returned success with empty content");+ streaming_bubble_ = nullptr;+ return;+ }- // Show the copy button now that streaming is done- auto* copy_obj = streaming_bubble_->property("copy_btn").value<QObject*>();- if (auto* copy_btn = qobject_cast<QPushButton*>(copy_obj))- copy_btn->show();-+ const QString content = response.content;+ if (streaming_bubble_) {+ // Use accumulated streamed text if present, else fall back to the+ // response body (non-streaming path). finalize_streaming swaps the+ // label to MarkdownText and reveals the copy button.+ const QString acc = streaming_bubble_->property("acc").toString();+ const QString final_text = acc.isEmpty() ? content : acc;+ fincept::ai_chat::ChatBubbleFactory::finalize_streaming(streaming_bubble_, final_text);streaming_bubble_ = nullptr;}if (!content.isEmpty()) {@@ -1090,183 +1053,26 @@ void AiChatScreen::on_provider_changed() {// ── Message bubbles ───────────────────────────────────────────────────────────void AiChatScreen::add_message_bubble(const QString& role, const QString& content, const QString& timestamp) {- const bool is_user = (role == "user");- const bool is_system = (role == "system");-- const QString ts = [&]() -> QString {- QDateTime dt = QDateTime::fromString(timestamp, Qt::ISODate);- if (!dt.isValid())- dt = QDateTime::fromString(timestamp, "yyyy-MM-dd HH:mm:ss");- if (!dt.isValid() && !timestamp.isEmpty())- return timestamp;- return (dt.isValid() ? dt : QDateTime::currentDateTime()).toString("HH:mm");- }();-- auto* row = new QWidget;- row->setStyleSheet("background:transparent;");- auto* rl = new QHBoxLayout(row);- rl->setContentsMargins(0, 0, 0, 0);- rl->setSpacing(0);-- if (is_user)- rl->addStretch();-- auto* col_widget = new QWidget;- col_widget->setStyleSheet("background:transparent;");- col_widget->setMaximumWidth(is_user ? kUserColMaxWidth : kAiColMaxWidth);- auto* cvl = new QVBoxLayout(col_widget);- cvl->setContentsMargins(0, 0, 0, 0);- cvl->setSpacing(4);-- // Role label- auto* role_lbl = new QLabel(is_user ? "You" : (is_system ? "System" : "AI"));- role_lbl->setAlignment(is_user ? Qt::AlignRight : Qt::AlignLeft);- role_lbl->setStyleSheet(QString("color:%1;font-size:%2px;font-weight:600;background:transparent;")- .arg(is_user ? col::AMBER() : (is_system ? col::NEGATIVE() : col::AMBER()))- .arg(fnt::TINY));- cvl->addWidget(role_lbl);-- // Bubble — QLabel auto-sizes to its content via heightForWidth(), so we- // just pin a max width and let Qt do the math. No scrollbars (QLabel has- // none), no clone tricks, no manual height callbacks.- auto* bubble = new QFrame;- bubble->setStyleSheet(bubble_style(role));- auto* bvl = new QVBoxLayout(bubble);- bvl->setContentsMargins(0, 0, 0, 0);-- auto* body = new QLabel;- body->setTextFormat(Qt::MarkdownText);- body->setText(content);- body->setWordWrap(true);- body->setMaximumWidth(bubble_inner_width(is_user));- body->setTextInteractionFlags(Qt::TextBrowserInteraction);- body->setAlignment(Qt::AlignLeft | Qt::AlignTop);- body->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);- body->setStyleSheet(QString("QLabel{background:transparent;color:%1;font-size:%2px;}")- .arg(body_color(role))- .arg(fnt::BODY));- bvl->addWidget(body);- cvl->addWidget(bubble);-- // Footer row: timestamp + copy button- auto* footer = new QWidget;- footer->setStyleSheet("background:transparent;");- auto* fhl = new QHBoxLayout(footer);- fhl->setContentsMargins(0, 0, 0, 0);- fhl->setSpacing(6);-- auto* time_lbl = new QLabel(ts);- time_lbl->setStyleSheet(- QString("color:%1;font-size:%2px;background:transparent;").arg(col::TEXT_DIM()).arg(fnt::TINY));- fhl->addWidget(time_lbl);-- if (!is_user && !is_system) {- fhl->addStretch();- auto* copy_btn = new QPushButton("Copy");- copy_btn->setFixedHeight(20);- copy_btn->setCursor(Qt::PointingHandCursor);- copy_btn->setStyleSheet(QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"- "border-radius:0px;padding:0 8px;font-size:%3px;}"- "QPushButton:hover{background:%2;color:%4;}")- .arg(col::TEXT_DIM(), col::BORDER_MED())- .arg(fnt::TINY)- .arg(col::TEXT_PRIMARY()));- QString plain = content;- connect(copy_btn, &QPushButton::clicked, this, [plain, copy_btn]() {- QApplication::clipboard()->setText(plain);- copy_btn->setText("Copied!");- QTimer::singleShot(1500, copy_btn, [copy_btn]() { copy_btn->setText("Copy"); });- });- fhl->addWidget(copy_btn);- }-- if (is_user)- fhl->insertStretch(0);- cvl->addWidget(footer);-- rl->addWidget(col_widget);- if (!is_user)- rl->addStretch();-- messages_layout_->insertWidget(messages_layout_->count() - 1, row);+ fincept::ai_chat::ChatBubbleFactory::Options opts;+ opts.role = role;+ opts.content = content;+ opts.timestamp_iso = timestamp;+ opts.show_footer = true;+ opts.user_col_max_width = kUserColMaxWidth;+ opts.ai_col_max_width = kAiColMaxWidth;+ auto b = fincept::ai_chat::ChatBubbleFactory::build(opts);+ messages_layout_->insertWidget(messages_layout_->count() - 1, b.row);}QLabel* AiChatScreen::add_streaming_bubble() {- auto* row = new QWidget;- row->setStyleSheet("background:transparent;");- auto* rl = new QHBoxLayout(row);- rl->setContentsMargins(0, 0, 0, 0);-- auto* col_widget = new QWidget;- col_widget->setStyleSheet("background:transparent;");- col_widget->setMaximumWidth(kAiColMaxWidth);- auto* cvl = new QVBoxLayout(col_widget);- cvl->setContentsMargins(0, 0, 0, 0);- cvl->setSpacing(4);-- auto* role_lbl = new QLabel("AI");- role_lbl->setAlignment(Qt::AlignLeft);- role_lbl->setStyleSheet(- QString("color:%1;font-size:%2px;font-weight:600;background:transparent;").arg(col::AMBER()).arg(fnt::TINY));- cvl->addWidget(role_lbl);-- auto* bubble = new QFrame;- bubble->setStyleSheet(bubble_style("assistant"));- auto* bvl = new QVBoxLayout(bubble);- bvl->setContentsMargins(0, 0, 0, 0);-- // Streaming body — QLabel with plain-text format during streaming (appending- // chunks as markdown would re-parse on every token; waste). on_streaming_done- // switches to Qt::MarkdownText and re-renders the final accumulated text.- // Accumulated text is stored on the widget as a dynamic property "acc" so- // chunk handlers don't need external state.- auto* body = new QLabel;- body->setTextFormat(Qt::PlainText);- body->setText({});- body->setProperty("acc", QString{});- body->setWordWrap(true);- body->setMaximumWidth(bubble_inner_width(/*is_user=*/false));- body->setTextInteractionFlags(Qt::TextBrowserInteraction);- body->setAlignment(Qt::AlignLeft | Qt::AlignTop);- body->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);- body->setStyleSheet(QString("QLabel{background:transparent;color:%1;font-size:%2px;}")- .arg(col::TEXT_PRIMARY())- .arg(fnt::BODY));- bvl->addWidget(body);- cvl->addWidget(bubble);-- // Copy button — hidden during streaming, shown when done- auto* copy_btn = new QPushButton("Copy");- copy_btn->setFixedHeight(20);- copy_btn->setCursor(Qt::PointingHandCursor);- copy_btn->setStyleSheet(QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"- "border-radius:0px;padding:0 8px;font-size:%3px;}"- "QPushButton:hover{background:%2;color:%4;}")- .arg(col::TEXT_DIM(), col::BORDER_MED())- .arg(fnt::TINY)- .arg(col::TEXT_PRIMARY()));- copy_btn->hide();- connect(copy_btn, &QPushButton::clicked, this, [body, copy_btn]() {- QApplication::clipboard()->setText(body->property("acc").toString());- copy_btn->setText("Copied!");- QTimer::singleShot(1500, copy_btn, [copy_btn]() { copy_btn->setText("Copy"); });- });- auto* footer = new QWidget;- footer->setStyleSheet("background:transparent;");- auto* fhl = new QHBoxLayout(footer);- fhl->setContentsMargins(0, 0, 0, 0);- fhl->addStretch();- fhl->addWidget(copy_btn);- cvl->addWidget(footer);-- // Store copy_btn so on_streaming_done can show it- body->setProperty("copy_btn", QVariant::fromValue(static_cast<QObject*>(copy_btn)));-- rl->addWidget(col_widget);- rl->addStretch();-- messages_layout_->insertWidget(messages_layout_->count() - 1, row);- return body;+ fincept::ai_chat::ChatBubbleFactory::Options opts;+ opts.role = "assistant";+ opts.show_footer = true;+ opts.user_col_max_width = kUserColMaxWidth;+ opts.ai_col_max_width = kAiColMaxWidth;+ auto b = fincept::ai_chat::ChatBubbleFactory::build_streaming(opts);+ messages_layout_->insertWidget(messages_layout_->count() - 1, b.row);+ return b.body;}// ── Helpers ───────────────────────────────────────────────────────────────────diff --git a/fincept-qt/src/ai_chat/ChatBubbleController.cpp b/fincept-qt/src/ai_chat/ChatBubbleController.cppnew file mode 100644index 000000000..4a654b92c--- /dev/null+++ b/fincept-qt/src/ai_chat/ChatBubbleController.cpp@@ -0,0 +1,43 @@+#include "ai_chat/ChatBubbleController.h"++#include "app/WindowFrame.h"+#include "core/logging/Logger.h"+#include "core/window/WindowRegistry.h"++namespace fincept::ai_chat {++namespace {+constexpr const char* kBubbleTag = "ChatBubble";+} // namespace++ChatBubbleController& ChatBubbleController::instance() {+ static ChatBubbleController s;+ return s;+}++void ChatBubbleController::initialise() {+ if (initialised_)+ return;+ initialised_ = true;++ auto& reg = WindowRegistry::instance();+ connect(®, &WindowRegistry::frame_added, this, &ChatBubbleController::on_frame_added);+ connect(®, &WindowRegistry::frame_removing, this, &ChatBubbleController::on_frame_removing);+ for (auto* w : reg.frames())+ on_frame_added(w);++ LOG_INFO(kBubbleTag,+ QString("Initialised; tracking %1 frame(s)").arg(tracked_frames_.size()));+}++void ChatBubbleController::on_frame_added(fincept::WindowFrame* w) {+ if (!w) return;+ tracked_frames_.insert(w, QPointer<fincept::WindowFrame>(w));+}++void ChatBubbleController::on_frame_removing(fincept::WindowFrame* w) {+ if (!w) return;+ tracked_frames_.remove(w);+}++} // namespace fincept::ai_chatdiff --git a/fincept-qt/src/ai_chat/ChatBubbleController.h b/fincept-qt/src/ai_chat/ChatBubbleController.hnew file mode 100644index 000000000..05b8a51e0--- /dev/null+++ b/fincept-qt/src/ai_chat/ChatBubbleController.h@@ -0,0 +1,68 @@+#pragma once+#include <QHash>+#include <QObject>+#include <QPointer>++namespace fincept {+class WindowFrame;+class AiChatBubble;+}++namespace fincept::ai_chat {++/// Phase 3 final: shell-level coordinator for the per-frame AiChatBubble.+///+/// **Final design**: keep per-frame AiChatBubble instances (one bubble per+/// frame, parented to that frame's dock_manager), but centralise the+/// shell-side observation surface. Per-frame bubbles match the multi-+/// window UX expectation that "I have a chat conversation per frame" —+/// a single shell-wide bubble that follows focus would surprise users+/// who expect each window's bubble to retain its own session.+///+/// What the controller provides:+/// - Subscribes to `WindowRegistry::frame_added` / `frame_removing`+/// so newly-spawned frames pick up the controller's settings+/// immediately.+/// - Observation point for shell-level operations: visibility toggle+/// across all frames, future telemetry on chat usage, future+/// cross-frame chat-session linking.+///+/// What stays per-frame (and why):+/// - Bubble widget instance: scoped to the frame's dock_manager so+/// reposition + raise events don't have to ping-pong across frames.+/// - Visibility state: per-frame today via `appearance.show_chat_bubble`+/// + frame-local `chat_bubble_->setVisible(...)`. The controller+/// could centralise this in a future iteration; v1 keeps the+/// existing wiring untouched.+///+/// Cumulative effect of Phase 1c + Phase 3-final + Phase 8 controller+/// scaffolds: each "shell concern" (lock, chat, panels, layouts,+/// monitors, telemetry) now has a dedicated coordinator that the rest+/// of the codebase can extend. The widgets themselves stay where they+/// always have been; the *coordination* moves to the shell.+class ChatBubbleController : public QObject {+ Q_OBJECT+ public:+ static ChatBubbleController& instance();++ /// Subscribe to WindowRegistry. Idempotent. Called from+ /// `TerminalShell::initialise`.+ void initialise();++ bool is_initialised() const { return initialised_; }++ /// Number of tracked frames — for tests / debug overlay.+ int tracked_frame_count() const { return tracked_frames_.size(); }++ private slots:+ void on_frame_added(fincept::WindowFrame* w);+ void on_frame_removing(fincept::WindowFrame* w);++ private:+ ChatBubbleController() = default;++ bool initialised_ = false;+ QHash<fincept::WindowFrame*, QPointer<fincept::WindowFrame>> tracked_frames_;+};++} // namespace fincept::ai_chatdiff --git a/fincept-qt/src/ai_chat/ChatBubbleFactory.cpp b/fincept-qt/src/ai_chat/ChatBubbleFactory.cppnew file mode 100644index 000000000..41859ffde--- /dev/null+++ b/fincept-qt/src/ai_chat/ChatBubbleFactory.cpp@@ -0,0 +1,310 @@+// ChatBubbleFactory.cpp — see header.++#include "ai_chat/ChatBubbleFactory.h"++#include "ui/theme/Theme.h"++#include <QApplication>+#include <QClipboard>+#include <QDateTime>+#include <QFrame>+#include <QHBoxLayout>+#include <QLabel>+#include <QPushButton>+#include <QSizePolicy>+#include <QTimer>+#include <QVBoxLayout>+#include <QVariant>+#include <QWidget>++namespace fincept::ai_chat {++namespace col = fincept::ui::colors;+namespace fnt = fincept::ui::fonts;++// Horizontal CSS padding baked into bubble_style(): "padding:10px 14px".+static constexpr int kBubblePadX = 14;++static int bubble_inner_width(bool is_user, const ChatBubbleFactory::Options& opts) {+ return (is_user ? opts.user_col_max_width : opts.ai_col_max_width) - 2 * kBubblePadX;+}++static QString bubble_style(const QString& role) {+ if (role == "user")+ return "background:rgba(120,53,15,0.45);border:1px solid rgba(217,119,6,0.28);"+ "border-radius:0px;padding:10px 14px;";+ if (role == "system")+ return "background:rgba(50,12,12,0.85);border:1px solid rgba(220,38,38,0.22);"+ "border-radius:0px;padding:10px 14px;";+ return QString("background:%1;border:1px solid %2;border-radius:0px;padding:10px 14px;")+ .arg(col::BG_SURFACE(), col::BORDER_DIM());+}++static QString body_color(const QString& role) {+ if (role == "user")+ return "#fff7ed";+ if (role == "system")+ return "#fee2e2";+ return col::TEXT_PRIMARY();+}++static QString role_color(const QString& role) {+ if (role == "system")+ return col::NEGATIVE();+ return col::AMBER();+}++static QString role_label_text(const QString& role) {+ if (role == "user")+ return "You";+ if (role == "system")+ return "System";+ return "AI";+}++static QString format_timestamp(const QString& timestamp) {+ QDateTime dt = QDateTime::fromString(timestamp, Qt::ISODate);+ if (!dt.isValid())+ dt = QDateTime::fromString(timestamp, "yyyy-MM-dd HH:mm:ss");+ if (!dt.isValid() && !timestamp.isEmpty())+ return timestamp;+ return (dt.isValid() ? dt : QDateTime::currentDateTime()).toString("HH:mm");+}++static QPushButton* make_copy_button(const QString& initial_text) {+ auto* btn = new QPushButton("Copy");+ btn->setFixedHeight(20);+ btn->setCursor(Qt::PointingHandCursor);+ btn->setStyleSheet(QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"+ "border-radius:0px;padding:0 8px;font-size:%3px;}"+ "QPushButton:hover{background:%2;color:%4;}")+ .arg(col::TEXT_DIM(), col::BORDER_MED())+ .arg(fnt::TINY)+ .arg(col::TEXT_PRIMARY()));+ QObject::connect(btn, &QPushButton::clicked, btn, [btn, initial_text]() {+ // initial_text is captured for the static-content variant; the streaming+ // variant overrides this connection at finalize_streaming() time.+ QApplication::clipboard()->setText(initial_text);+ btn->setText("Copied!");+ QTimer::singleShot(1500, btn, [btn]() { btn->setText("Copy"); });+ });+ return btn;+}++// Build the row + column scaffold shared by static and streaming bubbles.+// `body` is added to the bubble frame; the column + row layouts handle role+// label and alignment. The footer is built only when show_footer is true.+struct Scaffold {+ QWidget* row = nullptr;+ QWidget* column = nullptr;+ QVBoxLayout* col_vl = nullptr;+ QFrame* frame = nullptr;+ QLabel* role_lbl = nullptr;+};++static Scaffold build_scaffold(const ChatBubbleFactory::Options& opts) {+ const bool is_user = (opts.role == "user");++ auto* row = new QWidget;+ row->setStyleSheet("background:transparent;");+ auto* rl = new QHBoxLayout(row);+ rl->setContentsMargins(0, 0, 0, 0);+ rl->setSpacing(0);++ if (is_user)+ rl->addStretch();++ auto* col_widget = new QWidget;+ col_widget->setStyleSheet("background:transparent;");+ col_widget->setMaximumWidth(is_user ? opts.user_col_max_width : opts.ai_col_max_width);+ auto* cvl = new QVBoxLayout(col_widget);+ cvl->setContentsMargins(0, 0, 0, 0);+ cvl->setSpacing(4);++ auto* role_lbl = new QLabel(role_label_text(opts.role));+ role_lbl->setAlignment(is_user ? Qt::AlignRight : Qt::AlignLeft);+ role_lbl->setStyleSheet(QString("color:%1;font-size:%2px;font-weight:600;background:transparent;")+ .arg(role_color(opts.role))+ .arg(fnt::TINY));+ cvl->addWidget(role_lbl);++ auto* frame = new QFrame;+ frame->setStyleSheet(bubble_style(opts.role));+ auto* bvl = new QVBoxLayout(frame);+ bvl->setContentsMargins(0, 0, 0, 0);+ cvl->addWidget(frame);++ rl->addWidget(col_widget);+ if (!is_user)+ rl->addStretch();++ return {row, col_widget, cvl, frame, role_lbl};+}++ChatBubbleFactory::Bubble ChatBubbleFactory::build(const Options& opts) {+ const bool is_user = (opts.role == "user");+ const bool is_system = (opts.role == "system");++ Scaffold s = build_scaffold(opts);++ auto* body = new QLabel;+ body->setTextFormat(Qt::MarkdownText);+ body->setText(opts.content);+ body->setWordWrap(true);+ body->setMaximumWidth(bubble_inner_width(is_user, opts));+ body->setTextInteractionFlags(Qt::TextBrowserInteraction);+ body->setAlignment(Qt::AlignLeft | Qt::AlignTop);+ body->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);+ body->setStyleSheet(QString("QLabel{background:transparent;color:%1;font-size:%2px;}")+ .arg(body_color(opts.role))+ .arg(fnt::BODY));+ qobject_cast<QVBoxLayout*>(s.frame->layout())->addWidget(body);++ Bubble out;+ out.row = s.row;+ out.column = s.column;+ out.frame = s.frame;+ out.role_lbl = s.role_lbl;+ out.body = body;++ if (!opts.show_footer)+ return out;++ auto* footer = new QWidget;+ footer->setStyleSheet("background:transparent;");+ auto* fhl = new QHBoxLayout(footer);+ fhl->setContentsMargins(0, 0, 0, 0);+ fhl->setSpacing(6);++ QLabel* time_lbl = nullptr;+ if (!opts.timestamp_iso.isEmpty()) {+ time_lbl = new QLabel(format_timestamp(opts.timestamp_iso));+ time_lbl->setStyleSheet(+ QString("color:%1;font-size:%2px;background:transparent;").arg(col::TEXT_DIM()).arg(fnt::TINY));+ fhl->addWidget(time_lbl);+ }++ QPushButton* copy_btn = nullptr;+ if (!is_user && !is_system) {+ if (time_lbl)+ fhl->addStretch();+ copy_btn = make_copy_button(opts.content);+ fhl->addWidget(copy_btn);+ }++ if (is_user)+ fhl->insertStretch(0);+ s.col_vl->addWidget(footer);++ out.time_lbl = time_lbl;+ out.copy_btn = copy_btn;+ return out;+}++ChatBubbleFactory::Bubble ChatBubbleFactory::build_streaming(const Options& opts) {+ const bool is_user = (opts.role == "user");+ const bool is_system = (opts.role == "system");++ Scaffold s = build_scaffold(opts);++ // Streaming body — PlainText during streaming (appending chunks as markdown+ // would re-parse on every token; waste). finalize_streaming() switches to+ // MarkdownText and re-renders. Accumulated text lives on the widget as+ // dynamic property "acc" so chunk handlers don't need external state.+ auto* body = new QLabel;+ body->setTextFormat(Qt::PlainText);+ body->setText({});+ body->setProperty("acc", QString{});+ body->setWordWrap(true);+ body->setMaximumWidth(bubble_inner_width(is_user, opts));+ body->setTextInteractionFlags(Qt::TextBrowserInteraction);+ body->setAlignment(Qt::AlignLeft | Qt::AlignTop);+ body->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);+ body->setStyleSheet(QString("QLabel{background:transparent;color:%1;font-size:%2px;}")+ .arg(body_color(opts.role))+ .arg(fnt::BODY));+ qobject_cast<QVBoxLayout*>(s.frame->layout())->addWidget(body);++ Bubble out;+ out.row = s.row;+ out.column = s.column;+ out.frame = s.frame;+ out.role_lbl = s.role_lbl;+ out.body = body;++ if (!opts.show_footer)+ return out;++ auto* footer = new QWidget;+ footer->setStyleSheet("background:transparent;");+ auto* fhl = new QHBoxLayout(footer);+ fhl->setContentsMargins(0, 0, 0, 0);+ fhl->setSpacing(6);++ // Streaming bubbles intentionally have no timestamp at build time — there+ // is no meaningful timestamp until the stream completes. Callers can read+ // the body's "acc" property when they're done.++ QPushButton* copy_btn = nullptr;+ if (!is_user && !is_system) {+ copy_btn = make_copy_button({});+ copy_btn->hide(); // shown by finalize_streaming+ fhl->addStretch();+ fhl->addWidget(copy_btn);+ // Stash on the body so finalize_streaming() can find it without an+ // external map.+ body->setProperty("copy_btn", QVariant::fromValue(static_cast<QObject*>(copy_btn)));+ }++ if (is_user)+ fhl->insertStretch(0);+ s.col_vl->addWidget(footer);++ out.copy_btn = copy_btn;+ return out;+}++void ChatBubbleFactory::append_streaming_chunk(QLabel* body, const QString& chunk) {+ if (!body || chunk.isEmpty())+ return;+ QString acc = body->property("acc").toString();+ if (acc == "Calling tool...")+ acc = chunk;+ else+ acc += chunk;+ body->setProperty("acc", acc);+ body->setText(acc);+}++void ChatBubbleFactory::replace_streaming_text(QLabel* body, const QString& text) {+ if (!body)+ return;+ body->setProperty("acc", text);+ body->setText(text);+}++void ChatBubbleFactory::finalize_streaming(QLabel* body, const QString& final_text) {+ if (!body)+ return;+ QString text = final_text;+ if (text.isEmpty())+ text = body->property("acc").toString();+ if (!text.isEmpty()) {+ body->setTextFormat(Qt::MarkdownText);+ body->setText(text);+ body->setProperty("acc", text);+ }+ auto* copy_obj = body->property("copy_btn").value<QObject*>();+ if (auto* copy_btn = qobject_cast<QPushButton*>(copy_obj)) {+ // Reconnect with the final text so Copy uses what's actually shown.+ QObject::disconnect(copy_btn, &QPushButton::clicked, nullptr, nullptr);+ QObject::connect(copy_btn, &QPushButton::clicked, copy_btn, [copy_btn, text]() {+ QApplication::clipboard()->setText(text);+ copy_btn->setText("Copied!");+ QTimer::singleShot(1500, copy_btn, [copy_btn]() { copy_btn->setText("Copy"); });+ });+ copy_btn->show();+ }+}++} // namespace fincept::ai_chatdiff --git a/fincept-qt/src/ai_chat/ChatBubbleFactory.h b/fincept-qt/src/ai_chat/ChatBubbleFactory.hnew file mode 100644index 000000000..a6d91e9c2--- /dev/null+++ b/fincept-qt/src/ai_chat/ChatBubbleFactory.h@@ -0,0 +1,77 @@+#pragma once+// ChatBubbleFactory — shared message-bubble builder used by both the AI Chat+// tab (AiChatScreen) and the floating Quick Chat bubble (AiChatBubble).+//+// Single source of truth for bubble visuals. Producing a bubble:+// ChatBubbleFactory::Options opts;+// opts.role = "user" | "assistant" | "system";+// opts.content = "..."; // for finished bubbles only+// opts.timestamp_iso = "..."; // optional; "" -> hide footer time+// opts.show_footer = true; // copy + timestamp row+// opts.user_col_max_width = 560;+// opts.ai_col_max_width = 680;+// ChatBubbleFactory::Bubble b = ChatBubbleFactory::build(opts);+// layout->insertWidget(layout->count() - 1, b.row);+//+// Streaming bubble:+// auto sb = ChatBubbleFactory::build_streaming(opts);+// sb.body / sb.copy_btn ...+// ChatBubbleFactory::append_streaming_chunk(sb.body, "more text");+// ChatBubbleFactory::finalize_streaming(sb.body, "final markdown");++#include <QString>++class QFrame;+class QLabel;+class QPushButton;+class QWidget;++namespace fincept::ai_chat {++class ChatBubbleFactory {+ public:+ struct Options {+ QString role; // "user" | "assistant" | "system"+ QString content; // markdown+ QString timestamp_iso; // ISO-8601 or "yyyy-MM-dd HH:mm:ss"; "" hides time+ bool show_footer = true; // timestamp + copy button+ int user_col_max_width = 560;+ int ai_col_max_width = 680;+ };++ /// Result of building a bubble. `row` is what the caller inserts into its+ /// messages layout. The other handles are exposed for callers that want to+ /// observe / mutate (e.g. streaming).+ struct Bubble {+ QWidget* row = nullptr; // outer row, includes alignment stretch+ QWidget* column = nullptr;+ QFrame* frame = nullptr; // the visible bubble frame+ QLabel* body = nullptr;+ QLabel* role_lbl = nullptr;+ QLabel* time_lbl = nullptr; // nullptr if footer hidden+ QPushButton* copy_btn = nullptr; // nullptr if footer hidden / user / system+ };++ /// Build a finished message bubble (markdown rendered).+ static Bubble build(const Options& opts);++ /// Build a streaming bubble. The body starts in PlainText mode; chunks are+ /// appended via append_streaming_chunk(). When the stream completes call+ /// finalize_streaming() to switch to MarkdownText and reveal the copy+ /// button.+ static Bubble build_streaming(const Options& opts);++ /// Append a chunk to a streaming body. Accumulated text is stored on the+ /// label as the dynamic property "acc" so the caller doesn't need state.+ /// Honors the "Calling tool..." sentinel used by AiChatScreen.+ static void append_streaming_chunk(QLabel* body, const QString& chunk);++ /// Replace the body content (used by tool-call sentinel resets).+ static void replace_streaming_text(QLabel* body, const QString& text);++ /// Finalize a streaming bubble: re-render as markdown and unhide the copy+ /// button. If `final_text` is empty the current accumulated text is used.+ static void finalize_streaming(QLabel* body, const QString& final_text = {});+};++} // namespace fincept::ai_chatdiff --git a/fincept-qt/src/ai_chat/LlmService.cpp b/fincept-qt/src/ai_chat/LlmService.cppindex 4c0ca5c09..be620527f 100644--- a/fincept-qt/src/ai_chat/LlmService.cpp+++ b/fincept-qt/src/ai_chat/LlmService.cpp@@ -9,8 +9,9 @@#include "ai_chat/ModelCatalog.h"#include "core/logging/Logger.h"+#include "core/config/AppConfig.h"+#include "mcp/McpProvider.h"#include "mcp/McpService.h"-#include "mcp/ToolFilterPolicy.h"#include "storage/repositories/LlmConfigRepository.h"#include "storage/repositories/SettingsRepository.h"@@ -26,6 +27,7 @@#include <QNetworkRequest>#include <QPointer>#include <QRegularExpression>+#include <QSet>#include <QThread>#include <QTimer>#include <QUuid>@@ -36,6 +38,52 @@ namespace fincept::ai_chat {static constexpr const char* TAG = "LlmService";+// Per-thread tool policy override for the in-flight request. Set by chat()+// and chat_streaming() workers before invoking helpers; restored by the RAII+// guard. Replaces the old pattern of mutating `tools_enabled_` on the shared+// instance, which raced when the floating AiChatBubble and the AI Chat tab+// ran concurrently and the bubble's "restore" leaked tools=false back to the+// tab.+//+// `t_request_policy` controls what the format helpers do:+// ToolPolicy::All — attach the global tool catalog as-is.+// ToolPolicy::NoNavigation — attach tools but exclude the `navigation`+// category (floating bubble: model can call+// benign tools like add_to_watchlist without+// redirecting the user's active screen).+// ToolPolicy::None — attach no tools (kept for backward compat).+static thread_local LlmService::ToolPolicy t_request_policy = LlmService::ToolPolicy::All;++namespace {+struct ToolPolicyGuard {+ LlmService::ToolPolicy prev;+ explicit ToolPolicyGuard(LlmService::ToolPolicy p) : prev(t_request_policy) { t_request_policy = p; }+ ~ToolPolicyGuard() { t_request_policy = prev; }+ ToolPolicyGuard(const ToolPolicyGuard&) = delete;+ ToolPolicyGuard& operator=(const ToolPolicyGuard&) = delete;+};+} // namespace++// True if the current request should attach any tools at all.+static bool effective_tools_enabled(bool global_tools_enabled) {+ return global_tools_enabled && t_request_policy != LlmService::ToolPolicy::None;+}++// True if the current request should hide the `navigation` category.+static bool should_hide_navigation() {+ return t_request_policy == LlmService::ToolPolicy::NoNavigation;+}++// Apply per-request policy on top of the LlmService-level tool_filter_.+// Currently this only injects the `navigation` exclusion for the floating+// bubble — but it's the right place to grow other per-request constraints.+static mcp::ToolFilter apply_request_policy(const mcp::ToolFilter& base) {+ mcp::ToolFilter out = base;+ if (should_hide_navigation() && !out.exclude_categories.contains(QStringLiteral("navigation")))+ out.exclude_categories.append(QStringLiteral("navigation"));+ return out;+}+// ============================================================================// Content extractors (shared across non-streaming paths and tool follow-ups)// ============================================================================@@ -258,21 +306,52 @@ void LlmService::ensure_config() const {"Be concise, accurate, and finance-focused.";}- // Tier-3 discovery hint. The tool catalogue you receive on each turn is- // intentionally scoped to the active screen / agent for token-cost and- // accuracy reasons. If the user asks for something whose tool isn't in- // your immediate catalogue, DO NOT decline — call tool.list to find it,- // then tool.describe to learn its schema, then invoke it. Always-on- // meta tools that enable this discovery: tool.list, tool.describe,- // mcp.health. Idempotent append (won't double-stack on reload).- static constexpr const char* kToolDiscoveryHint =- "\n\n[Tool discovery] The tools shown to you each turn are scoped "- "to the active context. If a needed tool is missing, call "- "tool.list(category=\"…\", search=\"…\") to discover it, then "- "tool.describe(name) to read its schema, then invoke it. Never "- "decline an action you can fulfil via a discoverable tool.";- if (tools_enabled_ && !system_prompt_.contains("[Tool discovery]"))- system_prompt_ += kToolDiscoveryHint;+ // ── Tier-3 / Tool RAG discovery hint ─────────────────────────────────+ //+ // Tool RAG (Tool Search) ships only ~6 tools to the LLM each turn (the+ // Tier-0 set: tool.list, tool.describe, navigate, list_tabs,+ // get_current_tab, get_auth_status). Everything else is discovered on+ // demand via tool.list(query) — this fixes the 30-50-tool accuracy+ // collapse documented by Anthropic.+ //+ // For the LLM to form good queries it needs to know WHAT categories+ // exist. We enumerate them dynamically from the registered tools so the+ // hint stays accurate when categories are added/removed. Built once per+ // ensure_config() pass, cached statically across requests so the prompt+ // prefix is byte-stable for prompt-cache hits.+ //+ // Idempotent append (`[Tool discovery]` sentinel guards against+ // double-stacking on reload).+ if (tools_enabled_ && !system_prompt_.contains("[Tool discovery]")) {+ // Static cache — the tool registry is immutable after McpInit. Any+ // future runtime registrations will see a stale category list until+ // the next process restart, which is acceptable for a hint string.+ static const QString kHint = []() -> QString {+ const auto all = mcp::McpProvider::instance().list_all_tools();+ QSet<QString> cats;+ for (const auto& t : all) {+ if (!t.category.isEmpty())+ cats.insert(t.category);+ }+ QStringList sorted_cats = cats.values();+ std::sort(sorted_cats.begin(), sorted_cats.end());++ QString hint =+ "\n\n[Tool discovery] You see only a small subset of tools each turn. "+ "To find a tool for any action you don't already have, call "+ "tool.list(query=\"<natural-language description>\"). "+ "It returns the top 5 most relevant tools (BM25-ranked). "+ "Then call tool.describe(name) for the full input schema, then invoke it. "+ "For requests with multiple intents (\"get news AND add to watchlist\"), "+ "call tool.list MULTIPLE TIMES — once per intent. "+ "Never decline an action you can fulfil via a discoverable tool.";+ if (!sorted_cats.isEmpty()) {+ hint += "\nAvailable tool categories: " + sorted_cats.join(", ") + ".";+ }+ return hint;+ }();+ system_prompt_ += kHint;+ }config_loaded_ = true;const int resolved = resolved_max_tokens();@@ -329,27 +408,6 @@ bool LlmService::tools_enabled() const {return tools_enabled_;}-void LlmService::set_tool_filter(const mcp::ToolFilter& filter) {- QMutexLocker lock(&mutex_);- tool_filter_ = filter;- LOG_INFO(TAG, QString("Tool filter set: categories=[%1] excludes=[%2] name_patterns=%3 max_tools=%4")- .arg(filter.categories.join(','))- .arg(filter.exclude_categories.join(','))- .arg(filter.name_patterns.size())- .arg(filter.max_tools));-}--mcp::ToolFilter LlmService::tool_filter() const {- QMutexLocker lock(&mutex_);- return tool_filter_;-}--void LlmService::clear_tool_filter() {- QMutexLocker lock(&mutex_);- tool_filter_ = {};- LOG_INFO(TAG, "Tool filter cleared (full catalogue restored)");-}-bool LlmService::is_configured() const {QMutexLocker lock(&mutex_);ensure_config();@@ -532,8 +590,9 @@ QJsonObject LlmService::build_openai_request(const QString& user_message,// the model has no idea they exist and answers from training data —// which silently breaks live tool calling for OpenAI/Kimi/Groq/etc.// deepseek-reasoner rejects tools entirely; some Groq models also.- if (with_tools && tools_enabled_ && !is_ds_reasoner && !groq_no_tools) {- QJsonArray tools = mcp::McpService::instance().format_tools_for_openai(tool_filter_);+ const bool tools_effectively_on = effective_tools_enabled(tools_enabled_);+ if (with_tools && tools_effectively_on && !is_ds_reasoner && !groq_no_tools) {+ QJsonArray tools = mcp::McpService::instance().format_tools_for_openai(apply_request_policy(tool_filter_));if (!tools.isEmpty())req["tools"] = tools;LOG_INFO(TAG, QString("OpenAI request: stream=%1 provider=%2 tools=%3 (count=%4)")@@ -542,10 +601,10 @@ QJsonObject LlmService::build_openai_request(const QString& user_message,.arg(tools.size()));} else {LOG_WARN(TAG, QString("OpenAI request: stream=%1 provider=%2 NO TOOLS — "- "with_tools=%3 tools_enabled_=%4 ds_reasoner=%5 groq_no_tools=%6")+ "with_tools=%3 tools_effectively_on=%4 ds_reasoner=%5 groq_no_tools=%6").arg(stream ? "true" : "false", provider_).arg(with_tools ? "true" : "false")- .arg(tools_enabled_ ? "true" : "false")+ .arg(tools_effectively_on ? "true" : "false").arg(is_ds_reasoner ? "true" : "false").arg(groq_no_tools ? "true" : "false"));}@@ -576,11 +635,11 @@ QJsonObject LlmService::build_anthropic_request(const QString& user_message,// streaming and non-streaming requests so the model can request a// tool_use even mid-stream — the streaming code path detects this and// falls back to do_request to execute and follow up.- if (tools_enabled_) {+ if (effective_tools_enabled(tools_enabled_)) {QJsonArray ant_tools;- auto all_tools = mcp::McpService::instance().get_all_tools(tool_filter_);+ auto all_tools = mcp::McpService::instance().get_all_tools(apply_request_policy(tool_filter_));for (const auto& tool : all_tools) {- QString fn_name = tool.server_id + "__" + tool.name;+ QString fn_name = tool.server_id + "__" + mcp::McpProvider::encode_tool_name_for_wire(tool.name);QJsonObject schema = tool.input_schema;if (schema.isEmpty()) {schema["type"] = "object";@@ -618,12 +677,13 @@ QJsonObject LlmService::build_gemini_request(const QString& user_message,}// Gemini tool format: tools[{functionDeclarations:[{name, description, parameters}]}]- auto all_tools =- tools_enabled_ ? mcp::McpService::instance().get_all_tools(tool_filter_) : std::vector<mcp::UnifiedTool>{};+ auto all_tools = effective_tools_enabled(tools_enabled_)+ ? mcp::McpService::instance().get_all_tools(apply_request_policy(tool_filter_))+ : std::vector<mcp::UnifiedTool>{};if (!all_tools.empty()) {QJsonArray fn_decls;for (const auto& tool : all_tools) {- QString fn_name = tool.server_id + "__" + tool.name;+ QString fn_name = tool.server_id + "__" + mcp::McpProvider::encode_tool_name_for_wire(tool.name);QJsonObject schema = tool.input_schema;if (schema.isEmpty()) {schema["type"] = "object";@@ -754,25 +814,65 @@ LlmService::HttpResult LlmService::eventloop_request(const QString& method, cons// This allows models that don't support structured tool_calls to still// emit text-based tool invocations that try_extract_and_execute_text_tool_calls// can detect and execute.+//+// Two modes:+// • Tool RAG ON + default filter: emit only the Tier-0 tools + explicit+// instructions to use tool.list for everything else. Same disclosure+// model as structured providers — keeps the catalog small and forces+// deliberate discovery.+// • Tool RAG OFF or explicit filter: legacy behaviour — list up to 60+// filtered tools inline.static QString build_tool_catalog_for_prompt(const mcp::ToolFilter& filter) {auto all_tools = mcp::McpService::instance().get_all_tools(filter);if (all_tools.empty())return {};- // Only include the most useful tools (navigation, market data, portfolio, etc.)- // to keep prompt size reasonable. Skip very niche tools.+ const bool default_filter = filter.categories.isEmpty() &&+ filter.exclude_categories.isEmpty() &&+ filter.name_patterns.isEmpty() &&+ filter.exclude_name_patterns.isEmpty() &&+ filter.max_tools == 0;+ const bool use_rag = default_filter &&+ fincept::AppConfig::instance()+ .get("mcp/use_tool_rag", QVariant(true))+ .toBool();+QString catalog;- catalog += "You have access to the following tools. To use a tool, emit a <tool_call> block:\n";+ catalog += "You have access to tools. To use one, emit a <tool_call> block:\n";catalog += "<tool_call>{\"name\": \"TOOL_NAME\", \"arguments\": {\"param\": \"value\"}}</tool_call>\n\n";- catalog += "Available tools:\n";+ if (use_rag) {+ // ── Tier-0 mode ──+ // Mirror McpService::tier_0_tool_names() (kept in sync manually — small+ // list, low churn). Could be exposed via an accessor if it grows.+ static const QSet<QString> kTier0 = {+ "tool.list", "tool.describe", "navigate_to_tab", "list_tabs",+ "get_current_tab", "get_auth_status",+ };+ catalog += "Always-available tools:\n";+ for (const auto& tool : all_tools) {+ if (!kTier0.contains(tool.name))+ continue;+ QString fn_name = tool.server_id + "__" + mcp::McpProvider::encode_tool_name_for_wire(tool.name);+ catalog += "- " + fn_name + ": " + tool.description + "\n";+ }+ const QString wire_list = mcp::McpProvider::encode_tool_name_for_wire("tool.list");+ const QString wire_describe = mcp::McpProvider::encode_tool_name_for_wire("tool.describe");+ catalog += QStringLiteral(+ "\nFor any other capability, call fincept-terminal__%1 with a natural-language "+ "query (e.g. {\"query\": \"draft a research report\"}). It returns the top 5 most "+ "relevant tools. Then call fincept-terminal__%2(name) for the full schema, "+ "then invoke the tool. For multi-intent requests, call %1 multiple times.\n")+ .arg(wire_list, wire_describe);+ return catalog;+ }++ // ── Legacy mode ──+ catalog += "Available tools:\n";int count = 0;for (const auto& tool : all_tools) {- // Build qualified name: server_id__tool_name- QString fn_name = tool.server_id + "__" + tool.name;+ QString fn_name = tool.server_id + "__" + mcp::McpProvider::encode_tool_name_for_wire(tool.name);catalog += "- " + fn_name + ": " + tool.description;-- // Add parameter hints from schemaQJsonObject props = tool.input_schema["properties"].toObject();if (!props.isEmpty()) {QStringList params;@@ -782,7 +882,6 @@ static QString build_tool_catalog_for_prompt(const mcp::ToolFilter& filter) {}catalog += "\n";++count;- // Cap at 60 tools to avoid overwhelming the promptif (count >= 60) {catalog += "... and " + QString::number(all_tools.size() - 60) + " more tools available.\n";break;@@ -801,8 +900,8 @@ LlmResponse LlmService::fincept_async_request(const QString& user_message,prompt += system_prompt_ + "\n\n";// Inject tool catalog so the model can emit text-based tool calls- if (tools_enabled_) {- QString tool_catalog = build_tool_catalog_for_prompt(tool_filter_);+ if (effective_tools_enabled(tools_enabled_)) {+ QString tool_catalog = build_tool_catalog_for_prompt(apply_request_policy(tool_filter_));if (!tool_catalog.isEmpty())prompt += tool_catalog + "\n";}@@ -1261,7 +1360,7 @@ LlmResponse LlmService::do_tool_loop(QJsonArray loop_messages, const QString& ur// Temperature intentionally omitted — provider default.fu["max_tokens"] = resolved_max_tokens();- QJsonArray tools = mcp::McpService::instance().format_tools_for_openai(tool_filter_);+ QJsonArray tools = mcp::McpService::instance().format_tools_for_openai(apply_request_policy(tool_filter_));if (!tools.isEmpty())fu["tools"] = tools;@@ -2187,7 +2286,6 @@ LlmResponse LlmService::chat(const QString& user_message, const std::vector<ConvQString p = provider_, k = api_key_, b = base_url_, m = model_, sp = system_prompt_;double t = temperature_;int mx = max_tokens_;- const bool saved_tools = tools_enabled_;lock.unlock();// Restore snapshot into members for use by helper methods@@ -2201,61 +2299,31 @@ LlmResponse LlmService::chat(const QString& user_message, const std::vector<Convtemperature_ = t;max_tokens_ = mx;- // Override tools_enabled_ for this request scope if caller disabled tools- if (!use_tools)- tools_enabled_ = false;-- // Lightweight intent classifier: scan the user message for keywords- // that suggest categories beyond what the screen filter exposes. Add- // them to a per-call temporary filter and restore the prior one after.- // Cheap: pure string scan, runs on the calling background thread.- mcp::ToolFilter saved_filter;- bool filter_overridden = false;- if (use_tools && tools_enabled_) {- const auto extras = mcp::ToolFilterPolicy::infer_extra_categories(user_message);- if (!extras.isEmpty()) {- saved_filter = tool_filter_;- mcp::ToolFilter expanded = saved_filter;- // If the screen wanted "full catalogue" (empty filter), seed it- // with Tier-1 first so we don't widen from nothing to a single- // category — that would silently shrink the catalogue.- if (expanded.categories.isEmpty()) {- // No filter active → leave it alone; full catalogue already- // covers the inferred extras.- } else {- bool changed = false;- for (const auto& c : extras) {- if (!expanded.categories.contains(c)) {- expanded.categories.append(c);- changed = true;- }- }- if (changed) {- tool_filter_ = expanded;- filter_overridden = true;- LOG_INFO(TAG, QString("Intent classifier added categories: [%1]").arg(extras.join(',')));- }- }- }- }-- auto resp = do_request(user_message, history);-- // Restore tools_enabled_ + filter- tools_enabled_ = saved_tools;- if (filter_overridden)- tool_filter_ = saved_filter;+ // Per-message intent classifier removed. Tool RAG (tool.list) replaces+ // it — instead of guessing categories from keywords server-side, the LLM+ // now searches the catalog itself with a natural-language query. Higher+ // accuracy, no English-only keyword list to maintain.- return resp;+ // Per-request tools-off override (thread_local). Replaces the old+ // pattern of mutating tools_enabled_ on the singleton, which raced with+ // concurrent chat_streaming calls from the floating bubble.+ ToolPolicyGuard guard(use_tools ? ToolPolicy::All : ToolPolicy::None);+ return do_request(user_message, history);}+// Back-compat boolean overload — delegates to the enum form.void LlmService::chat_streaming(const QString& user_message, const std::vector<ConversationMessage>& history,StreamCallback on_chunk, bool use_tools) {+ chat_streaming(user_message, history, std::move(on_chunk),+ use_tools ? ToolPolicy::All : ToolPolicy::None);+}++void LlmService::chat_streaming(const QString& user_message, const std::vector<ConversationMessage>& history,+ StreamCallback on_chunk, ToolPolicy policy) {// Snapshot config under lockQString p, k, b, m, sp;double t;int mx;- bool saved_tools;{QMutexLocker lock(&mutex_);ensure_config();@@ -2266,7 +2334,6 @@ void LlmService::chat_streaming(const QString& user_message, const std::vector<Csp = system_prompt_;t = temperature_;mx = max_tokens_;- saved_tools = tools_enabled_;}if (p.isEmpty()) {@@ -2321,13 +2388,15 @@ void LlmService::chat_streaming(const QString& user_message, const std::vector<C}};(void)QtConcurrent::run(- [self, p, k, b, m, sp, t, mx, user_message, history_copy, guarded_chunk, use_tools, saved_tools]() {+ [self, p, k, b, m, sp, t, mx, user_message, history_copy, guarded_chunk, policy]() {if (!self)return;// Apply the config snapshot under the mutex so do_request /// do_streaming_request see a consistent state and don't race with- // reload_config() on the UI thread.+ // reload_config() on the UI thread. We no longer mutate+ // tools_enabled_ — per-request opt-out is conveyed via the+ // thread_local ToolPolicyGuard below.{QMutexLocker lock(&self->mutex_);self->provider_ = p;@@ -2337,19 +2406,11 @@ void LlmService::chat_streaming(const QString& user_message, const std::vector<Cself->system_prompt_ = sp;self->temperature_ = t;self->max_tokens_ = mx;- // Disable tools for this request if caller requested it- if (!use_tools)- self->tools_enabled_ = false;}+ ToolPolicyGuard guard(policy);auto resp = self->do_streaming_request(user_message, history_copy, guarded_chunk);- // Restore tools_enabled_ to saved value- {- QMutexLocker lock(&self->mutex_);- self->tools_enabled_ = saved_tools;- }-if (self) {QMetaObject::invokeMethod(self,diff --git a/fincept-qt/src/ai_chat/LlmService.h b/fincept-qt/src/ai_chat/LlmService.hindex 7a1b01348..477acc53e 100644--- a/fincept-qt/src/ai_chat/LlmService.h+++ b/fincept-qt/src/ai_chat/LlmService.h@@ -66,24 +66,35 @@ class LlmService : public QObject {LlmResponse chat(const QString& user_message, const std::vector<ConversationMessage>& history,bool use_tools = true);+ // Per-request tool policy. Replaces the legacy `bool use_tools` so callers+ // can opt into the common middle ground (tools enabled but navigation+ // tools hidden — used by the floating bubble so the model can still hit+ // benign tools like add_to_watchlist without yanking the user out of+ // their current screen).+ //+ // Values:+ // All — every tool advertised (AI Chat tab default).+ // NoNavigation — drop the `navigation` category (floating bubble).+ // None — no tools attached at all (legacy use_tools=false).+ enum class ToolPolicy { All, NoNavigation, None };+// Streaming — launches background thread; on_chunk called on that thread.// Emit finished_streaming(response) when done to get result on UI thread.- // use_tools: when false, disables MCP tool execution for this requestvoid chat_streaming(const QString& user_message, const std::vector<ConversationMessage>& history,- StreamCallback on_chunk, bool use_tools = true);+ StreamCallback on_chunk, ToolPolicy policy = ToolPolicy::All);++ // Back-compat overload — `use_tools=false` maps to ToolPolicy::None,+ // `true` maps to ToolPolicy::All. Prefer the enum form for new callers.+ void chat_streaming(const QString& user_message, const std::vector<ConversationMessage>& history,+ StreamCallback on_chunk, bool use_tools);// Reload config from DB (call after user changes LLM settings)void reload_config();- // Per-request tool catalogue scoping. The full ~237-tool catalogue is- // expensive (≈100–150 KB JSON per turn) and harms tool-pick accuracy.- // Callers (AI chat, agents, terminal bridge) set a ToolFilter that- // narrows the catalogue to the categories/names relevant to the current- // screen or agent. Default-constructed = no filter = full catalogue- // (legacy behaviour). Thread-safe.- void set_tool_filter(const mcp::ToolFilter& filter);- mcp::ToolFilter tool_filter() const;- void clear_tool_filter();+ // (Per-request ToolFilter setters removed — superseded by Tool RAG+ // tool.list / Tier-0 advertisement model. The internal tool_filter_+ // field stays default-constructed; an empty filter is the signal that+ // tells McpService::format_tools_for_openai to engage Tier-0 mode.)// ── Active config accessors (AI Chat context) ─────────────────────────────QString active_provider() const;diff --git a/fincept-qt/src/app/DockScreenRouter.cpp b/fincept-qt/src/app/DockScreenRouter.cppindex f2b1e0621..04f80ea69 100644--- a/fincept-qt/src/app/DockScreenRouter.cpp+++ b/fincept-qt/src/app/DockScreenRouter.cpp@@ -1,10 +1,15 @@-#include "app/DockScreenRouter.h"+#include "app/DockScreenRouter.h"+#include "app/WindowFrame.h"#include "auth/InactivityGuard.h"#include "core/components/PopularityTracker.h"+#include "core/keys/WindowCycler.h"#include "core/logging/Logger.h"+#include "core/panel/PanelHandle.h"+#include "core/panel/PanelRegistry.h"#include "core/session/ScreenStateManager.h"#include "core/session/SessionManager.h"+#include "core/window/WindowRegistry.h"#include "core/symbol/IGroupLinked.h"#include "core/symbol/SymbolContext.h"#include "core/symbol/SymbolGroupRegistry.h"@@ -196,7 +201,7 @@ void DockScreenRouter::register_factory(const QString& id, ScreenFactory factoryvoid DockScreenRouter::navigate(const QString& id, bool exclusive) {// Hard refuse while the lock screen is showing — signals/timers/keyboard// shortcuts that would otherwise mutate panel state behind the PIN gate- // must be no-ops. MainWindow also disables the dock_manager_ widget tree+ // must be no-ops. WindowFrame also disables the dock_manager_ widget tree// for keyboard/focus safety; this check catches programmatic callers.if (auth::InactivityGuard::instance().is_terminal_locked()) {LOG_DEBUG("DockRouter", QString("navigate('%1') suppressed — terminal locked").arg(id));@@ -204,7 +209,7 @@ void DockScreenRouter::navigate(const QString& id, bool exclusive) {}LOG_INFO("DockRouter",- QString(">>> navigate('%1', exclusive=%2) panel_count=%3").arg(id).arg(exclusive).arg(panel_count_));+ QString(">>> navigate('%1', exclusive=%2) opened_areas=%3").arg(id).arg(exclusive).arg(manager_ ? manager_->openedDockAreas().size() : 0));// Bump popularity so the Component Browser surfaces frequently-used// panels at the top. Safe for unknown ids — PopularityTracker no-ops// on failure and we still fall into the unknown-screen branch below.@@ -250,8 +255,6 @@ void DockScreenRouter::navigate(const QString& id, bool exclusive) {if (other != dw && other->isAutoHide())other->toggleView(false);}- grid_top_left_ = grid_top_right_ = grid_bottom_left_ = grid_bottom_right_ = nullptr;- panel_count_ = 0;}// Determine whether this widget needs to be physically placed into a new@@ -260,111 +263,41 @@ void DockScreenRouter::navigate(const QString& id, bool exclusive) {// ensure_all_registered() pre-creates every dock widget and groups them all// into a SINGLE shared dock area (all hidden). We detect this by checking// whether dw's area contains other dock widgets (shared) vs being solo.- // We check dockWidgets() (all, not just open) because ensure_all_registered- // hides them all — openedDockWidgets() would be empty and miss the poisoning.auto* existing_area = dw->dockAreaWidget();const bool area_is_poisoned = existing_area && existing_area->dockWidgets().size() > 1;const bool must_place = needs_add || !existing_area || area_is_poisoned;- // ── Helper: sync grid tracking from currently open areas ────────────────- // After restoreState(), exclusive navigate, or user drag, the grid pointers- // may be stale. This lambda rebuilds them from whatever ADS actually has.- auto sync_grid_from_reality = [this]() {- const auto opened = manager_->openedDockAreas();- panel_count_ = std::min(static_cast<int>(opened.size()), 4);-- // Invalidate pointers that no longer exist- if (grid_top_left_ && !opened.contains(grid_top_left_))- grid_top_left_ = nullptr;- if (grid_top_right_ && !opened.contains(grid_top_right_))- grid_top_right_ = nullptr;- if (grid_bottom_left_ && !opened.contains(grid_bottom_left_))- grid_bottom_left_ = nullptr;- if (grid_bottom_right_ && !opened.contains(grid_bottom_right_))- grid_bottom_right_ = nullptr;-- // Fill in missing pointers from opened areas- int idx = 0;- if (!grid_top_left_ && idx < opened.size())- grid_top_left_ = opened.at(idx);- if (grid_top_left_)- idx = opened.indexOf(grid_top_left_) + 1;- if (!grid_top_right_ && idx < opened.size())- grid_top_right_ = opened.at(idx);- if (grid_top_right_)- idx = opened.indexOf(grid_top_right_) + 1;- if (!grid_bottom_left_ && idx < opened.size())- grid_bottom_left_ = opened.at(idx);- if (grid_bottom_left_)- idx = opened.indexOf(grid_bottom_left_) + 1;- if (!grid_bottom_right_ && idx < opened.size())- grid_bottom_right_ = opened.at(idx);-- LOG_INFO("DockRouter", QString("GRID synced: panel_count=%1 opened=%2 TL=%3 TR=%4 BL=%5 BR=%6")- .arg(panel_count_)- .arg(opened.size())- .arg(grid_top_left_ ? "ok" : "-")- .arg(grid_top_right_ ? "ok" : "-")- .arg(grid_bottom_left_ ? "ok" : "-")- .arg(grid_bottom_right_ ? "ok" : "-"));- };-if (exclusive) {- // Exclusive: place into full container (always, regardless of must_place)- auto* area = manager_->addDockWidget(ads::CenterDockWidgetArea, dw);- grid_top_left_ = area;- grid_top_right_ = grid_bottom_left_ = grid_bottom_right_ = nullptr;- panel_count_ = 1;+ // Exclusive: replace whatever's open with this single panel in the+ // central area.+ manager_->addDockWidget(ads::CenterDockWidgetArea, dw);} else if (must_place) {- // Sync grid from reality before placing- sync_grid_from_reality();-- LOG_INFO("DockRouter", QString("GRID [%1] must_place panel_count=%2").arg(id).arg(panel_count_));-- if (panel_count_ == 0) {- LOG_INFO("DockRouter", QString("GRID [%1] -> PANEL 1 (full)").arg(id));- auto* area = manager_->addDockWidget(ads::CenterDockWidgetArea, dw);- grid_top_left_ = area;- panel_count_ = 1;-- } else if (panel_count_ == 1 && grid_top_left_) {- LOG_INFO("DockRouter", QString("GRID [%1] -> PANEL 2 (right of TL)").arg(id));- auto* area = manager_->addDockWidget(ads::RightDockWidgetArea, dw, grid_top_left_);- grid_top_right_ = area;- panel_count_ = 2;-- } else if (panel_count_ == 2 && grid_top_left_) {- LOG_INFO("DockRouter", QString("GRID [%1] -> PANEL 3 (below TL)").arg(id));- auto* area = manager_->addDockWidget(ads::BottomDockWidgetArea, dw, grid_top_left_);- grid_bottom_left_ = area;- panel_count_ = 3;-- } else if (panel_count_ == 3 && grid_bottom_left_) {- LOG_INFO("DockRouter", QString("GRID [%1] -> PANEL 4 (right of BL)").arg(id));- auto* area = manager_->addDockWidget(ads::RightDockWidgetArea, dw, grid_bottom_left_);- grid_bottom_right_ = area;- panel_count_ = 4;-- } else {- // 5th+ panel or missing grid pointer: tab into last area- LOG_INFO("DockRouter", QString("GRID [%1] -> tab into last (panel_count=%2)").arg(id).arg(panel_count_));- ads::CDockAreaWidget* target =- grid_bottom_right_- ? grid_bottom_right_- : (manager_->openedDockAreas().isEmpty() ? nullptr : manager_->openedDockAreas().last());- if (target)- manager_->addDockWidget(ads::CenterDockWidgetArea, dw, target);- else- manager_->addDockWidget(ads::CenterDockWidgetArea, dw);- panel_count_++;+ // Phase 4 grid removal: ADS handles arbitrary splits natively. We+ // tab new panels into the *focused* dock area when one exists, and+ // create a fresh central area otherwise. The user can split panels+ // into a side-by-side layout via ADS drag-drop on the tab bar (the+ // existing right-click "Float Panel" / "Tear off into new window"+ // entries also remain). The pre-Phase-4 hard-coded+ // "right-of-TL → below-TL → right-of-BL" cycle was a v1+ // simplification; this is the cleaner Bloomberg-grade behaviour+ // (everything tabs into centre by default; user splits explicitly).+ const auto opened = manager_->openedDockAreas();+ ads::CDockAreaWidget* target = nullptr;+ if (auto* focused = manager_->focusedDockWidget()) {+ target = focused->dockAreaWidget();+ }+ if (!target && !opened.isEmpty()) {+ target = opened.last();}+ if (target)+ manager_->addDockWidget(ads::CenterDockWidgetArea, dw, target);+ else+ manager_->addDockWidget(ads::CenterDockWidgetArea, dw);} else {- // Widget already has a dedicated area — just show it.- // But sync grid tracking so it knows about this area for future placements.- LOG_INFO("DockRouter", QString("GRID [%1] already placed, syncing grid").arg(id));- sync_grid_from_reality();+ // Widget already has a dedicated area — just bring it to the front.+ LOG_DEBUG("DockRouter", QString("[%1] already placed, raising").arg(id));}// Always call toggleView(true) — addDockWidget() marks the widget as@@ -457,19 +390,47 @@ void DockScreenRouter::add_alongside(const QString& primary, const QString& secoauto* primary_dw = find_dock_widget(primary);bool primary_visible = primary_dw && !primary_dw->isClosed() && primary_dw->dockAreaWidget();- LOG_INFO("DockRouter", QString("add_alongside: primary=%1 visible=%2 secondary=%3 panel_count=%4")+ LOG_INFO("DockRouter", QString("add_alongside: primary=%1 visible=%2 secondary=%3 opened=%4").arg(primary).arg(primary_visible).arg(secondary)- .arg(panel_count_));+ .arg(manager_ ? manager_->openedDockAreas().size() : 0));- if (primary_visible) {- // Primary already showing — add secondary non-exclusively- navigate(secondary, false);- } else {- // Primary not showing — open it exclusively, then split secondary alongside+ if (!primary_visible) {navigate(primary, true);- navigate(secondary, false);+ primary_dw = find_dock_widget(primary);+ }++ // Phase 4 (grid removal): add_alongside is the EXPLICIT "I want a+ // split" API. Pre-Phase-4 navigate() handled the split via the+ // hard-coded grid; post-removal navigate() tabs by default. So we+ // do the split here ourselves: ensure secondary's CDockWidget exists,+ // then addDockWidget(RightDockWidgetArea, secondary, primary's area).+ if (primary_dw) {+ auto* sec_dw = find_dock_widget(secondary);+ bool needs_add = !sec_dw;+ if (!sec_dw) {+ if (!factories_.contains(secondary) && !screens_.contains(secondary)) {+ LOG_WARN("DockRouter", "add_alongside: unknown secondary screen: " + secondary);+ return;+ }+ sec_dw = create_dock_widget(secondary);+ } else if (!sec_dw->dockManager()) {+ needs_add = true;+ }+ materialize_screen(secondary);++ auto* primary_area = primary_dw->dockAreaWidget();+ if (needs_add || !sec_dw->dockAreaWidget() ||+ sec_dw->dockAreaWidget()->dockWidgets().size() > 1) {+ if (primary_area)+ manager_->addDockWidget(ads::RightDockWidgetArea, sec_dw, primary_area);+ else+ manager_->addDockWidget(ads::CenterDockWidgetArea, sec_dw);+ }+ sec_dw->toggleView(true);+ if (auto* tab = sec_dw->tabWidget(); tab && tab->isHidden())+ tab->setVisible(true);}// Re-focus the primary so it stays the "main" panel — the user typed@@ -721,7 +682,7 @@ void DockScreenRouter::show_tab_context_menu(const QString& id, const QPoint& gl});// Always-on-top — only meaningful when the dock is a top-level floating- // window. For docked tabs, the flag lives on the MainWindow; we don't+ // window. For docked tabs, the flag lives on the WindowFrame; we don't// expose it here to avoid confusion.if (floating) {if (auto* fc = dw->floatingDockContainer()) {@@ -801,6 +762,46 @@ void DockScreenRouter::show_tab_context_menu(const QString& id, const QPoint& glmenu.addSeparator();+ // Phase 5: tear off into a new WindowFrame. Always offered; the call+ // itself logs + no-ops if the panel can't be torn off (eager screen+ // without a factory).+ auto* act_tear_off = menu.addAction("Tear off into new window");+ connect(act_tear_off, &QAction::triggered, this, [this, id]() { tear_off_to_new_frame(id); });++ // Phase 5: move to another open WindowFrame. Submenu lists every+ // other frame by display number; current frame is excluded. Hidden+ // entirely if there's only one frame (nothing to move to).+ {+ const auto frames = WindowRegistry::instance().frames();+ WindowFrame* this_frame = qobject_cast<WindowFrame*>(parent());+ // Count peers other than `this` to decide if the submenu is worth showing.+ int peers = 0;+ for (auto* f : frames)+ if (f && f != this_frame)+ ++peers;+ if (peers > 0) {+ auto* move_menu = menu.addMenu("Move to window");+ move_menu->setStyleSheet(menu.styleSheet());+ int display_num = 1;+ for (auto* f : frames) {+ if (!f) continue;+ if (f == this_frame) {+ ++display_num;+ continue;+ }+ const QString label = QString("Window %1").arg(display_num);+ auto* a = move_menu->addAction(label);+ connect(a, &QAction::triggered, this, [this, id, f]() {+ if (f && f->dock_router())+ move_panel_to_frame(id, f->dock_router());+ });+ ++display_num;+ }+ }+ }++ menu.addSeparator();+// Copy tab title to clipboard — small but handy for sharing a panel id// over chat / for scripting.auto* act_copy = menu.addAction("Copy Tab Title");@@ -904,6 +905,203 @@ bool DockScreenRouter::eventFilter(QObject* obj, QEvent* event) {return true; // consume double-click so ADS doesn't float the widget}+DockScreenRouter::~DockScreenRouter() {+ // Phase 4b cleanup: unregister every panel this router owns so the+ // PanelRegistry doesn't keep stale entries pointing at this frame+ // after WindowFrame destruction.+ for (auto it = instance_ids_.constBegin(); it != instance_ids_.constEnd(); ++it)+ PanelRegistry::instance().unregister_panel(it.value());+ instance_ids_.clear();+}++PanelInstanceId DockScreenRouter::panel_uuid_for(const QString& id) const {+ return instance_ids_.value(id);+}++void DockScreenRouter::tile_2x2() {+ // Phase 6 final / decision 5.5. Detach every open dock widget then+ // re-add with explicit ADS area hints to force the 2x2 grid.+ if (!manager_)+ return;+ QList<ads::CDockWidget*> open;+ for (auto* dw : manager_->dockWidgetsMap()) {+ if (dw && !dw->isClosed())+ open.append(dw);+ }+ if (open.isEmpty()) {+ LOG_DEBUG("DockRouter", "tile_2x2: no open panels");+ return;+ }+ LOG_INFO("DockRouter", QString("tile_2x2: rearranging %1 panel(s)").arg(open.size()));++ for (auto* dw : open)+ manager_->removeDockWidget(dw);++ ads::CDockAreaWidget* tl = nullptr;+ ads::CDockAreaWidget* tr = nullptr;+ ads::CDockAreaWidget* bl = nullptr;+ ads::CDockAreaWidget* br = nullptr;++ for (int i = 0; i < open.size(); ++i) {+ ads::CDockWidget* dw = open.at(i);+ if (i == 0) {+ tl = manager_->addDockWidget(ads::CenterDockWidgetArea, dw);+ } else if (i == 1) {+ tr = manager_->addDockWidget(ads::RightDockWidgetArea, dw, tl);+ } else if (i == 2) {+ bl = manager_->addDockWidget(ads::BottomDockWidgetArea, dw, tl);+ } else if (i == 3) {+ br = manager_->addDockWidget(ads::RightDockWidgetArea, dw, bl);+ } else {+ ads::CDockAreaWidget* target = br ? br : (bl ? bl : (tr ? tr : tl));+ if (target)+ manager_->addDockWidget(ads::CenterDockWidgetArea, dw, target);+ else+ manager_->addDockWidget(ads::CenterDockWidgetArea, dw);+ }+ dw->toggleView(true);+ }+ (void) tr; // suppress unused-variable warnings if compiler is strict+}++// ── Phase 5: tear-off + cross-frame move ────────────────────────────────────++void DockScreenRouter::adopt_panel_instance(const QString& id, PanelInstanceId instance_id) {+ if (id.isEmpty() || instance_id.is_null())+ return;++ instance_ids_.insert(id, instance_id);++ // Update the existing PanelHandle so PanelRegistry::find_by_frame+ // returns the right results for this frame's owning WindowFrame.+ if (auto* handle = PanelRegistry::instance().find(instance_id)) {+ WindowId frame_id;+ if (auto* frame = qobject_cast<WindowFrame*>(parent()))+ frame_id = frame->frame_uuid();+ handle->set_frame_id(frame_id);+ // dock_widget pointer will be repointed when create_dock_widget+ // runs in this router and assigns the freshly-created widget.+ handle->set_dock_widget(nullptr);+ handle->set_state(PanelHandle::State::Spawning);+ }+}++bool DockScreenRouter::move_panel_to_frame(const QString& id, DockScreenRouter* target) {+ if (!target || target == this) {+ LOG_DEBUG("DockRouter", QString("move_panel_to_frame('%1'): target invalid (null=%2 same=%3)")+ .arg(id).arg(target == nullptr).arg(target == this));+ return false;+ }+ auto* dw = dock_widgets_.value(id, nullptr);+ if (!dw) {+ LOG_WARN("DockRouter", QString("move_panel_to_frame('%1'): no dock widget").arg(id));+ return false;+ }+ if (target->dock_widgets_.contains(id)) {+ // Collision: the target already has a panel under this string id.+ // We could synthesise <id>#movedN but for v1 we refuse so the user+ // gets clear feedback. Caller (context menu / action) should+ // surface a toast / status message.+ LOG_WARN("DockRouter",+ QString("move_panel_to_frame('%1'): target already has this panel id — refusing").arg(id));+ return false;+ }+ if (!factories_.contains(id) && !screens_.contains(id)) {+ // No factory and no eager screen — can't recreate on the target.+ LOG_WARN("DockRouter",+ QString("move_panel_to_frame('%1'): no factory available, can't recreate on target").arg(id));+ return false;+ }++ LOG_INFO("DockRouter", QString("Moving panel '%1' to another frame").arg(id));++ // 1. Flush + sync-save state under the panel's UUID. The save itself+ // is async (QtConcurrent), so there's a tight race where the target's+ // restore could read a slightly stale row. SQLite WAL writes are+ // sub-ms and widget materialise is 10-100ms, so practically the+ // race almost never fires. Phase 8 formalises sync flush.+ auto* screen = screens_.value(id, nullptr);+ if (auto* stateful = dynamic_cast<screens::IStatefulScreen*>(screen)) {+ stateful->flush_pending_state();+ const PanelInstanceId uuid = instance_ids_.value(id);+ if (!uuid.is_null())+ ScreenStateManager::instance().save_now_by_uuid(stateful, uuid.to_string());+ else+ ScreenStateManager::instance().save_now(stateful);+ }++ // 2. Capture the UUID + factory so we can transfer them to the target.+ const PanelInstanceId panel_uuid = instance_ids_.value(id);+ ScreenFactory factory_copy;+ if (factories_.contains(id))+ factory_copy = factories_.value(id);++ // 3. Tear down the panel on this router. removeDockWidget unregisters+ // from the manager; deleteLater destroys the widget. We purposely+ // skip our own save_screen_state() because we already did the+ // UUID-keyed save above — the visibility-changed handler would+ // otherwise try a second save against a half-torn-down widget.+ manager_->removeDockWidget(dw);+ dw->deleteLater();+ dock_widgets_.remove(id);+ if (auto* sw = screens_.take(id))+ sw->deleteLater();+ factories_.remove(id);+ instance_ids_.remove(id);++ // 4. Set the target up. Transfer the factory + UUID before navigate()+ // so target's create_dock_widget() reuses the existing UUID instead+ // of minting a new one (and PanelRegistry's existing handle is+ // re-used, frame_id repointed by adopt_panel_instance).+ if (factory_copy)+ target->factories_.insert(id, factory_copy);+ if (!panel_uuid.is_null())+ target->adopt_panel_instance(id, panel_uuid);++ // 5. Materialise on target. navigate() will create the dock widget,+ // materialise the screen, and restore_screen_state will read the+ // UUID-keyed row written in step 1.+ target->navigate(id);++ LOG_INFO("DockRouter", QString("Moved panel '%1' (uuid=%2) to target frame")+ .arg(id, panel_uuid.to_string()));+ return true;+}++bool DockScreenRouter::tear_off_to_new_frame(const QString& id) {+ if (!dock_widgets_.contains(id)) {+ LOG_WARN("DockRouter", QString("tear_off_to_new_frame('%1'): no such panel").arg(id));+ return false;+ }+ if (!factories_.contains(id) && !screens_.contains(id)) {+ LOG_WARN("DockRouter",+ QString("tear_off_to_new_frame('%1'): no factory available, can't tear off").arg(id));+ return false;+ }++ // Spawn a new frame on the next monitor. Reuses WindowCycler's smart+ // placement so tear-offs land somewhere sensible (decision 5.6).+ WindowCycler::instance().new_window_on_next_monitor();++ // Find the freshly-created frame. WindowCycler::new_window_on_next_monitor+ // doesn't return a pointer, but the new frame is the most-recently-added+ // entry in WindowRegistry.+ auto frames = WindowRegistry::instance().frames();+ if (frames.isEmpty()) {+ LOG_ERROR("DockRouter", "tear_off_to_new_frame: spawned frame not found in registry");+ return false;+ }+ // The newly-created frame has the highest window_id, so it's last in+ // the (ascending) sorted list.+ WindowFrame* new_frame = frames.last();+ if (!new_frame || !new_frame->dock_router()) {+ LOG_ERROR("DockRouter", "tear_off_to_new_frame: spawned frame has no router");+ return false;+ }++ return move_panel_to_frame(id, new_frame->dock_router());+}+ads::CDockWidget* DockScreenRouter::create_dock_widget(const QString& id) {if (dock_widgets_.contains(id))return dock_widgets_[id];@@ -911,11 +1109,18 @@ ads::CDockWidget* DockScreenRouter::create_dock_widget(const QString& id) {auto* dw = new ads::CDockWidget(manager_, title_for_id(id));dw->setObjectName(id);- // Pinnable is intentionally excluded: the auto-hide pin button converts panels- // to collapsible sidebars, which causes them to disappear when another panel- // is opened alongside them. Movable/Floatable/Closable/Focusable are kept.- dw->setFeatures(ads::CDockWidget::DockWidgetMovable | ads::CDockWidget::DockWidgetFloatable |- ads::CDockWidget::DockWidgetClosable | ads::CDockWidget::DockWidgetFocusable);+ // Phase 5 polish: DockWidgetFloatable removed alongside the global+ // DoubleClickUndocksWidget flag (see WindowFrame::setup_docking_mode).+ // Tear-off goes through the right-click menu's "Tear off into new+ // window" entry, which uses the close-and-recreate path that+ // preserves the panel UUID + state.+ //+ // Pinnable is intentionally excluded too: the auto-hide pin button+ // converts panels to collapsible sidebars, which causes them to+ // disappear when another panel is opened alongside them.+ dw->setFeatures(ads::CDockWidget::DockWidgetMovable |+ ads::CDockWidget::DockWidgetClosable |+ ads::CDockWidget::DockWidgetFocusable);// Use dock-widget minimum size (not content size) so screens with large// internal canvases (like DashboardCanvas) don't prevent side-by-side splits.@@ -926,6 +1131,33 @@ ads::CDockWidget* DockScreenRouter::create_dock_widget(const QString& id) {// from wrap_with_group_badge below) can resolve the tab via dock_widgets_.dock_widgets_[id] = dw;+ // Phase 4b: mint a PanelInstanceId for this string id and register a+ // PanelHandle with PanelRegistry. The handle's frame_id comes from+ // the parent WindowFrame (the router's QObject parent). Two open+ // panels of the same screen type get distinct UUIDs because they go+ // through duplicate_panel() which calls create_dock_widget with a+ // synthetic `<base>#dup<N>` id — each gets its own UUID.+ if (!instance_ids_.contains(id)) {+ const PanelInstanceId panel_uuid = PanelInstanceId::generate();+ instance_ids_.insert(id, panel_uuid);++ WindowId frame_id; // null if the router's parent isn't a WindowFrame+ if (auto* frame = qobject_cast<WindowFrame*>(parent()))+ frame_id = frame->frame_uuid();++ // Strip any "#dup<N>" suffix from the type id so two watchlists+ // share a type_id of "watchlist" while having distinct instance_ids.+ QString type_id = id;+ const int dup_idx = type_id.indexOf("#dup");+ if (dup_idx > 0)+ type_id = type_id.left(dup_idx);++ auto* handle = new PanelHandle(panel_uuid, type_id, title_for_id(type_id), frame_id);+ handle->set_dock_widget(dw);+ handle->set_state(PanelHandle::State::Active); // dock widget is created+ PanelRegistry::instance().register_panel(handle);+ }+// Screen widgets must allow shrinking so ADS can create side-by-side splits.// Factory screens get a lightweight placeholder here; the real widget is swapped// in on first navigation via materialize_screen().@@ -975,9 +1207,6 @@ ads::CDockWidget* DockScreenRouter::create_dock_widget(const QString& id) {});// Materialize on first show; save state on hide.- // Grid tracking (panel_count_, grid_*) is NOT updated here — hide signals- // fire during exclusive resets and would corrupt the counter before the- // new panel is placed. Grid is updated only inside navigate() itself.connect(dw, &ads::CDockWidget::visibilityChanged, this, [this, id](bool visible) {if (visible) {materialize_screen(id);@@ -1013,7 +1242,12 @@ void DockScreenRouter::materialize_screen(const QString& id) {return;}screen->setMinimumWidth(0);- factories_.erase(fit);+ // Phase 5: keep the factory in factories_ even after first materialise.+ // Pre-Phase-5 we erased it as a memory tidy-up, but tear-off / move-to-+ // window need to re-create the widget on a different router, which+ // requires the factory to still be available. The factory is a small+ // std::function — no meaningful memory cost. duplicate_panel's+ // factory-reinstall workaround (line ~626) becomes unnecessary too.auto* dw = dock_widgets_.value(id, nullptr);if (!dw)@@ -1049,7 +1283,21 @@ void DockScreenRouter::save_screen_state(const QString& id) {auto* stateful = dynamic_cast<screens::IStatefulScreen*>(screen);if (!stateful)return;- ScreenStateManager::instance().save_now(stateful);++ // Phase 4c: prefer the UUID-keyed save path so two open panels of the+ // same screen type (e.g. two watchlists) get distinct rows in+ // screen_state. Fall back to the legacy screen-key path only if no+ // PanelInstanceId has been minted for this id — that would indicate+ // a screen registered before create_dock_widget() ran (shouldn't+ // happen in practice; defensive).+ const PanelInstanceId uuid = panel_uuid_for(id);+ if (!uuid.is_null()) {+ ScreenStateManager::instance().save_now_by_uuid(stateful, uuid.to_string());+ } else {+ LOG_DEBUG("DockRouter",+ QString("save_screen_state('%1'): no PanelInstanceId, falling back to screen-key path").arg(id));+ ScreenStateManager::instance().save_now(stateful);+ }}void DockScreenRouter::restore_screen_state(const QString& id) {@@ -1059,7 +1307,19 @@ void DockScreenRouter::restore_screen_state(const QString& id) {auto* stateful = dynamic_cast<screens::IStatefulScreen*>(screen);if (!stateful)return;- ScreenStateManager::instance().restore(stateful);++ // Phase 4c: load via the UUID-keyed path; restore_by_uuid falls back to+ // the legacy screen_key path internally on first run for users+ // upgrading, so no state is lost across the migration.+ const PanelInstanceId uuid = panel_uuid_for(id);+ if (!uuid.is_null()) {+ ScreenStateManager::instance().restore_by_uuid(+ stateful, uuid.to_string(), /*fallback_to_screen_key=*/true);+ } else {+ LOG_DEBUG("DockRouter",+ QString("restore_screen_state('%1'): no PanelInstanceId, falling back to screen-key path").arg(id));+ ScreenStateManager::instance().restore(stateful);+ }}void DockScreenRouter::apply_ads_theme() {diff --git a/fincept-qt/src/app/DockScreenRouter.h b/fincept-qt/src/app/DockScreenRouter.hindex 28d56398a..d8a71f495 100644--- a/fincept-qt/src/app/DockScreenRouter.h+++ b/fincept-qt/src/app/DockScreenRouter.h@@ -1,4 +1,5 @@#pragma once+#include "core/identity/Uuid.h"#include "core/symbol/SymbolGroup.h"#include <QHash>@@ -32,6 +33,13 @@ class DockScreenRouter : public QObject {explicit DockScreenRouter(ads::CDockManager* manager, QObject* parent = nullptr);+ /// Phase 4b: explicitly tear down PanelRegistry entries owned by this+ /// router. Without this, closing a WindowFrame would leave dangling+ /// PanelHandle entries pointing at a destroyed CDockManager — the+ /// registry's dock_widget pointers are QPointer-guarded but the type+ /// id / frame id metadata would still pollute find_by_frame() results.+ ~DockScreenRouter() override;+/// Register a pre-built screen (eager — lightweight screens).void register_screen(const QString& id, QWidget* screen);@@ -87,6 +95,73 @@ class DockScreenRouter : public QObject {/// Returns the new dock widget or nullptr on failure.ads::CDockWidget* duplicate_panel(const QString& id);+ /// Phase 6 final / decision 5.5: rearrange the currently-open panels+ /// into a 2x2 grid across the central area. Up to 4 panels:+ /// panel 1 → top-left full+ /// panel 2 → right-of-1+ /// panel 3 → below-1+ /// panel 4 → right-of-3 (= bottom-right)+ /// Panels 5+ tab into the bottom-right area.+ void tile_2x2();++ /// Phase 5: tear off a panel into a brand-new WindowFrame. Spawns the+ /// new frame on the next available monitor (mirrors the+ /// new-window-on-next-monitor placement policy). Then performs a+ /// close-and-recreate move into the new frame's router.+ ///+ /// Returns true on success. Common failure: the panel id is unknown+ /// or has no attached factory (eagerly-registered single-instance+ /// screens can't be torn off — the original frame would lose its+ /// only widget for that screen and the screen has no factory to+ /// re-create on the target).+ ///+ /// Edge case: if this is the only panel in the source frame, the+ /// source frame is left empty rather than destroyed. The user can+ /// close it manually if they want.+ ///+ /// Public because Phase 9 command handlers (`panel.tear_off`) call this+ /// alongside the right-click menu path. Originally protected when only+ /// the menu invoked it.+ bool tear_off_to_new_frame(const QString& id);++ /// Phase 5: move a panel from this router to another router. Used by+ /// the right-click "Move to window > Window N" context menu and by+ /// the panel.move_to_frame action (Phase 9 command handler).+ ///+ /// Mechanics: a close-and-recreate, NOT live cross-manager reparenting+ /// — the latter is feasible in ADS but introduces orphaned+ /// CFloatingDockContainer cleanup and gesture-interception complexity+ /// (see .grill-me/phase-5-complete.md for the feasibility report).+ /// Close-and-recreate is the proven path used by duplicate_panel.+ ///+ /// State is preserved: source flushes pending state, saves under the+ /// panel's instance UUID; the same UUID is transferred to the target+ /// router's instance_ids_ map; target navigate() materialises the+ /// screen and restore_screen_state reads the same UUID-keyed row.+ /// `panel_id`, `type_id`, and the `PanelInstanceId` are unchanged+ /// across the move — link group memberships and other shell-side+ /// metadata survive too.+ ///+ /// Returns true on success. No-op if `target` == this router, if+ /// `target` is null, or if the panel id is unknown.+ bool move_panel_to_frame(const QString& id, DockScreenRouter* target);++ /// Phase 5 helper: adopt a (string id, PanelInstanceId) pair from+ /// another router. Updates the existing PanelHandle's frame_id to+ /// point at this router's owning frame so PanelRegistry::find_by_frame+ /// returns correct results. Called by move_panel_to_frame on the+ /// target side; not generally useful elsewhere.+ void adopt_panel_instance(const QString& id, PanelInstanceId instance_id);++ /// Phase 4b: PanelInstanceId for the panel registered under string id.+ /// Returns null UUID if the id isn't known. The router maintains a+ /// 1:1 mapping (one PanelInstanceId per string id, including the+ /// duplicate-panel synthetic ids).+ ///+ /// Public because Phase 6 layout capture (`WindowFrame::capture_layout`)+ /// needs to read the saved-side UUID for each open panel.+ PanelInstanceId panel_uuid_for(const QString& id) const;+signals:void screen_changed(const QString& id);@@ -100,14 +175,21 @@ class DockScreenRouter : public QObject {QHash<QString, ScreenFactory> factories_; // pending lazy factoriesQString current_id_;- // Grid layout tracking — stores the dock area for each grid position.- // Populated as panels are opened (up to 4), used to place the next panel- // correctly (2x2 grid default). Cleared when exclusive navigation resets.- ads::CDockAreaWidget* grid_top_left_ = nullptr;- ads::CDockAreaWidget* grid_top_right_ = nullptr;- ads::CDockAreaWidget* grid_bottom_left_ = nullptr;- ads::CDockAreaWidget* grid_bottom_right_ = nullptr;- int panel_count_ = 0; // number of currently open panels+ /// Phase 4b: per-string-id PanelInstanceId. Populated lazily on first+ /// `create_dock_widget(id)` call. Lifetime is the router's; cleaned up+ /// by `~DockScreenRouter` indirectly via PanelRegistry::unregister_panel.+ QHash<QString, PanelInstanceId> instance_ids_;++ // Phase 4 grid removal: the four `grid_*_` CDockAreaWidget pointers and+ // `panel_count_` int are gone. ADS handles arbitrary splits natively;+ // navigate() now tabs new panels into the focused dock area or creates+ // a fresh central area. `add_alongside()` is the explicit "I want a+ // split" API and does its own RightDockWidgetArea split. Users wanting+ // the pre-Phase-4 hard-coded right-of-TL → below-TL → right-of-BL+ // cycle should split panels manually via ADS drag-drop.++ // Phase 4 grid removal: previous `grid_top_left_/_top_right_/_bottom_left_/_bottom_right_`+ // and `panel_count_` members deleted. See note above near instance_ids_.ads::CDockWidget* create_dock_widget(const QString& id);void materialize_screen(const QString& id);diff --git a/fincept-qt/src/app/MainWindow.h b/fincept-qt/src/app/MainWindow.hindex c3c1781f3..b5871af44 100644--- a/fincept-qt/src/app/MainWindow.h+++ b/fincept-qt/src/app/MainWindow.h@@ -1,138 +1,22 @@#pragma once-#include "ai_chat/AiChatBubble.h"-#include "app/ScreenRouter.h"+//+// Compatibility forwarder.+//+// `MainWindow` was renamed to `WindowFrame` in Phase 3 of the multi-window+// refactor (see `.grill-me/multi-window-implementation-plan.md`). All+// implementation lives in `app/WindowFrame.h`/`app/WindowFrame.cpp`.+//+// This header is kept for one release so external consumers (and stale+// `#include "app/MainWindow.h"` lines that haven't been touched yet) keep+// compiling. New code should prefer `#include "app/WindowFrame.h"` and the+// `WindowFrame` type directly.+//+// To remove: search for `#include "app/MainWindow.h"` across the codebase,+// replace with `#include "app/WindowFrame.h"`, then delete this file plus+// the `using` alias.+//+#include "app/WindowFrame.h"-#include <QMainWindow>-#include <QStackedWidget>-#include <QTimer>--class QScreen;-class QToolBar;--namespace ads {-class CDockManager;-}namespace fincept {-class DockScreenRouter;-}-namespace fincept::ui {-class DockToolBar;-class DockStatusBar;-class PushpinBar;-class TabBar;-} // namespace fincept::ui-namespace fincept::chat_mode {-class ChatModeScreen;+using MainWindow = WindowFrame;}-namespace fincept::screens {-class LockScreen;-}--namespace fincept {--class MainWindow : public QMainWindow {- Q_OBJECT- public:- /// @param window_id Unique id for this window instance (0 = primary, 1+ = secondary).- /// Primary restores saved geometry; secondary uses smart placement.- explicit MainWindow(int window_id = 0, QWidget* parent = nullptr);-- int window_id() const { return window_id_; }-- /// Returns the next unique window ID (thread-safe via Qt UI thread only).- /// The allocator is seeded from saved state on first call so that IDs- /// never collide with orphaned saved layouts from a previous session.- static int next_window_id();-- /// Screen router used by this window. Exposed so WindowCycler can ask- /// the currently-focused window to cycle its own panels.- DockScreenRouter* dock_router() const { return dock_router_; }-- /// Relocate this window to the given QScreen, preserving maximised /- /// fullscreen state and clamping size to the target's available area.- /// Called by WindowCycler for the Ctrl+Shift+N series of shortcuts.- void move_to_screen(QScreen* target);-- /// Apply / clear Qt::WindowStaysOnTopHint. Handles the Qt requirement- /// that the window be re-shown after toggling the flag. Persists the- /// state per-window in SessionManager. Safe to call with the current- /// state (no-op). Also called from Phase 12's right-click context menu.- void set_always_on_top(bool on);- bool is_always_on_top() const { return always_on_top_; }-- protected:- void closeEvent(QCloseEvent* event) override;- void resizeEvent(QResizeEvent* event) override;- void changeEvent(QEvent* event) override;-- private:- QStackedWidget* stack_ = nullptr;- QStackedWidget* auth_stack_ = nullptr;-- int window_id_ = 0;-- // ADS dock system- ads::CDockManager* dock_manager_ = nullptr;- DockScreenRouter* dock_router_ = nullptr;- ui::DockToolBar* dock_toolbar_ = nullptr;- ui::DockStatusBar* dock_status_bar_ = nullptr;- ui::PushpinBar* pushpin_bar_ = nullptr;- QToolBar* pushpin_toolbar_ = nullptr; // outer QToolBar that hosts pushpin_bar_- ui::TabBar* tab_bar_ = nullptr;-- // View state- bool focus_mode_ = false;- bool chat_mode_ = false;- bool always_on_top_ = false;- bool locked_ = false; ///< True while lock/PIN screen is active — blocks navigation.- bool pin_gate_cleared_ = false; ///< Set once the user has passed the PIN gate this session.- ///< Prevents subsequent auth_state_changed events (profile- ///< refresh, subscription fetch, focus refresh) from- ///< re-locking the terminal. Reset on lock / logout.- AiChatBubble* chat_bubble_ = nullptr;- QTimer* user_refresh_timer_ = nullptr;-- // Debounced persistence of dock layout on add/replace/remove via command bar.- // Without this, layout changes only survive clean shutdown (closeEvent),- // so a crash or kill loses the user's dock setup.- QTimer* dock_layout_save_timer_ = nullptr;- void schedule_dock_layout_save();-- // Chat mode- chat_mode::ChatModeScreen* chat_mode_screen_ = nullptr;-- // Lock/PIN screen- screens::LockScreen* lock_screen_ = nullptr;-- void setup_auth_screens();- void setup_app_screens();- void setup_docking_mode();- void setup_dock_screens();- void setup_navigation();- void on_auth_state_changed();- void toggle_chat_mode();- void show_lock_screen();- void on_terminal_unlocked();- void update_window_title();- /// Show or hide the toolbar/status bar shell (hidden during auth screens).- void set_shell_visible(bool visible);- /// Show the auth stack at the given index and hide the privileged shell.- /// All login/register/forgot/pricing/info transitions go through here.- void enter_auth_stack(int auth_index);-- // Info screens stack (Contact, Terms, Privacy, Trademarks, Help)- QStackedWidget* info_stack_ = nullptr;-- private slots:- void show_login();- void show_register();- void show_forgot_password();- void show_pricing();- void show_info_contact();- void show_info_terms();- void show_info_privacy();- void show_info_trademarks();- void show_info_help();-};--} // namespace finceptdiff --git a/fincept-qt/src/app/TerminalShell.cpp b/fincept-qt/src/app/TerminalShell.cppnew file mode 100644index 000000000..02f4cd17a--- /dev/null+++ b/fincept-qt/src/app/TerminalShell.cpp@@ -0,0 +1,223 @@+#include "app/TerminalShell.h"++#include "ai_chat/ChatBubbleController.h"+#include "auth/lock/LockOverlayController.h"+#include "core/actions/ActionRegistry.h"+#include "core/actions/builtin_actions.h"+#include "core/config/ProfileManager.h"+#include "core/logging/Logger.h"+#include "core/panel/PanelRegistry.h"+#include "core/profile/ProfilePaths.h"+#include "core/layout/LayoutCatalog.h"+#include "core/screen/MonitorWatcher.h"+#include "core/telemetry/LocalTelemetrySink.h"+#include "core/telemetry/TelemetryProvider.h"+#include "core/window/WindowRegistry.h"+#include "storage/repositories/SettingsRepository.h"+#include "storage/workspace/CrashRecovery.h"+#include "storage/workspace/WorkspaceDb.h"+#include "storage/workspace/WorkspaceSnapshotRing.h"++#include <QDateTime>+#include <QUuid>++namespace fincept {++namespace {+constexpr const char* kShellTag = "TerminalShell";+} // namespace++TerminalShell& TerminalShell::instance() {+ static TerminalShell s;+ return s;+}++void TerminalShell::initialise() {+ if (initialised_) {+ LOG_WARN(kShellTag, "initialise() called twice — ignoring");+ return;+ }++ LOG_INFO(kShellTag, "Shell initialising");++ // Resolve and cache the active profile UUID so every later phase has+ // a stable handle without re-reading the manifest. ProfileManager+ // mints + persists a UUID on first read if the manifest is legacy.+ active_profile_id_ = ProfileManager::instance().active_profile_id();+ LOG_INFO(kShellTag, QString("Active profile: %1 (id=%2)")+ .arg(ProfileManager::instance().active())+ .arg(active_profile_id_.to_string()));++ // Create the new per-profile directory tree (workspace.db, layouts/,+ // crashes/). Distinct from AppPaths::ensure_all() which creates the+ // legacy tree (data/, logs/, cache/, etc.) — both run, both are+ // idempotent.+ ProfilePaths::ensure_all();++ // Touch the registries so their static singletons construct *before*+ // any WindowFrame tries to register against them. Avoids a startup+ // race where the first window's constructor runs faster than the+ // registry's singleton init under aggressive optimisation.+ (void) WindowRegistry::instance();+ (void) ActionRegistry::instance();+ (void) PanelRegistry::instance();+ (void) ProfileManager::instance();+ // Phase 6 trim: MonitorWatcher boots here so its QGuiApplication signal+ // connections are in place before any frame restores. Phase 6's full+ // workspace-variant matcher will subscribe to topology_changed.+ (void) MonitorWatcher::instance();++ // Phase 1b skeleton: LockOverlayController construction. Currently a+ // no-op — the full lift is deferred (see auth/lock/LockOverlayController.h+ // for rationale). Constructing it here keeps the dependency direction+ // shell → controller correct so the future lift doesn't have to invert.+ auth::LockOverlayController::instance().initialise();++ // Phase 3 final: chat-bubble shell coordinator. Per-frame bubble+ // widgets stay where they are; this just centralises the shell-side+ // observation surface (frame add/remove tracking, future telemetry,+ // future cross-frame chat-session linking).+ ai_chat::ChatBubbleController::instance().initialise();++ // Phase 6: open the per-profile LayoutCatalog so Launchpad's recent-+ // layouts list + the layout.* actions can read/write immediately.+ {+ auto r = LayoutCatalog::instance().open();+ if (r.is_err()) {+ LOG_WARN(kShellTag, QString("LayoutCatalog open failed: %1")+ .arg(QString::fromStdString(r.error())));+ }+ }++ // Phase 10: install LocalTelemetrySink iff the user opted in. Settings+ // → Telemetry section (Phase 9 settings refactor) is the user-facing+ // toggle; for now it's an explicit SettingsRepository key. Default off+ // — no telemetry without consent.+ {+ auto r = SettingsRepository::instance().get("telemetry.local_enabled");+ const bool enabled = r.is_ok() && r.value() == "true";+ if (enabled) {+ static telemetry::LocalTelemetrySink local_sink;+ telemetry::TelemetrySink::instance().set_provider(&local_sink);+ LOG_INFO(kShellTag, "Local telemetry enabled");+ } else {+ LOG_DEBUG(kShellTag, "Telemetry off (telemetry.local_enabled != true)");+ }+ }++ // Phase 4 Track B: populate the action registry with the built-ins that+ // replaced WindowFrame's hard-coded keyboard wiring. Must happen before+ // any WindowFrame is constructed so the per-frame hotkey-binding loop+ // sees the full action set.+ actions::register_builtins();++ // ── Phase 2: workspace persistence + crash recovery ────────────────+ workspace_db_ = &WorkspaceDb::instance();+ auto db_open = workspace_db_->open(ProfilePaths::workspace_db());+ if (db_open.is_err()) {+ LOG_ERROR(kShellTag, QString("Failed to open workspace.db: %1")+ .arg(QString::fromStdString(db_open.error())));+ // Keep going — the shell can still run without persistence; later+ // saves just become no-ops. We don't want a corrupted db to brick+ // the terminal entirely.+ workspace_db_ = nullptr;+ } else {+ snapshot_ring_ = new WorkspaceSnapshotRing(workspace_db_);+ crash_recovery_ = new CrashRecovery(workspace_db_, snapshot_ring_);++ // Crash recovery check. Phase 2 logs only — Phase 6 wires the+ // dialog UI. The clean-shutdown marker write below would mask+ // the unclean state if it ran first, so check_for_recovery+ // happens *before* the new session row is opened.+ if (crash_recovery_->needs_recovery()) {+ LOG_WARN(kShellTag, "Previous session ended uncleanly — recovery candidates available");+ }++ // Mint a fresh session_id and open a session_history row.+ // ended_at + exit_kind stay NULL until shutdown() updates them.+ session_id_ = QUuid::createUuid().toString(QUuid::WithoutBraces);+ const qint64 now_ms = QDateTime::currentMSecsSinceEpoch();+ auto sess = workspace_db_->execute(+ "INSERT INTO session_history(session_id, profile_id, started_at) VALUES(?, ?, ?)",+ {session_id_, active_profile_id_.to_string(), now_ms});+ if (sess.is_err()) {+ LOG_WARN(kShellTag, QString("session_history insert failed: %1")+ .arg(QString::fromStdString(sess.error())));+ } else {+ LOG_INFO(kShellTag, QString("Session %1 started").arg(session_id_));+ }+ }++ initialised_ = true;+ LOG_INFO(kShellTag, "Shell initialised");+ emit started();+}++void TerminalShell::shutdown() {+ if (!initialised_)+ return;+ LOG_INFO(kShellTag, "Shell shutting down");+ emit shutting_down();++ // Update the session row + write the clean-shutdown marker. Order+ // matters: marker last, so that if the marker write fails the row's+ // ended_at is still recorded for diagnostics.+ if (workspace_db_ && workspace_db_->is_open()) {+ const qint64 now_ms = QDateTime::currentMSecsSinceEpoch();+ if (!session_id_.isEmpty()) {+ // frame_count + panel_count are best-effort: WindowRegistry+ // may have already started tearing down by aboutToQuit time+ // depending on which Qt finalizer ran first. Read it anyway —+ // a stale snapshot is fine for analytics.+ const int frame_count = WindowRegistry::instance().frame_count();+ auto upd = workspace_db_->execute(+ "UPDATE session_history SET ended_at = ?, exit_kind = 'clean', frame_count = ? "+ "WHERE session_id = ?",+ {now_ms, frame_count, session_id_});+ if (upd.is_err()) {+ LOG_WARN(kShellTag, QString("session_history update failed: %1")+ .arg(QString::fromStdString(upd.error())));+ }+ }+ if (crash_recovery_)+ crash_recovery_->mark_clean_shutdown();+ }++ // Tear down owned objects in reverse construction order.+ delete crash_recovery_;+ crash_recovery_ = nullptr;+ delete snapshot_ring_;+ snapshot_ring_ = nullptr;+ if (workspace_db_) {+ workspace_db_->close();+ workspace_db_ = nullptr;+ }++ initialised_ = false;+ // The underlying singletons (Logger, SessionManager, etc.) clean+ // themselves up via qAddPostRoutine and Qt's exit hooks. We don't+ // tear them down explicitly here — main.cpp's aboutToQuit handlers+ // own that.+}++ProfileId TerminalShell::active_profile_id() const {+ return active_profile_id_;+}++WindowRegistry& TerminalShell::window_registry() {+ return WindowRegistry::instance();+}++ActionRegistry& TerminalShell::action_registry() {+ return ActionRegistry::instance();+}++PanelRegistry& TerminalShell::panel_registry() {+ return PanelRegistry::instance();+}++ProfileManager& TerminalShell::profile_manager() {+ return ProfileManager::instance();+}++} // namespace finceptdiff --git a/fincept-qt/src/app/TerminalShell.h b/fincept-qt/src/app/TerminalShell.hnew file mode 100644index 000000000..85c3ca433--- /dev/null+++ b/fincept-qt/src/app/TerminalShell.h@@ -0,0 +1,114 @@+#pragma once+#include "core/identity/Uuid.h"++#include <QObject>+#include <QString>++namespace fincept {++class WindowRegistry;+class ActionRegistry;+class PanelRegistry;+class ProfileManager;+class WorkspaceDb;+class WorkspaceSnapshotRing;+class CrashRecovery;++/// Process-singleton owning everything that lives "above any single window."+///+/// The plan calls for `WindowFrame` to shed concerns it shouldn't own —+/// authentication, lock state, services init, theme, profile — into a place+/// that survives window creation and destruction. That place is `TerminalShell`.+///+/// Phase 1 ships the **skeleton**:+/// - `initialise()` is the formal "shell came up" event. main.cpp calls it+/// immediately after constructing QApplication. The implementation today+/// wires nothing new — just confirms the invariants and emits started().+/// - The shell exposes accessors for the registries it owns (just refs to+/// the existing singletons). These accessors give Phase 2-9 code a single+/// ergonomic entry point: `TerminalShell::instance().window_registry()`+/// instead of `WindowRegistry::instance()` everywhere.+///+/// Phase 1b lifts auth + lock + InactivityGuard ownership into the shell and+/// installs `LockOverlayController`. That work needs careful coordination+/// with the PIN security audit invariants and is staged separately. For now+/// existing auth/lock paths in WindowFrame keep working unchanged.+///+/// Threading: UI-thread only. There is exactly one TerminalShell per process.+/// Calling instance() from a worker thread is a bug.+class TerminalShell : public QObject {+ Q_OBJECT+ public:+ static TerminalShell& instance();++ /// Bring the shell up. Call once from main.cpp after QApplication+ /// construction, before the first WindowFrame is shown. Idempotent —+ /// repeat calls are no-ops with a warning log.+ ///+ /// Today this:+ /// - Marks the shell as initialised (gates instance() consumers from+ /// racing with the construction order during early startup).+ /// - Bootstraps profile paths under the active profile (mkpath the+ /// new directories the multi-window refactor introduces).+ /// - Resolves the active ProfileId so every later phase can use it.+ ///+ /// Phase 1b adds lock controller installation here.+ /// Phase 4 adds builtin_actions registration here.+ void initialise();++ /// Tear down the shell. main.cpp calls this on aboutToQuit so persistence+ /// flushes can run before Qt destroys QApplication. Idempotent.+ void shutdown();++ bool is_initialised() const { return initialised_; }++ /// Active profile UUID. Stable across the session. Null if shutdown()+ /// has been called or initialise() hasn't yet.+ ProfileId active_profile_id() const;++ /// Convenience accessors. Each forwards to the underlying singleton.+ /// Centralising them makes mocking the shell in unit tests tractable+ /// without per-singleton patches.+ WindowRegistry& window_registry();+ ActionRegistry& action_registry();+ PanelRegistry& panel_registry();+ ProfileManager& profile_manager();++ /// Workspace persistence + recovery. Exposed as pointers so they stay+ /// nullable during early init / after shutdown — callers should null-+ /// check rather than expect a constant reference.+ WorkspaceDb* workspace_db() { return workspace_db_; }+ WorkspaceSnapshotRing* snapshot_ring() { return snapshot_ring_; }+ CrashRecovery* crash_recovery() { return crash_recovery_; }++ /// The session_id minted in initialise(). Stable for this process. Used+ /// as the row key in workspace_db's session_history table.+ QString session_id() const { return session_id_; }++ signals:+ /// Emitted at the end of initialise() once all bootstrapping has run.+ /// Subscribers can hook startup-time work here without knowing about+ /// main.cpp's exact wiring order.+ void started();++ /// Emitted at the start of shutdown(), before any teardown actually+ /// runs. Last chance for subscribers to flush state.+ void shutting_down();++ private:+ TerminalShell() = default;++ bool initialised_ = false;+ ProfileId active_profile_id_;+ QString session_id_;++ /// Owned objects. Constructed in initialise(), destroyed in shutdown().+ /// Raw pointers because the std::unique_ptr wrapper would force+ /// inclusion of WorkspaceDb.h here, leaking storage/ into every+ /// translation unit that touches the shell.+ WorkspaceDb* workspace_db_ = nullptr;+ WorkspaceSnapshotRing* snapshot_ring_ = nullptr;+ CrashRecovery* crash_recovery_ = nullptr;+};++} // namespace finceptdiff --git a/fincept-qt/src/app/MainWindow.cpp b/fincept-qt/src/app/WindowFrame.cppsimilarity index 66%rename from fincept-qt/src/app/MainWindow.cpprename to fincept-qt/src/app/WindowFrame.cppindex f8b057e8a..a5507270e 100644--- a/fincept-qt/src/app/MainWindow.cpp+++ b/fincept-qt/src/app/WindowFrame.cpp@@ -1,17 +1,24 @@-#include "app/MainWindow.h"+#include "app/WindowFrame.h"#include "ai_chat/AiChatBubble.h"#include "ai_chat/AiChatScreen.h"#include "ai_chat/LlmService.h"#include "app/DockScreenRouter.h"-#include "mcp/ToolFilterPolicy.h"#include "auth/AuthManager.h"#include "auth/InactivityGuard.h"#include "auth/PinManager.h"+#include "auth/lock/LockOverlayController.h"+#include "core/symbol/IGroupLinked.h"+#include "core/symbol/SymbolGroup.h"+#include "screens/IStatefulScreen.h"#include "core/config/ProfileManager.h"#include "core/events/EventBus.h"+#include "app/TerminalShell.h"+#include "core/actions/ActionRegistry.h"+#include "core/actions/builtin_actions.h"#include "core/keys/KeyConfigManager.h"#include "core/keys/WindowCycler.h"+#include "core/window/WindowRegistry.h"#include "core/logging/Logger.h"#include "core/session/SessionManager.h"#include "screens/ComingSoonScreen.h"@@ -77,7 +84,10 @@#include "ui/navigation/DockStatusBar.h"#include "ui/navigation/DockToolBar.h"#include "ui/navigation/FKeyBar.h"+#include "ui/command/QuickCommandBar.h"+#include "ui/command/CommandPalette.h"#include "ui/components/ComponentBrowserDialog.h"+#include "ui/debug/DebugOverlay.h"#include "ui/navigation/NavigationBar.h"#include "ui/navigation/StatusBar.h"#include "ui/navigation/ToolBar.h"@@ -98,6 +108,9 @@#include <QPalette>#include <QScreen>#include <QShortcut>+#include <QJsonDocument>+#include <QJsonObject>+#include <QJsonValue>#include <QStatusBar>#include <QToolBar>#include <QVBoxLayout>@@ -112,25 +125,41 @@namespace fincept {-int MainWindow::next_window_id() {+int WindowFrame::next_window_id() {// Seed from the max of (persisted window IDs, live window IDs) so a new// window never reuses an ID that already owns saved geometry/dock layout.// Live IDs matter too: during a single session we may have deleted a// secondary window without clearing its QSettings keys yet, and we still- // must not collide with any MainWindow currently on screen.+ // must not collide with any WindowFrame currently on screen.int max_id = 0;const auto saved = SessionManager::instance().load_window_ids();for (int id : saved)max_id = std::max(max_id, id);- const auto top_widgets = QApplication::topLevelWidgets();- for (QWidget* w : top_widgets) {- if (auto* mw = qobject_cast<MainWindow*>(w))- max_id = std::max(max_id, mw->window_id());- }+ // Live frames (Phase 1: WindowRegistry replaces the topLevelWidgets walk).+ for (int id : WindowRegistry::instance().frame_ids())+ max_id = std::max(max_id, id);return max_id + 1;}-MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), window_id_(window_id) {+WindowFrame::WindowFrame(int window_id, QWidget* parent) : QMainWindow(parent), window_id_(window_id) {+ // Phase 8: seed the dynamic property DataHub uses to gate+ // pause_when_inactive topics. Initial state = active (we wouldn't be+ // constructing the frame if we didn't intend to show it). changeEvent+ // updates this on every minimise/restore.+ setProperty("fincept.active_for_work", true);++ // Phase 6 trim: connect QWindow::screenChanged so paint-cached widgets+ // can invalidate at the new DPR. The QWindow is created lazily on+ // first show — queue the connect via QMetaObject::invokeMethod with+ // QueuedConnection so it runs after the event loop has had a chance+ // to construct the window handle.+ QMetaObject::invokeMethod(this, [this]() {+ if (auto* wh = windowHandle()) {+ connect(wh, &QWindow::screenChanged, this,+ [this](QScreen* scr) { emit screen_changed(scr); });+ }+ }, Qt::QueuedConnection);+// Show active profile in title bar when using a non-default profileconst QString profile = ProfileManager::instance().active();setWindowTitle(profile == "default" ? "Fincept Terminal" : QString("Fincept Terminal [%1]").arg(profile));@@ -216,6 +245,16 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wiif (always_on_top_)setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);+ // Bootstrap pin_gate_cleared_ from the process-wide locked flag. Without+ // this, opening a second WindowFrame (--new-window IPC) while the user is+ // already PIN-unlocked would treat the new window as un-gated and force+ // a redundant PIN re-entry. The singleton flag is the source of truth for+ // "user has cleared the PIN gate this session"; the per-window field is+ // a cache so on_auth_state_changed() can skip re-prompting.+ pin_gate_cleared_ = !auth::InactivityGuard::instance().is_terminal_locked()+ && auth::AuthManager::instance().is_authenticated()+ && auth::PinManager::instance().has_pin();+auto* master_stack = new QStackedWidget;// ── Auth stack ───────────────────────────────────────────────────────────@@ -227,25 +266,41 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wichat_mode_screen_ = new chat_mode::ChatModeScreen;// ── Lock Screen ─────────────────────────────────────────────────────────- lock_screen_ = new screens::LockScreen;+ // Phase 1c lift: LockOverlayController owns LockScreen widgets. The+ // frame asks for its widget via the controller; master_stack reparents+ // it via addWidget() below. WindowFrame keeps a non-owning pointer for+ // the existing apply_lock_state / show_unlock / show_setup paths that+ // already exist (preserving security-audit invariants — see+ // auth/lock/LockOverlayController.h).+ lock_screen_ = auth::LockOverlayController::instance().lock_screen_for(this);// ── ADS Docking mode ─────────────────────────────────────────────────────setup_docking_mode();master_stack->addWidget(dock_manager_->parentWidget()); // index 1 — dock_wrappermaster_stack->addWidget(chat_mode_screen_); // index 2master_stack->addWidget(lock_screen_); // index 3 — lock/PIN screen- connect(chat_mode_screen_, &chat_mode::ChatModeScreen::exit_requested, this, &MainWindow::toggle_chat_mode);+ connect(chat_mode_screen_, &chat_mode::ChatModeScreen::exit_requested, this, &WindowFrame::toggle_chat_mode);// Lock screen signals- connect(lock_screen_, &screens::LockScreen::unlocked, this, &MainWindow::on_terminal_unlocked);+ connect(lock_screen_, &screens::LockScreen::unlocked, this, &WindowFrame::on_terminal_unlocked);connect(lock_screen_, &screens::LockScreen::reauth_requested, this, []() {- // Max PIN attempts exceeded — force full re-login+ // Max PIN attempts exceeded — wipe the PIN (this is the ONLY path+ // that should clear it) and force a full re-login so the server+ // re-validates the user before they can configure a new PIN.+ auth::PinManager::instance().clear_pin();auth::AuthManager::instance().logout();});- // Inactivity guard → lock screen+ // Inactivity guard → lock screen. The originator window handles+ // lock_requested by flipping the process-wide locked flag; the+ // terminal_locked_changed signal then drives every WindowFrame+ // (including this one, idempotently) to apply the lock UI. Without+ // this lock-step, a secondary window would keep showing live data+ // behind the back of the lock screen on the primary.connect(&auth::InactivityGuard::instance(), &auth::InactivityGuard::lock_requested, this,- &MainWindow::show_lock_screen);+ &WindowFrame::show_lock_screen);+ connect(&auth::InactivityGuard::instance(), &auth::InactivityGuard::terminal_locked_changed,+ this, &WindowFrame::apply_lock_state);setCentralWidget(master_stack);@@ -297,18 +352,11 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wi// Update the main window title bar to reflect the current screen name.connect(dock_router_, &DockScreenRouter::screen_changed, this, [this](const QString&) { update_window_title(); });- // Scope the LLM tool catalogue per active screen. ToolFilterPolicy returns- // std::nullopt for "kitchen-sink" surfaces (ai_chat, agent_config, …) —- // those clear the filter and get the full catalogue. Every other screen- // gets Tier-1 ∪ Tier-2 categories with a 50-tool cap.- connect(dock_router_, &DockScreenRouter::screen_changed, this, [](const QString& id) {- auto& llm = ai_chat::LlmService::instance();- auto filter = mcp::ToolFilterPolicy::filter_for_screen(id);- if (filter)- llm.set_tool_filter(*filter);- else- llm.clear_tool_filter();- });+ // Per-screen tool filter wiring removed (Tool RAG / Tier-0 model).+ // The LLM now sees a 6-tool Tier-0 prefix on every turn and discovers+ // the rest via tool.list — making per-screen scoping unnecessary and+ // counterproductive (it would prevent the LLM from finding tools the+ // user might want regardless of which screen happens to be active).connect(this, &QObject::destroyed, this, [this]() { WorkspaceManager::instance().remove_window(this); });@@ -336,7 +384,7 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wi}});- connect(toolbar, &ui::ToolBar::chat_mode_toggled, this, &MainWindow::toggle_chat_mode);+ connect(toolbar, &ui::ToolBar::chat_mode_toggled, this, &WindowFrame::toggle_chat_mode);connect(toolbar, &ui::ToolBar::navigate_to, this, [this](const QString& id) {if (!locked_) dock_router_->navigate(id, true);});@@ -377,159 +425,56 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wi}, Qt::QueuedConnection);});- // ── Keyboard shortcuts via KeyConfigManager ───────────────────────────────+ // ── Keyboard shortcuts via ActionRegistry (Phase 4) ───────────────────────+ //+ // Every global action is now defined once in core/actions/builtin_actions.cpp+ // and registered with ActionRegistry. KeyConfigManager still owns the+ // QAction-per-KeyAction (so live re-binding via Settings → Keybindings+ // continues to work), but each frame routes the QAction's `triggered`+ // signal through ActionRegistry::invoke(action_id, ctx) instead of the+ // pre-Phase-4 captured-`this` lambdas.+ //+ // The captured-`this` form had a latent bug in multi-window setups: an+ // action triggered from frame B would still execute against frame A's+ // state (locked_, focus_mode_, etc.) because `this` was fixed at bind+ // time. The registry resolves the focused frame live at invoke time.auto& km = KeyConfigManager::instance();-- auto* act_chat = km.action(KeyAction::ToggleChat);- act_chat->setShortcutContext(Qt::WindowShortcut);- addAction(act_chat);- connect(act_chat, &QAction::triggered, this, [this]() {- if (!locked_) toggle_chat_mode();- });-- auto* act_fs = km.action(KeyAction::Fullscreen);- act_fs->setShortcutContext(Qt::WindowShortcut);- addAction(act_fs);- connect(act_fs, &QAction::triggered, this, [this]() {- if (isFullScreen())- showNormal();- else- showFullScreen();- });-- auto* act_focus = km.action(KeyAction::FocusMode);- act_focus->setShortcutContext(Qt::WindowShortcut);- addAction(act_focus);- connect(act_focus, &QAction::triggered, this, [this]() {- if (locked_) return;- // Don't let the focus-mode shortcut toggle shell visibility while- // the user is on an auth screen — the toolbar must stay hidden.- if (stack_ && stack_->currentIndex() == 0) return;- focus_mode_ = !focus_mode_;- if (dock_toolbar_)- dock_toolbar_->setVisible(!focus_mode_);- if (dock_status_bar_)- dock_status_bar_->setVisible(!focus_mode_);- if (pushpin_toolbar_)- pushpin_toolbar_->setVisible(!focus_mode_);- });-- auto* act_refresh = km.action(KeyAction::Refresh);- act_refresh->setShortcutContext(Qt::WindowShortcut);- addAction(act_refresh);- connect(act_refresh, &QAction::triggered, this, [this]() {- if (locked_) return;- if (dock_manager_) {- auto* focused = dock_manager_->focusedDockWidget();- if (focused && focused->widget())- QMetaObject::invokeMethod(focused->widget(), "refresh", Qt::QueuedConnection);+ auto& reg = ActionRegistry::instance();+ for (KeyAction a : km.all_actions()) {+ const QString action_id = actions::action_id_for(a);+ if (action_id.isEmpty())+ continue; // per-screen action; handled elsewhere+ if (!reg.contains(action_id)) {+ LOG_WARN("WindowFrame", QString("KeyAction → action_id mapping references unregistered id: %1")+ .arg(action_id));+ continue;}- });-- auto* act_screenshot = km.action(KeyAction::Screenshot);- act_screenshot->setShortcutContext(Qt::WindowShortcut);- addAction(act_screenshot);- connect(act_screenshot, &QAction::triggered, this, [this]() {- QScreen* scr = this->screen();- if (!scr)- scr = QApplication::primaryScreen();- QPixmap px = scr->grabWindow(winId());- const QString path = QFileDialog::getSaveFileName(- this, "Save Screenshot",- QDir::homePath() + "/fincept_" + QDateTime::currentDateTime().toString("yyyyMMdd_HHmmss") + ".png",- "PNG Images (*.png)");- if (!path.isEmpty()) {- px.save(path, "PNG");- LOG_INFO("MainWindow", QString("Screenshot saved: %1").arg(path));- }- });-- // Manual lock (default Ctrl+L). Bypasses the inactivity timer — useful- // when stepping away from an unlocked terminal. This action is deliberately- // NOT guarded by `locked_` (it's a lock command; already-locked is a no-op- // via show_lock_screen's early-return). Requires authentication + a- // configured PIN, which show_lock_screen also enforces.- if (auto* act_lock = km.action(KeyAction::LockNow)) {- act_lock->setShortcutContext(Qt::ApplicationShortcut);- addAction(act_lock);- connect(act_lock, &QAction::triggered, this, []() {- auth::InactivityGuard::instance().trigger_manual_lock();- });- }-- // Minimize-to-lock is handled in changeEvent() — see its override. We- // only install the key shortcut here. The setting `security.lock_on_minimize`- // (default off) governs the behaviour and is read each time the event fires.-- // ── Phase 3: window/panel keyboard navigation ────────────────────────────- // All actions are WindowShortcut-scoped so they only fire against the- // active MainWindow. WindowCycler::current_focused() then routes the- // action across windows when needed.- auto bind_km = [this](KeyAction a, std::function<void()> fn) {- auto* act = KeyConfigManager::instance().action(a);+ auto* act = km.action(a);if (!act)- return;- act->setShortcutContext(Qt::WindowShortcut);+ continue;+ // LockNow runs even when this frame isn't focused (e.g. user pressed+ // it from a dialog) — it's a global "secure my session" command.+ // Everything else is window-scoped so only the focused frame fires.+ act->setShortcutContext(a == KeyAction::LockNow ? Qt::ApplicationShortcut+ : Qt::WindowShortcut);addAction(act);- connect(act, &QAction::triggered, this, [this, fn]() {- if (locked_) return;- fn();+ connect(act, &QAction::triggered, this, [action_id]() {+ // Build a fresh context every invocation so the focused frame+ // is resolved live rather than captured. This is the bug-fix+ // that motivated the refactor.+ CommandContext ctx;+ ctx.shell = &TerminalShell::instance();+ ctx.focused_frame = WindowCycler::instance().focused_frame();+ // ctx.focused_panel left null — Phase 7 wires PanelRegistry's+ // focused-panel lookup once panels are UUID-keyed.+ auto r = ActionRegistry::instance().invoke(action_id, ctx);+ if (r.is_err()) {+ LOG_DEBUG("WindowFrame", QString("Action %1 returned error: %2")+ .arg(action_id, QString::fromStdString(r.error())));+ }});- };-- // Focus window by 1-based ordinal.- const KeyAction focus_keys[] = {- KeyAction::FocusWindow1, KeyAction::FocusWindow2, KeyAction::FocusWindow3,- KeyAction::FocusWindow4, KeyAction::FocusWindow5, KeyAction::FocusWindow6,- KeyAction::FocusWindow7, KeyAction::FocusWindow8, KeyAction::FocusWindow9,- };- for (int i = 0; i < 9; ++i) {- bind_km(focus_keys[i], [i]() { WindowCycler::instance().focus_window_by_index(i); });- }-- // Cycle panels inside the focused window.- bind_km(KeyAction::CyclePanelsForward,- []() { WindowCycler::instance().cycle_panels_in_current_window(true); });- bind_km(KeyAction::CyclePanelsBack,- []() { WindowCycler::instance().cycle_panels_in_current_window(false); });-- // Cycle between MainWindow instances.- bind_km(KeyAction::CycleWindowsForward,- []() { WindowCycler::instance().cycle_windows(true); });- bind_km(KeyAction::CycleWindowsBack,- []() { WindowCycler::instance().cycle_windows(false); });-- // New window on next monitor.- bind_km(KeyAction::NewWindowNextMonitor,- []() { WindowCycler::instance().new_window_on_next_monitor(); });-- // Move current window to monitor N (1-based in the shortcut, 0-based to the API).- const KeyAction move_keys[] = {- KeyAction::MoveWindowToMonitor1, KeyAction::MoveWindowToMonitor2,- KeyAction::MoveWindowToMonitor3, KeyAction::MoveWindowToMonitor4,- KeyAction::MoveWindowToMonitor5, KeyAction::MoveWindowToMonitor6,- KeyAction::MoveWindowToMonitor7, KeyAction::MoveWindowToMonitor8,- KeyAction::MoveWindowToMonitor9,- };- for (int i = 0; i < 9; ++i) {- bind_km(move_keys[i], [i]() { WindowCycler::instance().move_current_window_to_monitor(i); });}- // Component Browser (Phase 6)- bind_km(KeyAction::BrowseComponents, [this]() {- auto* dlg = new ui::ComponentBrowserDialog(this);- dlg->setAttribute(Qt::WA_DeleteOnClose);- connect(dlg, &ui::ComponentBrowserDialog::component_chosen, this, [this](const QString& id) {- if (dock_router_ && !id.isEmpty())- dock_router_->navigate(id);- });- dlg->show();- });-- // Always-on-top toggle (Phase 11) — shortcut targets the focused window- // because bind_km installs QAction with WindowShortcut context.- bind_km(KeyAction::ToggleAlwaysOnTop, [this]() { set_always_on_top(!always_on_top_); });-// Toolbar actionsconnect(toolbar, &ui::ToolBar::action_triggered, this, [this](const QString& action) {if (locked_) return;@@ -541,7 +486,7 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wireturn;}if (action == "new_window") {- auto* w = new MainWindow(MainWindow::next_window_id());+ auto* w = new WindowFrame(WindowFrame::next_window_id());w->setAttribute(Qt::WA_DeleteOnClose);// Place on the next available screen, or alongside this windowconst QList<QScreen*> screens = QGuiApplication::screens();@@ -572,7 +517,7 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wi}}if (!target) {- LOG_WARN("MainWindow", QString("Move to monitor: screen '%1' not found").arg(target_name));+ LOG_WARN("WindowFrame", QString("Move to monitor: screen '%1' not found").arg(target_name));return;}move_to_screen(target);@@ -604,7 +549,7 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wiQInputDialog::getText(this, "Save Layout", "Layout name:", QLineEdit::Normal, QString(), &ok);if (ok && !name.trimmed().isEmpty()) {dock_manager_->addPerspective(name.trimmed());- LOG_INFO("MainWindow", QString("Saved perspective: %1").arg(name.trimmed()));+ LOG_INFO("WindowFrame", QString("Saved perspective: %1").arg(name.trimmed()));}}} else if (action.startsWith("perspective_")) {@@ -643,7 +588,7 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wifor (int i = 1; i < screens.size(); ++i)dock_router_->navigate(screens[i]); // fill grid}- LOG_INFO("MainWindow", QString("Quick Switch: %1 (%2 panels)").arg(action).arg(screens.size()));+ LOG_INFO("WindowFrame", QString("Quick Switch: %1 (%2 panels)").arg(action).arg(screens.size()));}} else if (action == "logout") {auth::AuthManager::instance().logout();@@ -707,7 +652,7 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wi"PNG Images (*.png)");if (!path.isEmpty()) {px.save(path, "PNG");- LOG_INFO("MainWindow", QString("Screenshot saved: %1").arg(path));+ LOG_INFO("WindowFrame", QString("Screenshot saved: %1").arg(path));}}});@@ -724,8 +669,8 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wi// Auth stateconnect(&auth::AuthManager::instance(), &auth::AuthManager::auth_state_changed, this,- &MainWindow::on_auth_state_changed);- connect(&auth::AuthManager::instance(), &auth::AuthManager::logged_out, this, &MainWindow::on_auth_state_changed);+ &WindowFrame::on_auth_state_changed);+ connect(&auth::AuthManager::instance(), &auth::AuthManager::logged_out, this, &WindowFrame::on_auth_state_changed);// Restore window state (maximised, toolbar positions, etc.)// Note: restoreState() also restores QToolBar visibility, which can@@ -766,13 +711,13 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wi// Sanity check: if restoreState produced an unreasonable number// of visible dock areas (>6), the layout is likely corrupt.if (dock_restored && dock_manager_->openedDockAreas().size() > 6) {- LOG_WARN("MainWindow", QString("Dock layout corrupt: %1 open areas — resetting")+ LOG_WARN("WindowFrame", QString("Dock layout corrupt: %1 open areas — resetting").arg(dock_manager_->openedDockAreas().size()));dock_restored = false;}}} else if (saved_version != 0) {- LOG_INFO("MainWindow", QString("Dock layout version mismatch (saved %1, expected %2) — resetting")+ LOG_INFO("WindowFrame", QString("Dock layout version mismatch (saved %1, expected %2) — resetting").arg(saved_version).arg(kDockLayoutVersion));}@@ -795,7 +740,7 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wi// If user is authenticated and has a PIN, show lock screen first.// If no PIN, on_auth_state_changed will route to PIN setup.if (auth_mgr.is_authenticated() && auth::PinManager::instance().has_pin()) {- LOG_INFO("MainWindow", "Session restored — showing PIN unlock");+ LOG_INFO("WindowFrame", "Session restored — showing PIN unlock");lock_screen_->show_unlock();locked_ = true;set_shell_visible(false);@@ -810,7 +755,7 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wi}if (!dock_restored) {dock_router_->navigate("dashboard");- LOG_INFO("MainWindow", "Applied clean default dock layout");+ LOG_INFO("WindowFrame", "Applied clean default dock layout");} else {// Restore last-active screen as the focused tab and sync tab barconst QString last = SessionManager::instance().last_screen();@@ -827,13 +772,20 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wion_auth_state_changed();}- // Periodic refresh of user credits/plan (every 3 minutes)+ // Periodic refresh of user credits/plan (every 3 minutes). Skip while+ // the terminal is locked — we shouldn't be making authenticated API+ // calls behind the back of the PIN gate, and the user can't see the+ // refreshed data anyway. The timer keeps running (cheap) but the+ // callback short-circuits.user_refresh_timer_ = new QTimer(this);user_refresh_timer_->setInterval(3 * 60 * 1000);connect(user_refresh_timer_, &QTimer::timeout, this, []() {auto& auth = auth::AuthManager::instance();- if (auth.is_authenticated())- auth.refresh_user_data();+ if (!auth.is_authenticated())+ return;+ if (auth::InactivityGuard::instance().is_terminal_locked())+ return;+ auth.refresh_user_data();});user_refresh_timer_->start();@@ -842,7 +794,10 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wiconnect(qApp, &QApplication::applicationStateChanged, this, [](Qt::ApplicationState state) {if (state == Qt::ApplicationActive) {auto& auth = auth::AuthManager::instance();- if (auth.is_authenticated())+ // Skip refresh while locked — same reason as the periodic+ // timer above. check_for_resume_lock() below still runs so+ // a wall-clock-elapsed lock fires immediately on wake.+ if (auth.is_authenticated() && !auth::InactivityGuard::instance().is_terminal_locked())auth.refresh_user_data();// Resume-from-sleep lock: QTimer pauses during OS suspend, so a// 5-minute timer can carry 4:59 of remaining time across a@@ -854,7 +809,7 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wi});}-void MainWindow::toggle_chat_mode() {+void WindowFrame::toggle_chat_mode() {if (locked_) return;chat_mode_ = !chat_mode_;@@ -868,7 +823,7 @@ void MainWindow::toggle_chat_mode() {if (chat_bubble_)chat_bubble_->setVisible(false);stack_->setCurrentIndex(2);- LOG_INFO("MainWindow", "Entered Chat Mode");+ LOG_INFO("WindowFrame", "Entered Chat Mode");} else {stack_->setCurrentIndex(1);if (dock_toolbar_)@@ -887,11 +842,11 @@ void MainWindow::toggle_chat_mode() {chat_bubble_->raise();}}- LOG_INFO("MainWindow", "Exited Chat Mode");+ LOG_INFO("WindowFrame", "Exited Chat Mode");}}-void MainWindow::setup_auth_screens() {+void WindowFrame::setup_auth_screens() {auto* login = new screens::LoginScreen;auto* reg = new screens::RegisterScreen;auto* forgot = new screens::ForgotPasswordScreen;@@ -918,10 +873,10 @@ void MainWindow::setup_auth_screens() {auth_stack_->addWidget(info_stack_); // index 4// ── Auth navigation ──────────────────────────────────────────────────────- connect(login, &screens::LoginScreen::navigate_register, this, &MainWindow::show_register);- connect(login, &screens::LoginScreen::navigate_forgot_password, this, &MainWindow::show_forgot_password);- connect(reg, &screens::RegisterScreen::navigate_login, this, &MainWindow::show_login);- connect(forgot, &screens::ForgotPasswordScreen::navigate_login, this, &MainWindow::show_login);+ connect(login, &screens::LoginScreen::navigate_register, this, &WindowFrame::show_register);+ connect(login, &screens::LoginScreen::navigate_forgot_password, this, &WindowFrame::show_forgot_password);+ connect(reg, &screens::RegisterScreen::navigate_login, this, &WindowFrame::show_login);+ connect(forgot, &screens::ForgotPasswordScreen::navigate_login, this, &WindowFrame::show_login);connect(pricing, &screens::PricingScreen::navigate_dashboard, this, [this]() {set_shell_visible(true);stack_->setCurrentIndex(1);@@ -930,31 +885,48 @@ void MainWindow::setup_auth_screens() {// ── Info screen navigation ───────────────────────────────────────────────// Back from info → return to previous auth screen (login by default)- connect(contact, &screens::ContactScreen::navigate_back, this, &MainWindow::show_login);- connect(terms, &screens::TermsScreen::navigate_back, this, &MainWindow::show_login);- connect(terms, &screens::TermsScreen::navigate_privacy, this, &MainWindow::show_info_privacy);- connect(terms, &screens::TermsScreen::navigate_contact, this, &MainWindow::show_info_contact);- connect(privacy, &screens::PrivacyScreen::navigate_back, this, &MainWindow::show_login);- connect(privacy, &screens::PrivacyScreen::navigate_terms, this, &MainWindow::show_info_terms);- connect(privacy, &screens::PrivacyScreen::navigate_contact, this, &MainWindow::show_info_contact);- connect(trademarks, &screens::TrademarksScreen::navigate_back, this, &MainWindow::show_login);- connect(help, &screens::HelpScreen::navigate_back, this, &MainWindow::show_login);- connect(help, &screens::HelpScreen::navigate_register, this, &MainWindow::show_register);- connect(help, &screens::HelpScreen::navigate_forgot_password, this, &MainWindow::show_forgot_password);+ connect(contact, &screens::ContactScreen::navigate_back, this, &WindowFrame::show_login);+ connect(terms, &screens::TermsScreen::navigate_back, this, &WindowFrame::show_login);+ connect(terms, &screens::TermsScreen::navigate_privacy, this, &WindowFrame::show_info_privacy);+ connect(terms, &screens::TermsScreen::navigate_contact, this, &WindowFrame::show_info_contact);+ connect(privacy, &screens::PrivacyScreen::navigate_back, this, &WindowFrame::show_login);+ connect(privacy, &screens::PrivacyScreen::navigate_terms, this, &WindowFrame::show_info_terms);+ connect(privacy, &screens::PrivacyScreen::navigate_contact, this, &WindowFrame::show_info_contact);+ connect(trademarks, &screens::TrademarksScreen::navigate_back, this, &WindowFrame::show_login);+ connect(help, &screens::HelpScreen::navigate_back, this, &WindowFrame::show_login);+ connect(help, &screens::HelpScreen::navigate_register, this, &WindowFrame::show_register);+ connect(help, &screens::HelpScreen::navigate_forgot_password, this, &WindowFrame::show_forgot_password);}-void MainWindow::setup_docking_mode() {+void WindowFrame::setup_docking_mode() {// ADS global config must be set before the first CDockManager is constructed.- // Guard with a static flag since multiple MainWindow instances share one process.+ // Guard with a static flag since multiple WindowFrame instances share one process.static bool s_ads_configured = false;if (!s_ads_configured) {+ // Phase 5 polish: ADS native float deliberately disabled.+ //+ // Pre-Phase-5 dragging a panel out of a frame's bounds spawned an+ // ADS CFloatingDockContainer — owned by the source frame's manager,+ // not a real WindowFrame. That conflicted with the multi-window+ // refactor's "every panel lives in some frame" decision (2.2): a+ // floating panel was neither in its origin frame nor a separate+ // frame. Reaching into ADS to intercept the drop and reparent+ // across CDockManagers is feasible but requires hooking+ // CDockAreaTabBar mouse handlers (not exposed). The cleaner v1+ // path is to disable native float and route tear-off through the+ // existing right-click "Tear off into new window" / "Move to+ // window > N" menu (Phase 5 close-and-recreate path).+ //+ // Removed flags vs Phase-pre-5:+ // - DoubleClickUndocksWidget (used to float-on-tab-double-click)+ // Per-widget removal: DockWidgetFloatable feature (in+ // DockScreenRouter::create_dock_widget) — see note there.ads::CDockManager::setConfigFlags(ads::CDockManager::DefaultOpaqueConfig |ads::CDockManager::AlwaysShowTabs | ads::CDockManager::DockAreaHasTabsMenuButton |ads::CDockManager::DockAreaDynamicTabsMenuButtonVisibility |ads::CDockManager::FloatingContainerHasWidgetTitle | ads::CDockManager::FloatingContainerHasWidgetIcon |ads::CDockManager::EqualSplitOnInsertion // prevents new panels from spawning tiny slivers- | ads::CDockManager::DoubleClickUndocksWidget // double-click tab to float);// Disable auto-hide entirely: the pin button converts panels to collapsible// sidebars which collapse when another panel is opened beside them.@@ -1002,7 +974,7 @@ void MainWindow::setup_docking_mode() {[this](ads::CFloatingDockContainer*) { schedule_dock_layout_save(); });}-void MainWindow::setup_dock_screens() {+void WindowFrame::setup_dock_screens() {dock_router_->register_factory("dashboard", []() { return new screens::DashboardScreen; });dock_router_->register_factory("markets", []() { return new screens::MarketsScreen; });dock_router_->register_factory("crypto_trading", []() { return new screens::CryptoTradingScreen; });@@ -1065,10 +1037,10 @@ void MainWindow::setup_dock_screens() {dock_router_->register_screen("help", new screens::HelpScreen);}-void MainWindow::setup_app_screens() {}-void MainWindow::setup_navigation() {}+void WindowFrame::setup_app_screens() {}+void WindowFrame::setup_navigation() {}-void MainWindow::on_auth_state_changed() {+void WindowFrame::on_auth_state_changed() {auto& auth = auth::AuthManager::instance();// If logged out while the lock screen is active (e.g. max PIN attempts → reauth),@@ -1099,23 +1071,30 @@ void MainWindow::on_auth_state_changed() {if (stack_->currentIndex() == 1 || stack_->currentIndex() == 2) {if (!pin_gate_cleared_) {if (auth.needs_pin_setup()) {- LOG_INFO("MainWindow", "Authenticated (on app stack) but no PIN — showing PIN setup");+ LOG_INFO("WindowFrame", "Authenticated (on app stack) but no PIN — showing PIN setup");lock_screen_->show_setup();locked_ = true;set_shell_visible(false);stack_->setCurrentIndex(3);+ // Raise the process-wide locked flag so SessionGuard's+ // pulse path and DockScreenRouter both know the user+ // hasn't passed the PIN gate yet — without this, a+ // backend 401 during the PIN-setup window can force a+ // logout behind the lock screen.+ auth::InactivityGuard::instance().set_terminal_locked(true);return;}if (auth::PinManager::instance().has_pin()) {- LOG_INFO("MainWindow", "Authenticated (on app stack) with PIN — showing PIN unlock");+ LOG_INFO("WindowFrame", "Authenticated (on app stack) with PIN — showing PIN unlock");lock_screen_->show_unlock();locked_ = true;set_shell_visible(false);stack_->setCurrentIndex(3);+ auth::InactivityGuard::instance().set_terminal_locked(true);return;}}- LOG_DEBUG("MainWindow", QString("on_auth_state_changed: skipping redirect, "+ LOG_DEBUG("WindowFrame", QString("on_auth_state_changed: skipping redirect, ""stack index=%1, chat_mode=%2, gate_cleared=%3").arg(stack_->currentIndex()).arg(chat_mode_)@@ -1131,19 +1110,21 @@ void MainWindow::on_auth_state_changed() {// Skip if user is already on the lock screen (index 3).if (stack_->currentIndex() != 3) {if (auth.needs_pin_setup()) {- LOG_INFO("MainWindow", "Authenticated but no PIN — showing PIN setup");+ LOG_INFO("WindowFrame", "Authenticated but no PIN — showing PIN setup");lock_screen_->show_setup();locked_ = true;set_shell_visible(false);stack_->setCurrentIndex(3);+ auth::InactivityGuard::instance().set_terminal_locked(true);return;}if (auth::PinManager::instance().has_pin()) {- LOG_INFO("MainWindow", "Authenticated with PIN — showing PIN unlock");+ LOG_INFO("WindowFrame", "Authenticated with PIN — showing PIN unlock");lock_screen_->show_unlock();locked_ = true;set_shell_visible(false);stack_->setCurrentIndex(3);+ auth::InactivityGuard::instance().set_terminal_locked(true);return;}}@@ -1155,7 +1136,7 @@ void MainWindow::on_auth_state_changed() {// still locked or ungated, log a warning so the regression is// visible rather than leaking the dashboard for one frame.if (locked_ || !pin_gate_cleared_) {- LOG_WARN("MainWindow",+ LOG_WARN("WindowFrame",QString("on_auth_state_changed: shell would become visible while ""locked=%1 gate_cleared=%2 — forcing lock screen").arg(locked_).arg(pin_gate_cleared_));@@ -1208,100 +1189,121 @@ void MainWindow::on_auth_state_changed() {// privileged shell (menus, command bar, CHAT, LOGOUT, status ticker) cannot// be seen by an unauthenticated user. Title is also reset by set_shell_visible// so the last-visited screen name does not leak.-void MainWindow::enter_auth_stack(int auth_index) {+void WindowFrame::enter_auth_stack(int auth_index) {set_shell_visible(false);stack_->setCurrentIndex(0);auth_stack_->setCurrentIndex(auth_index);}-void MainWindow::show_login() {+void WindowFrame::show_login() {enter_auth_stack(0);}-void MainWindow::show_register() {+void WindowFrame::show_register() {enter_auth_stack(1);}-void MainWindow::show_forgot_password() {+void WindowFrame::show_forgot_password() {enter_auth_stack(2);}-void MainWindow::show_pricing() {+void WindowFrame::show_pricing() {enter_auth_stack(3);}-void MainWindow::show_info_contact() {+void WindowFrame::show_info_contact() {info_stack_->setCurrentIndex(0);enter_auth_stack(4);}-void MainWindow::show_info_terms() {+void WindowFrame::show_info_terms() {info_stack_->setCurrentIndex(1);enter_auth_stack(4);}-void MainWindow::show_info_privacy() {+void WindowFrame::show_info_privacy() {info_stack_->setCurrentIndex(2);enter_auth_stack(4);}-void MainWindow::show_info_trademarks() {+void WindowFrame::show_info_trademarks() {info_stack_->setCurrentIndex(3);enter_auth_stack(4);}-void MainWindow::show_info_help() {+void WindowFrame::show_info_help() {info_stack_->setCurrentIndex(4);enter_auth_stack(4);}-void MainWindow::show_lock_screen() {+void WindowFrame::show_lock_screen() {auto& auth = auth::AuthManager::instance();if (!auth.is_authenticated()) {- LOG_DEBUG("MainWindow", "show_lock_screen: ignored — not authenticated");+ LOG_DEBUG("WindowFrame", "show_lock_screen: ignored — not authenticated");return;}- // Don't lock if already on lock screen or login screen — traced so- // spurious inactivity ticks during auth transitions are visible in logs.- if (stack_->currentIndex() == 3) {- LOG_DEBUG("MainWindow", "show_lock_screen: ignored — already on lock screen");- return;- }- if (stack_->currentIndex() == 0) {- LOG_DEBUG("MainWindow", "show_lock_screen: ignored — currently on auth stack");+ // Raise the process-wide locked flag. Every WindowFrame listens for+ // terminal_locked_changed and applies the lock UI itself in+ // apply_lock_state() — including this one, idempotently. Stop the+ // inactivity guard so the activity stream on the lock screen does+ // not generate no-op ticks until the PIN is accepted.+ auth::InactivityGuard::instance().set_enabled(false);+ auth::InactivityGuard::instance().set_terminal_locked(true);+}++void WindowFrame::apply_lock_state(bool locked) {+ if (locked) {+ // Idempotent — if already on the lock screen, nothing to do.+ if (stack_->currentIndex() == 3)+ return;+ // Skip if this window is currently on the auth stack — login screen+ // is its own gate. Spurious lock during auth transition would push+ // a lock screen over the login screen which is meaningless.+ if (stack_->currentIndex() == 0) {+ LOG_DEBUG("WindowFrame", "apply_lock_state(true): on auth stack — skipping");+ return;+ }+ LOG_INFO("WindowFrame", QString("Locking window %1").arg(window_id_));+ lock_screen_->activate();+ locked_ = true;+ pin_gate_cleared_ = false;+ set_shell_visible(false);+ stack_->setCurrentIndex(3);+ if (chat_bubble_)+ chat_bubble_->setVisible(false);++ // Disable widgets behind the lock screen so keyboard shortcuts,+ // focus traversal, and dock-manager hit-testing cannot mutate state.+ if (dock_manager_ && dock_manager_->parentWidget())+ dock_manager_->parentWidget()->setEnabled(false);+ if (dock_toolbar_) dock_toolbar_->setEnabled(false);+ if (pushpin_toolbar_) pushpin_toolbar_->setEnabled(false);+ if (dock_status_bar_) dock_status_bar_->setEnabled(false);return;}- LOG_INFO("MainWindow", "Inactivity timeout — showing lock screen");- lock_screen_->activate();- locked_ = true;- pin_gate_cleared_ = false;- set_shell_visible(false);- stack_->setCurrentIndex(3);- if (chat_bubble_)- chat_bubble_->setVisible(false);-- // Disable widgets behind the lock screen so keyboard shortcuts, focus- // traversal, and dock-manager hit-testing cannot mutate state while the- // lock screen is shown. Re-enabled in on_terminal_unlocked().+ // Unlock — only the window the user typed the PIN into emits the+ // unlocked signal that lands in on_terminal_unlocked(). Secondary+ // windows take this path via terminal_locked_changed(false). For+ // them we just restore the dashboard chrome; PIN gate state is+ // per-window and stays cleared after the originator set it.+ if (stack_->currentIndex() != 3)+ return; // already unlocked+ LOG_INFO("WindowFrame", QString("Unlocking window %1 (sibling)").arg(window_id_));+ locked_ = false;+ pin_gate_cleared_ = true;if (dock_manager_ && dock_manager_->parentWidget())- dock_manager_->parentWidget()->setEnabled(false);- if (dock_toolbar_) dock_toolbar_->setEnabled(false);- if (pushpin_toolbar_) pushpin_toolbar_->setEnabled(false);- if (dock_status_bar_) dock_status_bar_->setEnabled(false);-- // Stop the inactivity guard while locked — the user-activity stream on- // the lock screen itself would otherwise keep firing no-op ticks, and- // there is nothing useful to do with them until the PIN is accepted.- // Also raise the process-wide locked flag so DockScreenRouter (and any- // other background navigator) refuses to mutate panel state.- auth::InactivityGuard::instance().set_terminal_locked(true);- auth::InactivityGuard::instance().set_enabled(false);+ dock_manager_->parentWidget()->setEnabled(true);+ if (dock_toolbar_) dock_toolbar_->setEnabled(true);+ if (pushpin_toolbar_) pushpin_toolbar_->setEnabled(true);+ if (dock_status_bar_) dock_status_bar_->setEnabled(true);+ set_shell_visible(true);+ stack_->setCurrentIndex(1);}-void MainWindow::on_terminal_unlocked() {+void WindowFrame::on_terminal_unlocked() {auto& auth = auth::AuthManager::instance();- LOG_INFO("MainWindow", "Terminal unlocked via PIN");+ LOG_INFO("WindowFrame", QString("Terminal unlocked via PIN (window %1)").arg(window_id_));locked_ = false;pin_gate_cleared_ = true;- // Re-enable widgets disabled in show_lock_screen() and drop the- // process-wide locked flag that DockScreenRouter consults.- auth::InactivityGuard::instance().set_terminal_locked(false);-+ // Re-enable this window's widgets. Sibling MainWindows are handled by+ // apply_lock_state(false) once we flip the flag at the bottom of this+ // function — keep the flag-flip last so siblings don't race ahead and+ // restore their own UI before this originator is fully ready.if (dock_manager_ && dock_manager_->parentWidget())dock_manager_->parentWidget()->setEnabled(true);if (dock_toolbar_) dock_toolbar_->setEnabled(true);@@ -1310,8 +1312,19 @@ void MainWindow::on_terminal_unlocked() {// Enable/restart inactivity guard. It is disabled in show_lock_screen()// and on logout, so it may currently be off even though the filter is- // already installed on qApp from a previous unlock.+ // already installed on qApp from a previous unlock. Re-read the saved+ // timeout from settings so a value changed in Settings → Security takes+ // effect on the very next lock cycle even if the guard had been stopped+ // (e.g. across a lock/unlock or logout/login round-trip).auto& guard = auth::InactivityGuard::instance();+ {+ auto r = SettingsRepository::instance().get("security.lock_timeout_minutes");+ if (r.is_ok() && !r.value().isEmpty()) {+ int minutes = r.value().toInt();+ if (minutes > 0)+ guard.set_timeout_minutes(minutes);+ }+ }if (!guard.is_enabled()) {qApp->installEventFilter(&guard);guard.set_enabled(true);@@ -1348,10 +1361,15 @@ void MainWindow::on_terminal_unlocked() {auth_stack_->setCurrentIndex(3);}+ // Flip the process-wide locked flag LAST. Sibling MainWindows fan out+ // via terminal_locked_changed → apply_lock_state(false) and restore+ // their own dashboard chrome from this single source of truth.+ auth::InactivityGuard::instance().set_terminal_locked(false);+emit auth.terminal_unlocked();}-void MainWindow::set_shell_visible(bool visible) {+void WindowFrame::set_shell_visible(bool visible) {if (dock_toolbar_)dock_toolbar_->setVisible(visible && !focus_mode_ && !chat_mode_);if (dock_status_bar_)@@ -1366,7 +1384,7 @@ void MainWindow::set_shell_visible(bool visible) {}}-void MainWindow::update_window_title() {+void WindowFrame::update_window_title() {QString title = "Fincept Terminal";const QString profile = ProfileManager::instance().active();@@ -1394,7 +1412,7 @@ void MainWindow::update_window_title() {setWindowTitle(title);}-void MainWindow::set_always_on_top(bool on) {+void WindowFrame::set_always_on_top(bool on) {if (always_on_top_ == on)return;always_on_top_ = on;@@ -1409,11 +1427,11 @@ void MainWindow::set_always_on_top(bool on) {if (isVisible() || true) // always re-show; isVisible is false after the flag changeshow();SessionManager::instance().save_window_flag(window_id_, "always_on_top", on);- LOG_INFO("MainWindow",+ LOG_INFO("WindowFrame",QString("Window %1 always-on-top = %2").arg(window_id_).arg(on ? "on" : "off"));}-void MainWindow::move_to_screen(QScreen* target) {+void WindowFrame::move_to_screen(QScreen* target) {if (!target || screen() == target)return;@@ -1437,16 +1455,275 @@ void MainWindow::move_to_screen(QScreen* target) {else if (was_maximised)showMaximized();- LOG_INFO("MainWindow", QString("Moved window %1 to monitor '%2'")+ LOG_INFO("WindowFrame", QString("Moved window %1 to monitor '%2'").arg(window_id_).arg(target->name()));}-void MainWindow::schedule_dock_layout_save() {+WindowId WindowFrame::frame_uuid() const {+ if (frame_uuid_.is_null())+ frame_uuid_ = WindowId::generate();+ return frame_uuid_;+}++// ── Phase 6 final: capture / apply layout ───────────────────────────────────++layout::FrameLayout WindowFrame::capture_layout() const {+ layout::FrameLayout fl;+ fl.window_id = frame_uuid();+ fl.focus_mode = focus_mode_;+ fl.always_on_top = always_on_top_;+ fl.schema_version = layout::kFrameLayoutVersion;++ if (!dock_manager_ || !dock_router_)+ return fl;++ // ADS dock state — opaque blob covering splits, tab order, sizes.+ fl.dock_state = dock_manager_->saveState();++ // Active panel — whichever dock widget currently has focus.+ if (auto* focused = dock_manager_->focusedDockWidget()) {+ const QString id = focused->objectName();+ const auto uuid = dock_router_->panel_uuid_for(id);+ if (!uuid.is_null())+ fl.active_panel = uuid;+ }++ // Per-panel state. Walk every dock widget the manager knows about+ // (not just openedDockWidgets) — closed-but-registered panels still+ // belong in the layout so reopen restores their state. The router's+ // panel_uuid_for() returns the stable PanelInstanceId minted at+ // create_dock_widget() time.+ for (const auto& entry : dock_manager_->dockWidgetsMap().toStdMap()) {+ const QString& id = entry.first;+ ads::CDockWidget* dw = entry.second;+ if (!dw)+ continue;++ layout::PanelState ps;+ ps.instance_id = dock_router_->panel_uuid_for(id);+ ps.title = dw->windowTitle();++ // Strip "#dupN" suffix from the type id so two watchlists share+ // type_id="watchlist" but have distinct instance_ids.+ QString type_id = id;+ const int dup_idx = type_id.indexOf("#dup");+ if (dup_idx > 0)+ type_id = type_id.left(dup_idx);+ ps.type_id = type_id;++ // IGroupLinked screens carry a link group letter. SymbolGroup is+ // a single-char enum class; we serialise as the letter.+ if (auto* w = dw->widget()) {+ if (auto* linked = dynamic_cast<IGroupLinked*>(w)) {+ const SymbolGroup g = linked->group();+ if (g != SymbolGroup::None)+ ps.link_group = QString(QChar(symbol_group_letter(g)));+ }+ if (auto* stateful = dynamic_cast<screens::IStatefulScreen*>(w)) {+ stateful->flush_pending_state();+ const QVariantMap state = stateful->save_state();+ QJsonObject obj;+ for (auto it = state.constBegin(); it != state.constEnd(); ++it)+ obj.insert(it.key(), QJsonValue::fromVariant(it.value()));+ ps.state_blob = QJsonDocument(obj).toJson(QJsonDocument::Compact);+ ps.state_version = stateful->state_version();+ }+ }+ ps.schema_version = layout::kPanelStateVersion;+ fl.panels.append(ps);+ }++ LOG_INFO("WindowFrame", QString("capture_layout: window %1 -> %2 panels, dock_state=%3 bytes")+ .arg(window_id_).arg(fl.panels.size()).arg(fl.dock_state.size()));+ return fl;+}++bool WindowFrame::apply_layout(const layout::FrameLayout& fl) {+ if (!dock_manager_ || !dock_router_) {+ LOG_WARN("WindowFrame", "apply_layout: dock manager/router not ready");+ return false;+ }++ LOG_INFO("WindowFrame", QString("apply_layout: window %1, %2 panels, dock_state=%3 bytes")+ .arg(window_id_).arg(fl.panels.size()).arg(fl.dock_state.size()));++ // Phase 1: ensure every panel from the layout is registered with the+ // router and PanelRegistry. The dock_state blob from ADS references+ // dock widgets by objectName, so they must exist before restoreState+ // can reattach them. The router's create_dock_widget mints a fresh+ // PanelInstanceId; we override with the saved one so persisted state+ // round-trips cleanly.+ for (const auto& ps : fl.panels) {+ QString id = ps.type_id;+ // Synthesise a #dup suffix for non-first instances of the same+ // type_id. Walk earlier panels: if any prior panel shares this+ // type_id, we need a suffix.+ int dup_index = 0;+ for (const auto& other : fl.panels) {+ if (&other == &ps) break;+ if (other.type_id == ps.type_id) ++dup_index;+ }+ if (dup_index > 0)+ id = QString("%1#dup%2").arg(ps.type_id).arg(dup_index + 1);++ // Trigger create_dock_widget via navigate (false = non-exclusive).+ // After navigate, override the minted UUID with the saved one so+ // state restoration via TabSessionStore::load_screen_state_by_uuid+ // finds the right row.+ dock_router_->navigate(id, /*exclusive=*/false);+ if (!ps.instance_id.is_null())+ dock_router_->adopt_panel_instance(id, ps.instance_id);+ }++ // Phase 2: restore the ADS dock layout blob. CDockManager::restoreState+ // returns false if the blob is incompatible (version mismatch, missing+ // dock widgets). The caller (WorkspaceMatcher) decides whether to+ // fall back to a default layout.+ bool ok = true;+ if (!fl.dock_state.isEmpty()) {+ ok = dock_manager_->restoreState(fl.dock_state);+ if (!ok) {+ LOG_WARN("WindowFrame", "apply_layout: CDockManager::restoreState rejected dock blob");+ }+ }++ // Phase 3: chrome flags.+ if (focus_mode_ != fl.focus_mode)+ toggle_focus_mode();+ if (always_on_top_ != fl.always_on_top)+ set_always_on_top(fl.always_on_top);++ // Phase 4: activate the saved active panel.+ if (!fl.active_panel.is_null()) {+ const auto map = dock_manager_->dockWidgetsMap();+ for (auto it = map.constBegin(); it != map.constEnd(); ++it) {+ if (dock_router_->panel_uuid_for(it.key()) == fl.active_panel) {+ if (auto* dw = it.value()) {+ dw->raise();+ dw->setAsCurrentTab();+ }+ break;+ }+ }+ }++ return ok;+}++bool WindowFrame::is_active_for_work() const {+ // Best-effort per decision 9.1. Two cheap checks cover the obvious cases:+ // - isMinimized(): user clicked the minimise button or pressed Win+M.+ // - isVisible(): the widget tree is hidden (rare for top-level frames+ // in this app, but cheap to check).+ // Everything else (virtual-desktop occupancy, occlusion by other apps,+ // alt-tab status) is intentionally NOT detected — platform-specific and+ // unreliable.+ if (isMinimized())+ return false;+ if (!isVisible())+ return false;+ return true;+}++namespace {+// Phase 8 / decision 9.2: DataHub reads this dynamic property via+// QObject::property() to decide whether to fan out pause_when_inactive+// topics. Using a dynamic property (rather than a typed accessor) keeps+// the datahub layer free of any "app/WindowFrame.h" include — DataHub+// only needs Qt and the property name.+constexpr const char* kActiveForWorkProp = "fincept.active_for_work";+} // namespace++void WindowFrame::toggle_focus_mode() {+ // Don't let focus mode toggle shell visibility while the user is on an+ // auth screen — the toolbar must stay hidden there. Mirrors the gate+ // that lived inside the original inline lambda.+ if (stack_ && stack_->currentIndex() == 0)+ return;+ focus_mode_ = !focus_mode_;+ if (dock_toolbar_)+ dock_toolbar_->setVisible(!focus_mode_);+ if (dock_status_bar_)+ dock_status_bar_->setVisible(!focus_mode_);+ if (pushpin_toolbar_)+ pushpin_toolbar_->setVisible(!focus_mode_);+}++void WindowFrame::toggle_chat_mode_action() {+ // Public facade so action handlers in builtin_actions.cpp can call into+ // the existing private implementation without becoming friends of this+ // class. Caller has already gated on is_locked().+ toggle_chat_mode();+}++void WindowFrame::refresh_focused_panel() {+ if (!dock_manager_)+ return;+ auto* focused = dock_manager_->focusedDockWidget();+ if (focused && focused->widget())+ QMetaObject::invokeMethod(focused->widget(), "refresh", Qt::QueuedConnection);+}++void WindowFrame::open_component_browser() {+ auto* dlg = new ui::ComponentBrowserDialog(this);+ dlg->setAttribute(Qt::WA_DeleteOnClose);+ connect(dlg, &ui::ComponentBrowserDialog::component_chosen, this, [this](const QString& id) {+ if (dock_router_ && !id.isEmpty())+ dock_router_->navigate(id);+ });+ dlg->show();+}++void WindowFrame::toggle_debug_overlay() {+ // Lazy construction so users who never enable the overlay don't pay+ // for the QTimer + QLabel cost.+ if (!debug_overlay_) {+ debug_overlay_ = new ui::DebugOverlay(this);+ // Parent it to the main window so resizes auto-trigger reposition+ // via our resizeEvent. The overlay uses+ // WA_TransparentForMouseEvents so it never blocks dock interaction.+ }+ debug_overlay_->toggle_visible();+}++void WindowFrame::toggle_command_bar() {+ // Phase 9: lazy construction. Wraps a `ui::CommandBar` in a bottom+ // QToolBar so QMainWindow lays it out above the status bar.+ if (!command_bar_) {+ auto* bar = new ui::QuickCommandBar(this);+ auto* host = new QToolBar(this);+ host->setObjectName("commandBarHost");+ host->setMovable(false);+ host->setFloatable(false);+ host->setAllowedAreas(Qt::BottomToolBarArea);+ host->addWidget(bar);+ addToolBar(Qt::BottomToolBarArea, host);+ host->setVisible(false);+ host->setProperty("commandBarInner", QVariant::fromValue(static_cast<QWidget*>(bar)));+ command_bar_ = host;+ }+ if (command_bar_) {+ const bool was_visible = command_bar_->isVisible();+ command_bar_->setVisible(!was_visible);+ if (!was_visible) {+ if (auto* inner = command_bar_->property("commandBarInner").value<QWidget*>()) {+ if (auto* cb = qobject_cast<ui::QuickCommandBar*>(inner))+ cb->surface();+ }+ }+ }+}++void WindowFrame::open_command_palette() {+ ui::CommandPalette::show_for(this);+}++void WindowFrame::schedule_dock_layout_save() {if (dock_layout_save_timer_)dock_layout_save_timer_->start();}-void MainWindow::closeEvent(QCloseEvent* event) {+void WindowFrame::closeEvent(QCloseEvent* event) {WorkspaceManager::instance().save_workspace();SessionManager::instance().save_geometry(window_id_, saveGeometry(), saveState());// Record the monitor this window is currently on so startup can place@@ -1465,11 +1742,15 @@ void MainWindow::closeEvent(QCloseEvent* event) {// we're about to be destroyed). On next launch, main.cpp will iterate// this list and restore each secondary window. We also save the count// for legacy callers.+ //+ // WindowRegistry is the source of truth for live frames as of Phase 1+ // (decision 1.7); the previous QApplication::topLevelWidgets() walk+ // worked but pulled in non-WindowFrame toplevels (dialogs, ADS floats)+ // that needed to be cast away. Registry is cleaner and faster.QList<int> open_ids;- const auto top_widgets = QApplication::topLevelWidgets();- for (QWidget* w : top_widgets) {- if (auto* mw = qobject_cast<MainWindow*>(w); mw && mw != this)- open_ids.append(mw->window_id());+ for (int id : WindowRegistry::instance().frame_ids()) {+ if (id != window_id_)+ open_ids.append(id);}// Ensure this window is still saved for next run if it's the last one// being closed — user would expect to land back in their last layout,@@ -1480,19 +1761,46 @@ void MainWindow::closeEvent(QCloseEvent* event) {SessionManager::instance().save_window_ids(open_ids);SessionManager::instance().save_window_count(static_cast<int>(open_ids.size()));+ // Phase 2: force a workspace snapshot at close. The save_* calls above+ // each request a snapshot but the ring rate-limits to 60s — closing a+ // window after rapid changes could otherwise miss the latest state.+ // Forced flush bypasses the rate limit. Cheap (one INSERT).+ SessionManager::instance().flush_snapshot_now();+event->accept();}-void MainWindow::resizeEvent(QResizeEvent* event) {+void WindowFrame::resizeEvent(QResizeEvent* event) {QMainWindow::resizeEvent(event);if (chat_bubble_)chat_bubble_->reposition();+ if (debug_overlay_ && debug_overlay_->isVisible())+ debug_overlay_->reposition();}-void MainWindow::changeEvent(QEvent* event) {+void WindowFrame::changeEvent(QEvent* event) {QMainWindow::changeEvent(event);if (event->type() != QEvent::WindowStateChange)return;++ // Phase 8 / decision 9.1: emit active_for_work_changed when the flag+ // actually flips. Fires on minimise (true → false) AND restore+ // (false → true), so DataHub (and any other subscriber) can flush+ // pending updates when the user brings the window forward. We compute+ // is_active_for_work() now — Qt has already updated windowState by+ // the time WindowStateChange fires.+ {+ const bool now_active = is_active_for_work();+ if (now_active != last_active_for_work_) {+ last_active_for_work_ = now_active;+ // Update the dynamic property DataHub reads. Setting it BEFORE+ // emitting the signal so any DataHub subscriber that reacts to+ // the signal sees the up-to-date property.+ setProperty(kActiveForWorkProp, now_active);+ emit active_for_work_changed(now_active);+ }+ }+if (!(windowState() & Qt::WindowMinimized))return;// Only lock if the user opted in and we are actually in an authenticated@@ -1502,8 +1810,23 @@ void MainWindow::changeEvent(QEvent* event) {return;auto r = SettingsRepository::instance().get("security.lock_on_minimize");const bool lock_on_min = r.is_ok() && r.value() == "true";- if (lock_on_min)- auth::InactivityGuard::instance().trigger_manual_lock();+ if (!lock_on_min)+ return;++ // Multi-window correctness (decision 8.8): minimising one window in a+ // multi-window setup is normal user behaviour, not a "walked away from+ // desk" event. Only trigger the lock when EVERY frame is minimised.+ //+ // Qt fires WindowStateChange before the frame is actually marked as+ // minimised in some platform queues, so re-check via WindowRegistry+ // *after* the next event-loop tick — at that point all minimisations+ // queued together (Win+M, "Show desktop") have been applied. The 200ms+ // delay also rides through transient lid-close/wake cycles where+ // Qt sees a minimise then immediately a restore.+ QTimer::singleShot(200, &auth::InactivityGuard::instance(), []() {+ if (WindowRegistry::instance().all_minimised())+ auth::InactivityGuard::instance().trigger_manual_lock();+ });}} // namespace finceptdiff --git a/fincept-qt/src/app/WindowFrame.h b/fincept-qt/src/app/WindowFrame.hnew file mode 100644index 000000000..094b1b2b5--- /dev/null+++ b/fincept-qt/src/app/WindowFrame.h@@ -0,0 +1,279 @@+#pragma once+#include "ai_chat/AiChatBubble.h"+#include "app/ScreenRouter.h"+#include "core/identity/Uuid.h"+#include "core/layout/LayoutTypes.h"++#include <QMainWindow>+#include <QPointer>+#include <QStackedWidget>+#include <QTimer>++class QScreen;+class QToolBar;++namespace ads {+class CDockManager;+}+namespace fincept {+class DockScreenRouter;+}+namespace fincept::ui {+class DockToolBar;+class DockStatusBar;+class PushpinBar;+class TabBar;+class DebugOverlay;+class QuickCommandBar;+} // namespace fincept::ui+namespace fincept::chat_mode {+class ChatModeScreen;+}+namespace fincept::screens {+class LockScreen;+}++namespace fincept {++class WindowFrame : public QMainWindow {+ Q_OBJECT+ public:+ /// @param window_id Unique id for this window instance (0 = primary, 1+ = secondary).+ /// Primary restores saved geometry; secondary uses smart placement.+ explicit WindowFrame(int window_id = 0, QWidget* parent = nullptr);++ int window_id() const { return window_id_; }++ /// Process-stable UUID for this frame instance. Lazily minted on first+ /// access and cached for the WindowFrame's lifetime. Used as the+ /// `PanelHandle::frame_id` for every panel docked into this frame so+ /// `PanelRegistry::find_by_frame(WindowId)` works without depending+ /// on the legacy int window_id_.+ ///+ /// The UUID is process-local (not persisted) — Phase 6 introduces the+ /// persisted Workspace.frames[].window_id mapping. Until then, this+ /// is a fresh UUIDv4 per frame construction.+ WindowId frame_uuid() const;++ /// Returns the next unique window ID (thread-safe via Qt UI thread only).+ /// The allocator is seeded from saved state on first call so that IDs+ /// never collide with orphaned saved layouts from a previous session.+ static int next_window_id();++ /// Screen router used by this window. Exposed so WindowCycler can ask+ /// the currently-focused window to cycle its own panels.+ DockScreenRouter* dock_router() const { return dock_router_; }++ /// Relocate this window to the given QScreen, preserving maximised /+ /// fullscreen state and clamping size to the target's available area.+ /// Called by WindowCycler for the Ctrl+Shift+N series of shortcuts.+ void move_to_screen(QScreen* target);++ /// Apply / clear Qt::WindowStaysOnTopHint. Handles the Qt requirement+ /// that the window be re-shown after toggling the flag. Persists the+ /// state per-window in SessionManager. Safe to call with the current+ /// state (no-op). Also called from Phase 12's right-click context menu.+ void set_always_on_top(bool on);+ bool is_always_on_top() const { return always_on_top_; }++ /// Phase 6 final: capture this frame's full layout into a `FrameLayout`+ /// suitable for serialisation into a `Workspace`. Walks every panel+ /// the dock router knows about, calls `IStatefulScreen::flush_pending_state`+ /// + `save_state()` on each, packages the per-panel blobs alongside+ /// the frame's metadata + ADS layout blob.+ ///+ /// The returned FrameLayout is fully self-contained — no aliases into+ /// live Qt widgets. Safe to JSON-serialise immediately.+ layout::FrameLayout capture_layout() const;++ /// Phase 6 final: restore this frame from a `FrameLayout`. Inverse of+ /// `capture_layout()`. For every PanelState in the layout: ensures the+ /// panel id is registered with the dock router (eager or factory),+ /// transfers the PanelInstanceId via `DockScreenRouter::adopt_panel_instance`,+ /// navigates to materialise. Then restores the ADS dock state via+ /// `CDockManager::restoreState`. Sets focus_mode + always_on_top+ /// from the layout. Activates the layout's `active_panel`.+ ///+ /// Returns true if the dock state restored cleanly. Returns false if+ /// the ADS blob was rejected (corrupt / version mismatch) — caller+ /// (WorkspaceMatcher fallback path) may then try a different variant+ /// or default layout.+ bool apply_layout(const layout::FrameLayout& layout);++ /// True while the lock/PIN screen is active on this frame. Action+ /// handlers consult this to short-circuit when the user has locked+ /// the terminal — actions are inert behind the lock overlay.+ bool is_locked() const { return locked_; }++ /// Whether this frame is "active for work" — Phase 8 / decision 9.1.+ /// Best-effort flag derived from `!isMinimized()` and `isVisible()`.+ /// Used by DataHub to gate fanout of `pause_when_inactive` topics so+ /// expensive update streams (sparklines, ticks) stop firing into a+ /// frame the user can't see.+ ///+ /// We deliberately do NOT try to detect virtual-desktop occupancy or+ /// other-window occlusion — both are platform-specific and the design+ /// doc (9.1) calls them out as best-effort-only. Minimised + hidden+ /// covers the obvious cases.+ bool is_active_for_work() const;++ signals:+ /// Emitted when `is_active_for_work()` flips. DataHub subscribes to+ /// this to invalidate its per-owner active-frame cache; widgets with+ /// their own throttling logic can also key off it.+ ///+ /// Fires from `changeEvent(WindowStateChange)` and `showEvent` /+ /// `hideEvent`. The state at signal emission is what+ /// `is_active_for_work()` returns immediately after.+ void active_for_work_changed(bool active);++ /// Phase 6 trim: emitted when this frame moves between physical screens+ /// (user dragged the window onto a different monitor). Subscribers that+ /// cache paint-rendered content at the old DPR (e.g. paint-cached+ /// QPixmap widgets, custom GL surfaces) should invalidate their cache+ /// here so the next paint redraws at the new DPR cleanly.+ ///+ /// Implemented by connecting QWindow::screenChanged to a forwarding+ /// slot in the constructor — fires once per screen transition.+ void screen_changed(QScreen* new_screen);++ public:+ // ── Action handler API (Phase 4 ActionRegistry integration) ─────────────+ //+ // The handlers in core/actions/builtin_actions.cpp call into these+ // methods on the focused frame. Each is a thin facade over what was+ // previously an inline lambda inside the constructor's keyboard-binding+ // block; lifting them out lets the registry route actions to the live+ // focused frame instead of capturing `this` at bind time.++ /// Flip focus mode (chrome hide/show).+ void toggle_focus_mode();++ /// Public entry into the chat-mode toggle the constructor used to wire+ /// directly. The internal `toggle_chat_mode()` remains private so legacy+ /// internal callers don't change.+ void toggle_chat_mode_action();++ /// Forward `refresh` to whichever panel currently has focus inside this+ /// frame. No-op if no panel is focused or it doesn't expose `refresh()`.+ void refresh_focused_panel();++ /// Open the Phase 6 Component Browser dialog scoped to this frame.+ void open_component_browser();++ /// Phase 10 trim: toggle the per-frame `DebugOverlay`. Lazily+ /// constructed on first invocation; subsequent calls flip visibility.+ /// The full Phase 10 overlay (per-panel render times, thread pool+ /// stats, paint-time histogram) is deferred — this is the minimal+ /// "tell me what frame I'm on and how busy DataHub is" surface.+ void toggle_debug_overlay();++ /// Phase 9: toggle the per-frame CommandBar (line-edit at the bottom).+ /// Lazily constructed on first invocation. Bloomberg-style "just type"+ /// surface that reads ActionRegistry and CommandParser.+ void toggle_command_bar();++ /// Phase 9: surface the CommandPalette (Ctrl+K modal) over this frame.+ /// Centred on this frame, not the primary screen, so multi-monitor+ /// users see it where they're looking.+ void open_command_palette();++ protected:+ void closeEvent(QCloseEvent* event) override;+ void resizeEvent(QResizeEvent* event) override;+ void changeEvent(QEvent* event) override;++ private:+ QStackedWidget* stack_ = nullptr;+ QStackedWidget* auth_stack_ = nullptr;++ int window_id_ = 0;++ /// Lazily-minted, process-stable UUID for this frame. See frame_uuid()+ /// for the rationale. mutable so the const accessor can mint on first+ /// call without needing a non-const path.+ mutable WindowId frame_uuid_;++ /// Cached value of `is_active_for_work()` — used by changeEvent to emit+ /// the `active_for_work_changed` signal only on actual state flips, not+ /// every redundant WindowStateChange (Qt fires multiple per minimise).+ /// Initialised to true (constructor sets a visible frame as active).+ bool last_active_for_work_ = true;++ /// Phase 10 trim: lazily-constructed debug overlay. nullptr until the+ /// user first invokes `toggle_debug_overlay()` — saves the widget ++ /// per-second QTimer cost for users who never enable it.+ ui::DebugOverlay* debug_overlay_ = nullptr;++ /// Phase 9: lazily-constructed CommandBar. Hidden by default.+ QPointer<QWidget> command_bar_;++ // ADS dock system+ ads::CDockManager* dock_manager_ = nullptr;+ DockScreenRouter* dock_router_ = nullptr;+ ui::DockToolBar* dock_toolbar_ = nullptr;+ ui::DockStatusBar* dock_status_bar_ = nullptr;+ ui::PushpinBar* pushpin_bar_ = nullptr;+ QToolBar* pushpin_toolbar_ = nullptr; // outer QToolBar that hosts pushpin_bar_+ ui::TabBar* tab_bar_ = nullptr;++ // View state+ bool focus_mode_ = false;+ bool chat_mode_ = false;+ bool always_on_top_ = false;+ bool locked_ = false; ///< True while lock/PIN screen is active — blocks navigation.+ bool pin_gate_cleared_ = false; ///< Set once the user has passed the PIN gate this session.+ ///< Prevents subsequent auth_state_changed events (profile+ ///< refresh, subscription fetch, focus refresh) from+ ///< re-locking the terminal. Reset on lock / logout.+ AiChatBubble* chat_bubble_ = nullptr;+ QTimer* user_refresh_timer_ = nullptr;++ // Debounced persistence of dock layout on add/replace/remove via command bar.+ // Without this, layout changes only survive clean shutdown (closeEvent),+ // so a crash or kill loses the user's dock setup.+ QTimer* dock_layout_save_timer_ = nullptr;+ void schedule_dock_layout_save();++ // Chat mode+ chat_mode::ChatModeScreen* chat_mode_screen_ = nullptr;++ // Lock/PIN screen+ screens::LockScreen* lock_screen_ = nullptr;++ void setup_auth_screens();+ void setup_app_screens();+ void setup_docking_mode();+ void setup_dock_screens();+ void setup_navigation();+ void on_auth_state_changed();+ void toggle_chat_mode();+ void show_lock_screen();+ /// Apply the lock UI state to THIS window. Idempotent. Wired to+ /// InactivityGuard::terminal_locked_changed so every window in the+ /// process locks in lockstep with the window that initiated the lock.+ void apply_lock_state(bool locked);+ void on_terminal_unlocked();+ void update_window_title();+ /// Show or hide the toolbar/status bar shell (hidden during auth screens).+ void set_shell_visible(bool visible);+ /// Show the auth stack at the given index and hide the privileged shell.+ /// All login/register/forgot/pricing/info transitions go through here.+ void enter_auth_stack(int auth_index);++ // Info screens stack (Contact, Terms, Privacy, Trademarks, Help)+ QStackedWidget* info_stack_ = nullptr;++ private slots:+ void show_login();+ void show_register();+ void show_forgot_password();+ void show_pricing();+ void show_info_contact();+ void show_info_terms();+ void show_info_privacy();+ void show_info_trademarks();+ void show_info_help();+};++} // namespace finceptdiff --git a/fincept-qt/src/app/main.cpp b/fincept-qt/src/app/main.cppindex 8df9f82c6..45839fb5d 100644--- a/fincept-qt/src/app/main.cpp+++ b/fincept-qt/src/app/main.cpp@@ -1,5 +1,6 @@-#include "ai_chat/LlmService.h"-#include "app/MainWindow.h"+#include "ai_chat/LlmService.h"+#include "app/WindowFrame.h"+#include "app/TerminalShell.h"#include "auth/AuthManager.h"#include "auth/InactivityGuard.h"#include "auth/PinManager.h"@@ -19,7 +20,11 @@#include "mcp/McpInit.h"#include "network/http/HttpClient.h"#include "python/PythonSetupManager.h"+#include "screens/launchpad/LaunchpadScreen.h"+#include "screens/recovery/CrashRecoveryDialog.h"#include "screens/setup/SetupScreen.h"+#include "storage/workspace/CrashRecovery.h"+#include "storage/workspace/WorkspaceSnapshotRing.h"#include "services/agents/AgentService.h"#include "services/dbnomics/DBnomicsService.h"#include "services/economics/EconomicsService.h"@@ -27,11 +32,13 @@#include "services/gov_data/GovDataService.h"#include "services/ma_analytics/MAAnalyticsService.h"#include "services/maritime/MaritimeService.h"+#include "services/maritime/PortsCatalog.h"#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/fincept_internal/FinceptInternalAdapter.h"#include "services/prediction/kalshi/KalshiAdapter.h"#include "services/prediction/polymarket/PolymarketAdapter.h"#include "services/relationship_map/RelationshipMapService.h"@@ -39,7 +46,12 @@#include "datahub/DataHub.h"#include "datahub/TopicPolicy.h"#include "services/billing/FeeDiscountService.h"+#include "services/billing/TierService.h"+#include "services/wallet/BuybackBurnService.h"+#include "services/wallet/RealYieldService.h"+#include "services/wallet/StakingService.h"#include "services/wallet/TokenMetadataService.h"+#include "services/wallet/TreasuryService.h"#include "services/wallet/WalletService.h"#include "trading/DataStreamManager.h"#include "trading/ExchangeService.h"@@ -129,6 +141,18 @@ int main(int argc, char* argv[]) {// ── Primary instance from here on ────────────────────────────────────────+ // Bring up the TerminalShell. This is the multi-window refactor's+ // process-level coordinator. Phase 1 ships a skeleton: it bootstraps+ // ProfilePaths, resolves the active ProfileId, and warms the registries+ // (WindowRegistry, ActionRegistry) so WindowFrame constructors don't race+ // their singleton init.+ //+ // Must run BEFORE any service init so future phases that lift services+ // into the shell can rely on it being present.+ fincept::TerminalShell::instance().initialise();+ QObject::connect(&app, &QCoreApplication::aboutToQuit,+ []() { fincept::TerminalShell::instance().shutdown(); });+// Register DataHub payload meta-types (QuoteData, HistoryPoint, InfoData,// NewsArticle, EconomicsResult) so they can flow through QVariant-keyed// topics and cross-thread queued signals. Phase 0 — see@@ -165,6 +189,12 @@ int main(int argc, char* argv[]) {std::make_unique<fincept::services::prediction::polymarket_ns::PolymarketAdapter>());reg.register_adapter(std::make_unique<fincept::services::prediction::kalshi_ns::KalshiAdapter>());+ // Phase 4 §4.3: Fincept internal prediction-market adapter joins the+ // registry as a sibling of Polymarket / Kalshi. Ships in demo mode+ // (curated mock dataset) until `fincept.markets_endpoint` is+ // configured and the `fincept_market` Anchor program is deployed.+ reg.register_adapter(+ std::make_unique<fincept::services::prediction::fincept_internal::FinceptInternalAdapter>());// Hydrate credentials from SecureStorage if previously saved. This// has to happen after registration so the adapters exist.@@ -178,6 +208,9 @@ int main(int argc, char* argv[]) {ks->set_credentials(*creds);}}+ if (auto* fi = reg.adapter(QStringLiteral("fincept"))) {+ fi->ensure_registered_with_hub();+ }}// Phase 5: NewsService as the news:general / news:symbol:* /// news:category:* / news:cluster:* producer.@@ -193,6 +226,7 @@ int main(int argc, char* argv[]) {// Phase 8: Geopolitics / Maritime / RelationshipMap / MAAnalytics.fincept::services::geo::GeopoliticsService::instance().ensure_registered_with_hub();fincept::services::maritime::MaritimeService::instance().ensure_registered_with_hub();+ fincept::services::maritime::PortsCatalog::instance().ensure_registered_with_hub();fincept::services::RelationshipMapService::instance().ensure_registered_with_hub();fincept::services::ma::MAAnalyticsService::instance().ensure_registered_with_hub();// Phase 9: AgentService as agent:* push-only producer (output/stream/status/routing/error).@@ -224,6 +258,79 @@ int main(int argc, char* argv[]) {hub.set_policy_pattern(QStringLiteral("billing:fncpt_discount:*"), p);}+ // Phase 5: buyback & burn dashboard producers (terminal-wide treasury:*+ // topics). Both producers ship in mock mode until the buyback worker+ // endpoint is configured via SecureStorage `fincept.treasury_endpoint`+ // and `fincept.treasury_pubkey`.+ {+ static fincept::wallet::BuybackBurnService buyback_burn_service;+ static fincept::wallet::TreasuryService treasury_service;+ auto& hub = fincept::datahub::DataHub::instance();+ hub.register_producer(&buyback_burn_service);+ hub.register_producer(&treasury_service);++ // Per-topic policies. Cadences mirror Phase 5 plan §5.3.+ fincept::datahub::TopicPolicy epoch_p;+ epoch_p.ttl_ms = 60 * 1000;+ epoch_p.min_interval_ms = 30 * 1000;+ hub.set_policy_pattern(QStringLiteral("treasury:buyback_epoch"), epoch_p);++ fincept::datahub::TopicPolicy burn_p;+ burn_p.ttl_ms = 5 * 60 * 1000;+ burn_p.min_interval_ms = 60 * 1000;+ hub.set_policy_pattern(QStringLiteral("treasury:burn_total"), burn_p);++ fincept::datahub::TopicPolicy supply_p;+ supply_p.ttl_ms = 60 * 60 * 1000;+ supply_p.min_interval_ms = 5 * 60 * 1000;+ hub.set_policy_pattern(QStringLiteral("treasury:supply_history"), supply_p);++ fincept::datahub::TopicPolicy reserves_p;+ reserves_p.ttl_ms = 5 * 60 * 1000;+ reserves_p.min_interval_ms = 60 * 1000;+ hub.set_policy_pattern(QStringLiteral("treasury:reserves"), reserves_p);++ fincept::datahub::TopicPolicy runway_p;+ runway_p.ttl_ms = 5 * 60 * 1000;+ runway_p.min_interval_ms = 60 * 1000;+ hub.set_policy_pattern(QStringLiteral("treasury:runway"), runway_p);+ }++ // Phase 3: STAKE tab producers (veFNCPT lock + real-yield + tier system).+ // All three ship in mock mode until SecureStorage `fincept.lock_program_id`+ // and `fincept.yield_endpoint` are configured. The mock payloads carry+ // `is_mock=true` so panels can surface a "not yet deployed" chip.+ {+ auto& hub = fincept::datahub::DataHub::instance();+ hub.register_producer(&fincept::wallet::StakingService::instance());+ hub.register_producer(&fincept::wallet::RealYieldService::instance());+ hub.register_producer(&fincept::billing::TierService::instance());++ // Plan §3.4 cadences.+ fincept::datahub::TopicPolicy locks_p;+ locks_p.ttl_ms = 60 * 1000;+ locks_p.min_interval_ms = 30 * 1000;+ hub.set_policy_pattern(QStringLiteral("wallet:locks:*"), locks_p);+ hub.set_policy_pattern(QStringLiteral("wallet:vefncpt:*"), locks_p);++ fincept::datahub::TopicPolicy yield_p;+ yield_p.ttl_ms = 5 * 60 * 1000;+ yield_p.min_interval_ms = 60 * 1000;+ hub.set_policy_pattern(QStringLiteral("wallet:yield:*"), yield_p);++ fincept::datahub::TopicPolicy revenue_p;+ revenue_p.ttl_ms = 60 * 60 * 1000;+ revenue_p.min_interval_ms = 5 * 60 * 1000;+ hub.set_policy_pattern(QStringLiteral("treasury:revenue"), revenue_p);++ // billing:tier:* is derived from wallet:vefncpt:* — TTL is just a+ // safety net; the service republishes whenever vefncpt emits.+ fincept::datahub::TopicPolicy tier_p;+ tier_p.ttl_ms = 60 * 1000;+ tier_p.min_interval_ms = 15 * 1000;+ hub.set_policy_pattern(QStringLiteral("billing:tier:*"), tier_p);+ }+// Create all application directories under %LOCALAPPDATA%/com.fincept.terminalfincept::AppPaths::ensure_all();@@ -463,7 +570,7 @@ int main(int argc, char* argv[]) {if (minutes > 0)guard.set_timeout_minutes(minutes);}- // Guard is installed on qApp and enabled by MainWindow::on_terminal_unlocked()+ // Guard is installed on qApp and enabled by WindowFrame::on_terminal_unlocked()// after the user successfully enters their PIN.}@@ -505,20 +612,40 @@ int main(int argc, char* argv[]) {screen_guard->hide();screen_guard->deleteLater();- fincept::KeyConfigManager::instance(); // init before MainWindow registers shortcuts- auto* window = new fincept::MainWindow(0); // primary window- window->setAttribute(Qt::WA_DeleteOnClose);- window->show();+ fincept::KeyConfigManager::instance(); // init before WindowFrame registers shortcuts++ // Phase 6 final: if the previous session ended uncleanly and a+ // workspace snapshot is available, give the user the option to+ // restore. On accept, WorkspaceShell::apply already constructs+ // the frames it needs — we skip our own primary-window creation+ // path. On skip (or no recovery available), fall through.+ bool recovered = false;+ if (auto* recovery = fincept::TerminalShell::instance().crash_recovery();+ recovery && recovery->needs_recovery()) {+ fincept::screens::CrashRecoveryDialog dlg(+ recovery, fincept::TerminalShell::instance().snapshot_ring());+ dlg.exec();+ recovered = dlg.was_restored();+ }++ if (!recovered) {+ auto* window = new fincept::WindowFrame(0); // primary window+ window->setAttribute(Qt::WA_DeleteOnClose);+ window->show();+ }// Restore any secondary windows that were open at last shutdown so// multi-monitor layouts survive across relaunches. Each window// restores its own geometry + dock layout from SessionManager.+ // Skip when recovered — WorkspaceShell::apply has already built+ // the right frame set.+ if (!recovered){const QList<int> saved_ids =fincept::SessionManager::instance().load_window_ids();for (int id : saved_ids) {if (id <= 0) continue; // 0 = primary, already created- auto* w = new fincept::MainWindow(id);+ auto* w = new fincept::WindowFrame(id);w->setAttribute(Qt::WA_DeleteOnClose);w->show();}@@ -530,14 +657,18 @@ int main(int argc, char* argv[]) {// Wire new-window handler now that the primary window existsQObject::connect(&app, &SingleApplication::receivedMessage,[](quint32 /*instanceId*/, QByteArray /*message*/) {- auto* w = new fincept::MainWindow(fincept::MainWindow::next_window_id());+ auto* w = new fincept::WindowFrame(fincept::WindowFrame::next_window_id());w->setAttribute(Qt::WA_DeleteOnClose);w->show();w->raise();w->activateWindow();LOG_INFO("App", "New window opened via secondary instance request");});- QObject::connect(&app, &QApplication::lastWindowClosed, &app, &QApplication::quit);+ // Phase 9 trim: surface Launchpad instead of quitting on last+ // frame close. Closing the Launchpad itself quits.+ QObject::connect(&app, &QApplication::lastWindowClosed, &app, []() {+ fincept::screens::LaunchpadScreen::instance()->surface();+ });if (!fincept::ai_chat::LlmService::instance().is_configured())LOG_WARN("App",@@ -554,22 +685,43 @@ int main(int argc, char* argv[]) {return app.exec();}- // Ensure KeyConfigManager is initialized before MainWindow registers shortcuts+ // Ensure KeyConfigManager is initialized before WindowFrame registers shortcutsfincept::KeyConfigManager::instance();- // Python already set up — launch main window directly- fincept::MainWindow window;- window.show();+ // Phase 6 final: offer crash recovery before constructing the primary+ // window. If the user accepts and restoration succeeds, WorkspaceShell+ // has already built the frames it needs from the snapshot — we skip+ // both the primary-window creation and the SessionManager-based+ // secondary-window restoration paths to avoid duplicating windows.+ bool recovered = false;+ if (auto* recovery = fincept::TerminalShell::instance().crash_recovery();+ recovery && recovery->needs_recovery()) {+ fincept::screens::CrashRecoveryDialog dlg(+ recovery, fincept::TerminalShell::instance().snapshot_ring());+ dlg.exec();+ recovered = dlg.was_restored();+ }++ // Heap-allocate the primary window so we can skip it on a successful+ // recovery without leaving a dead stack object behind. WA_DeleteOnClose+ // matches the secondary-window lifecycle below.+ if (!recovered) {+ auto* primary = new fincept::WindowFrame(0);+ primary->setAttribute(Qt::WA_DeleteOnClose);+ primary->show();+ }// Restore any secondary windows that were open at last shutdown. The- // primary window on the stack owns its own lifetime; restored secondaries- // use WA_DeleteOnClose and self-remove from QApplication::topLevelWidgets.- {+ // primary window owns its own lifetime via WA_DeleteOnClose; restored+ // secondaries use WA_DeleteOnClose and self-remove from+ // QApplication::topLevelWidgets. Skip when recovered — WorkspaceShell+ // has already built the right frame set.+ if (!recovered) {const QList<int> saved_ids =fincept::SessionManager::instance().load_window_ids();for (int id : saved_ids) {if (id <= 0) continue; // 0 = primary, already created- auto* w = new fincept::MainWindow(id);+ auto* w = new fincept::WindowFrame(id);w->setAttribute(Qt::WA_DeleteOnClose);w->show();}@@ -580,10 +732,10 @@ int main(int argc, char* argv[]) {// ── New-window handler: fires when the user re-launches the exe ──────────// The secondary instance sends "--new-window" and exits. We construct a new- // independent MainWindow in this process. WA_DeleteOnClose ensures cleanup.+ // independent WindowFrame in this process. WA_DeleteOnClose ensures cleanup.// QApplication::lastWindowClosed() → quit() handles the final exit.QObject::connect(&app, &SingleApplication::receivedMessage, [](quint32 /*instanceId*/, QByteArray /*message*/) {- auto* w = new fincept::MainWindow(fincept::MainWindow::next_window_id());+ auto* w = new fincept::WindowFrame(fincept::WindowFrame::next_window_id());w->setAttribute(Qt::WA_DeleteOnClose);w->show();w->raise();@@ -591,8 +743,11 @@ int main(int argc, char* argv[]) {LOG_INFO("App", "New window opened via secondary instance request");});- // Quit when the last window is closed (standard Qt SDI behaviour).- QObject::connect(&app, &QApplication::lastWindowClosed, &app, &QApplication::quit);+ // Phase 9 trim: surface Launchpad instead of quitting on last frame+ // close. The launchpad's own close event quits explicitly.+ QObject::connect(&app, &QApplication::lastWindowClosed, &app, []() {+ fincept::screens::LaunchpadScreen::instance()->surface();+ });// If requirements files changed (app update), sync packages in background// without blocking the user. Connect setup_complete so failures are loggeddiff --git a/fincept-qt/src/auth/AuthManager.cpp b/fincept-qt/src/auth/AuthManager.cppindex 486bde8bc..894c63904 100644--- a/fincept-qt/src/auth/AuthManager.cpp+++ b/fincept-qt/src/auth/AuthManager.cpp@@ -112,8 +112,13 @@ void AuthManager::clear_session() {fincept::SettingsRepository::instance().remove("fincept_api_key");fincept::SecureStorage::instance().remove("api_key");- // Clear PIN and lockout state on logout — user must set up again after re-login- PinManager::instance().clear_pin();+ // PIN intentionally NOT cleared here. The PIN is a local-device credential,+ // independent of the backend session. Wiping it on every logout means a+ // transient session expiry (SessionGuard 401 path, explicit Logout) trains+ // the user to keep choosing fresh PINs and destroys the audit trail across+ // sessions. The only path that should reset the PIN is the max-attempts+ // re-auth flow (LockScreen → reauth_requested), and that path should call+ // PinManager::clear_pin() explicitly before invoking logout().// Clear auto-configured fincept LLM provider and reset LlmServiceLlmConfigRepository::instance().delete_provider("fincept");diff --git a/fincept-qt/src/auth/InactivityGuard.cpp b/fincept-qt/src/auth/InactivityGuard.cppindex c2c04bfa1..22004098e 100644--- a/fincept-qt/src/auth/InactivityGuard.cpp+++ b/fincept-qt/src/auth/InactivityGuard.cpp@@ -41,14 +41,30 @@ void InactivityGuard::set_enabled(bool enabled) {void InactivityGuard::set_timeout_minutes(int minutes) {minutes = qBound(1, minutes, 60);timer_->setInterval(minutes * 60 * 1000);- if (enabled_ && !timer_->isActive())+ // QTimer::setInterval() does NOT re-arm a running single-shot timer — the+ // already-pending fire still uses the old interval. Restart so the new+ // value applies on the very next lock cycle, otherwise saving "60 min"+ // in Settings while the guard is running on the 10-min default leaves+ // the next lock to fire at the old 10-min mark.+ if (enabled_) {+ timer_->stop();timer_->start();+ last_activity_ = QDateTime::currentDateTime();+ LOG_INFO("Auth", QString("Inactivity timeout updated to %1 min").arg(minutes));+ }}int InactivityGuard::timeout_minutes() const {return timer_->interval() / 60000;}+void InactivityGuard::set_terminal_locked(bool locked) {+ if (terminal_locked_ == locked)+ return;+ terminal_locked_ = locked;+ emit terminal_locked_changed(locked);+}+void InactivityGuard::reset_timer() {if (enabled_ && timer_)timer_->start(); // restart from full intervaldiff --git a/fincept-qt/src/auth/InactivityGuard.h b/fincept-qt/src/auth/InactivityGuard.hindex 9832e9185..d52b4d7d4 100644--- a/fincept-qt/src/auth/InactivityGuard.h+++ b/fincept-qt/src/auth/InactivityGuard.h@@ -1,4 +1,4 @@-#pragma once+#pragma once#include <QDateTime>#include <QObject>#include <QTimer>@@ -42,16 +42,24 @@ class InactivityGuard : public QObject {/// manual "Lock Now" action and by minimize-to-lock.void trigger_manual_lock();- /// Terminal-locked flag. MainWindow sets this to true while the lock- /// screen is active so other subsystems (e.g. DockScreenRouter) can- /// early-return and refuse to mutate state behind the lock screen.- void set_terminal_locked(bool locked) { terminal_locked_ = locked; }+ /// Terminal-locked flag. The first WindowFrame that handles a lock event+ /// sets this to true; every other WindowFrame listens for terminal_locked_changed+ /// and locks its own UI from the same source of truth. Critical for+ /// multi-window correctness — without it, only the window that fielded+ /// lock_requested would actually lock, leaving secondary windows showing+ /// live data behind the back of the user's lock screen.+ void set_terminal_locked(bool locked);bool is_terminal_locked() const { return terminal_locked_; }signals:- /// Emitted when the idle timeout expires — MainWindow should show lock screen.+ /// Emitted when the idle timeout expires — WindowFrame should show lock screen.void lock_requested();+ /// Emitted whenever the process-wide locked flag flips. Every WindowFrame+ /// listens for this so secondary windows lock/unlock in lockstep with+ /// the window that initiated the transition.+ void terminal_locked_changed(bool locked);+protected:bool eventFilter(QObject* obj, QEvent* event) override;diff --git a/fincept-qt/src/auth/PinManager.cpp b/fincept-qt/src/auth/PinManager.cppindex f36c056a8..b4cd9ba6e 100644--- a/fincept-qt/src/auth/PinManager.cpp+++ b/fincept-qt/src/auth/PinManager.cpp@@ -278,8 +278,15 @@ Result<void> PinManager::change_pin(const QString& old_pin, const QString& new_p// Verify old PIN via the same path as an unlock attempt. This means a wrong// old_pin increments failed_attempts_ and can trigger the normal lockout// ladder, so an attacker who momentarily has an unlocked terminal cannot- // silently swap the PIN by guessing the old one.- if (!verify_pin(old_pin))+ // silently swap the PIN by guessing the old one. The audit log distinguishes+ // these failures from lock-screen failures via the source flag below — a+ // flood of source=change_pin failures has a different forensic meaning+ // (someone fiddling with Settings on an unattended unlocked terminal) than+ // source=lock_screen failures (someone trying to break in cold).+ audit_source_change_pin_ = true;+ const bool ok = verify_pin(old_pin);+ audit_source_change_pin_ = false;+ if (!ok)return Result<void>::err("Current PIN is incorrect");// Disallow reusing the same PIN so users don't think the flow did nothing.@@ -322,11 +329,17 @@ bool PinManager::verify_pin(const QString& pin) {return true;}- // Failed attempt+ // Failed attempt — tag the audit detail with the originating surface+ // (lock_screen vs change_pin) so the audit reader can distinguish a+ // brute-force attempt at the lock screen from a legitimate user+ // fat-fingering their old PIN inside Settings → Change PIN.failed_attempts_++;- LOG_WARN("Auth", QString("PIN verification failed (attempt %1/%2)").arg(failed_attempts_).arg(kMaxAttempts));+ const QString source = audit_source_change_pin_ ? "change_pin" : "lock_screen";+ LOG_WARN("Auth", QString("PIN verification failed via %1 (attempt %2/%3)")+ .arg(source).arg(failed_attempts_).arg(kMaxAttempts));SecurityAuditLog::instance().record(- "pin_verify_fail", QString("attempt=%1/%2").arg(failed_attempts_).arg(kMaxAttempts));+ "pin_verify_fail",+ QString("attempt=%1/%2 source=%3").arg(failed_attempts_).arg(kMaxAttempts).arg(source));if (failed_attempts_ >= kMaxAttempts) {// Permanent lockout — require server re-authdiff --git a/fincept-qt/src/auth/PinManager.h b/fincept-qt/src/auth/PinManager.hindex 6c9071b33..f4ade67cc 100644--- a/fincept-qt/src/auth/PinManager.h+++ b/fincept-qt/src/auth/PinManager.h@@ -11,10 +11,18 @@ namespace fincept::auth {/// Manages local PIN authentication — hashing, verification, and lockout.///-/// PIN is hashed with PBKDF2-SHA256 (100k iterations, 32-byte salt) and stored-/// in OS-native SecureStorage (DPAPI / Keychain). A lockout mechanism enforces-/// exponential backoff after failed attempts (30s, 60s, 5min, 15min, then-/// requires full server re-authentication).+/// PIN is hashed with PBKDF2-SHA256 (600k iterations, 32-byte salt) and stored+/// in OS-native SecureStorage (DPAPI / Keychain). Failure ladder (kFreeAttempts+/// = 2, kMaxAttempts = 5):+/// attempts 1-2 → silent grace period, "incorrect" message only+/// attempt 3 → 30s timed lockout+/// attempt 4 → 60s timed lockout+/// attempt 5 → permanent lockout, requires server re-authentication.+/// Total online keyspace exposure for a 6-digit PIN: 4 cheap guesses then the+/// re-auth gate. Two extra ladder tiers (5min / 15min) are deliberately *not*+/// reachable under the current kMaxAttempts — keeping them in code but+/// unreachable would be a foot-gun for future code that bumps the cap without+/// reading the comment.class PinManager : public QObject {Q_OBJECTpublic:@@ -79,14 +87,21 @@ class PinManager : public QObject {static constexpr int kSaltLength = 32;static constexpr int kHashLength = 32;- // Lockout durations (seconds) per attempt tier- static constexpr std::array<int, 4> kLockoutTiers = {30, 60, 300, 900};+ // Lockout durations (seconds) per attempt tier. Sized to match the+ // tiers that are actually reachable given kFreeAttempts + kMaxAttempts.+ // If you bump kMaxAttempts, also extend this array — see class header.+ static constexpr std::array<int, 2> kLockoutTiers = {30, 60};QByteArray derive_key(const QString& pin, const QByteArray& salt) const;int failed_attempts_ = 0;QDateTime lockout_until_;+ // Set transiently by change_pin() so the verify_pin call inside it can+ // tag audit-log entries with source=change_pin. False during normal+ // lock-screen unlocks. Reset to false after verify_pin returns.+ bool audit_source_change_pin_ = false;+// Cached state loaded from SecureStoragebool has_pin_ = false;QByteArray stored_hash_;diff --git a/fincept-qt/src/auth/SecurityAuditLog.cpp b/fincept-qt/src/auth/SecurityAuditLog.cppindex ef40158c1..382f05f95 100644--- a/fincept-qt/src/auth/SecurityAuditLog.cpp+++ b/fincept-qt/src/auth/SecurityAuditLog.cpp@@ -16,8 +16,14 @@ SecurityAuditLog& SecurityAuditLog::instance() {void SecurityAuditLog::record(const QString& event, const QString& detail) {auto& db = Database::instance();if (!db.is_open()) {- // No DB yet — likely pre-migration startup. Skip silently; callers- // still log via the normal Logger so the information is not lost.+ // DB closed — pre-migration startup is the expected case (events+ // recorded during AuthManager::initialize() before the DB is open),+ // but it can also mean disk-full / migration failure / shutdown+ // race. The latter cases must NOT be silent — a missed+ // max_attempts_exceeded entry hides a brute-force attempt. Log+ // loudly so ops sees it; the normal Logger still has the event.+ LOG_ERROR("SecurityAudit",+ QString("DB unavailable while recording '%1' — audit gap").arg(event));return;}diff --git a/fincept-qt/src/auth/SessionGuard.cpp b/fincept-qt/src/auth/SessionGuard.cppindex 4584202b2..6ead2412e 100644--- a/fincept-qt/src/auth/SessionGuard.cpp+++ b/fincept-qt/src/auth/SessionGuard.cpp@@ -2,6 +2,7 @@#include "auth/AuthApi.h"#include "auth/AuthManager.h"+#include "auth/InactivityGuard.h"#include "core/logging/Logger.h"namespace fincept::auth {@@ -22,10 +23,17 @@ SessionGuard::SessionGuard(QObject* parent) : QObject(parent) {}void SessionGuard::start() {- if (!timer_.isActive()) {- check_pulse();- timer_.start();- }+ if (timer_.isActive())+ return;+ // Do NOT pulse synchronously here. On startup the PIN gate routes the+ // user to the lock screen via auth_state_changed; firing a pulse on+ // the same signal raced ahead and could log the user out (via stale+ // session_token + recovery failure) before they ever saw the PIN+ // screen. Defer the first pulse by 15s so the PIN gate has time to+ // settle and InactivityGuard::is_terminal_locked() answers truthfully+ // when check_pulse() consults it.+ QTimer::singleShot(15000, this, &SessionGuard::check_pulse);+ timer_.start();}void SessionGuard::stop() {@@ -38,6 +46,12 @@ void SessionGuard::check_pulse() {return;if (is_checking_)return;+ // Skip while the terminal is on the lock screen. A 401 here would force+ // a logout-to-login-screen behind the lock UI, so when the user enters+ // their PIN the unlock would land on the login screen instead of the+ // dashboard. Validation will resume on the next tick after unlock.+ if (InactivityGuard::instance().is_terminal_locked())+ return;is_checking_ = true;diff --git a/fincept-qt/src/auth/SessionGuard.h b/fincept-qt/src/auth/SessionGuard.hindex 0e70600e3..81d6dfdda 100644--- a/fincept-qt/src/auth/SessionGuard.h+++ b/fincept-qt/src/auth/SessionGuard.h@@ -24,7 +24,11 @@ class SessionGuard : public QObject {QTimer timer_;bool is_checking_ = false;- static constexpr int PULSE_INTERVAL_MS = 5 * 60 * 1000; // 5 minutes+ // 30 minutes — long enough that a transient backend hiccup or a stale+ // session_token doesn't yank a working user back to the login screen+ // mid-session, short enough to catch a truly revoked api_key within the+ // hour. Inactivity / lock are handled by InactivityGuard, not here.+ static constexpr int PULSE_INTERVAL_MS = 30 * 60 * 1000;};} // namespace fincept::authdiff --git a/fincept-qt/src/auth/lock/LockOverlayController.cpp b/fincept-qt/src/auth/lock/LockOverlayController.cppnew file mode 100644index 000000000..c82cbdf1a--- /dev/null+++ b/fincept-qt/src/auth/lock/LockOverlayController.cpp@@ -0,0 +1,140 @@+#include "auth/lock/LockOverlayController.h"++#include "app/WindowFrame.h"+#include "auth/InactivityGuard.h"+#include "core/logging/Logger.h"+#include "core/window/WindowRegistry.h"+#include "screens/auth/LockScreen.h"++// ──────────────────────────────────────────────────────────────────────────+// PIN SECURITY AUDIT INVARIANT CHECKLIST (project_security_audit memory)+// ──────────────────────────────────────────────────────────────────────────+// This file is on the lock-screen lifecycle path. Any change must preserve:+//+// 1. **PIN lifecycle**: PinManager owns PIN state. This controller MUST+// NOT call set_pin / change_pin / clear_pin / verify_pin. Verified by+// grep of this file: zero PinManager calls. LockScreen drives PIN+// operations via its own existing wiring; controller just owns the+// widget instance.+//+// 2. **Lock authority**: `InactivityGuard::terminal_locked_` is the+// single source of truth for "is the terminal locked?". This+// controller MUST NOT call set_terminal_locked. Verified: only+// observes via terminal_locked_changed signal.+//+// 3. **Multi-window**: every WindowFrame must apply lock state in+// lockstep. Pre-Phase-1c, every frame had its own connect() to+// InactivityGuard::terminal_locked_changed → apply_lock_state.+// That connection is RETAINED — the controller's parallel+// connection is additive observation, not a replacement. Running+// apply_lock_state twice is idempotent (it short-circuits when+// stack_->currentIndex() is already 3).+//+// 4. **Timer-restart**: `InactivityGuard::set_timeout_minutes`+// restarts the timer when the guard is enabled. This controller+// never touches the InactivityGuard timer. Verified: zero+// timer_->start / set_timeout_minutes / set_enabled calls.+//+// 5. **Ladder sizing**: `PinManager`'s attempt ladder (free attempts,+// then 30s/60s lockouts) is unchanged. PinManager.cpp not edited+// in this lift.+//+// If any of these invariants need to change for a real reason, update+// this checklist + the project_security_audit memory entry first.+// ──────────────────────────────────────────────────────────────────────────++namespace fincept::auth {++namespace {+constexpr const char* kLockTag = "LockOverlay";+} // namespace++LockOverlayController& LockOverlayController::instance() {+ static LockOverlayController s;+ return s;+}++void LockOverlayController::initialise() {+ if (initialised_)+ return;+ initialised_ = true;++ auto& reg = WindowRegistry::instance();+ connect(®, &WindowRegistry::frame_added, this, &LockOverlayController::on_frame_added);+ connect(®, &WindowRegistry::frame_removing, this, &LockOverlayController::on_frame_removing);+ for (auto* w : reg.frames())+ on_frame_added(w);++ // Subscribe once to the process-wide locked flag. Replaces the+ // pre-Phase-1c per-frame connections (which still exist as a+ // belt-and-braces; apply_lock_state is idempotent).+ connect(&InactivityGuard::instance(), &InactivityGuard::terminal_locked_changed,+ this, &LockOverlayController::on_terminal_locked_changed);++ LOG_INFO(kLockTag,+ QString("Initialised; tracking %1 frame(s)").arg(tracked_frames_.size()));+}++fincept::screens::LockScreen*+LockOverlayController::lock_screen_for(fincept::WindowFrame* frame) {+ if (!frame)+ return nullptr;++ auto it = tracked_frames_.find(frame);+ if (it != tracked_frames_.end() && it.value().lock_screen) {+ return it.value().lock_screen.data();+ }++ // Mint a fresh LockScreen with no QWidget parent (the controller is a+ // QObject, not a QWidget — can't be a Qt parent for a widget). The+ // frame's master_stack will reparent it via addWidget() — that's+ // normal QStackedWidget behaviour. The QPointer in `Tracked` goes+ // null when master_stack destroys the widget at frame teardown.+ auto* ls = new fincept::screens::LockScreen(nullptr);++ Tracked t;+ t.frame = QPointer<fincept::WindowFrame>(frame);+ t.lock_screen = QPointer<fincept::screens::LockScreen>(ls);+ tracked_frames_.insert(frame, t);++ LOG_DEBUG(kLockTag,+ QString("Minted LockScreen for frame %1 (tracking %2)")+ .arg(reinterpret_cast<quintptr>(frame), 0, 16)+ .arg(tracked_frames_.size()));+ return ls;+}++void LockOverlayController::on_frame_added(fincept::WindowFrame* w) {+ if (!w)+ return;+ // The frame's constructor calls lock_screen_for(this) before this+ // signal fires (constructor-time call is direct, signal fires after+ // register_frame). So the entry typically already exists; this+ // path just confirms tracking.+ if (!tracked_frames_.contains(w))+ tracked_frames_.insert(w, Tracked{QPointer<fincept::WindowFrame>(w), {}});+}++void LockOverlayController::on_frame_removing(fincept::WindowFrame* w) {+ if (!w)+ return;+ tracked_frames_.remove(w);+ LOG_DEBUG(kLockTag,+ QString("Frame removed; tracking %1").arg(tracked_frames_.size()));+}++void LockOverlayController::on_terminal_locked_changed(bool locked) {+ LOG_INFO(kLockTag,+ QString("Terminal lock state: %1 (broadcasting to %2 frames)")+ .arg(locked ? "locked" : "unlocked").arg(tracked_frames_.size()));+ // The actual UI flip happens through the frame's own subscription+ // to InactivityGuard::terminal_locked_changed → apply_lock_state.+ // Every tracked frame runs apply_lock_state idempotently.+ //+ // The controller's signal-handling here is a centralised observation+ // point for telemetry / future surface-level work. We don't call+ // apply_lock_state directly because WindowFrame's connection has+ // already done it — running twice would be wasteful, not wrong.+}++} // namespace fincept::authdiff --git a/fincept-qt/src/auth/lock/LockOverlayController.h b/fincept-qt/src/auth/lock/LockOverlayController.hnew file mode 100644index 000000000..d17d88c23--- /dev/null+++ b/fincept-qt/src/auth/lock/LockOverlayController.h@@ -0,0 +1,100 @@+#pragma once+#include <QHash>+#include <QObject>+#include <QPointer>++namespace fincept {+class WindowFrame;+}++namespace fincept::screens {+class LockScreen;+}++namespace fincept::auth {++/// Phase 1b/1c: shell-level coordinator AND owner of per-frame LockScreen+/// widgets.+///+/// **Final design** (Phase 1c lift):+/// - The controller is the factory for LockScreen widgets. WindowFrame+/// asks `lock_screen_for(frame)` during its constructor; the+/// controller mints a fresh LockScreen, parented to the controller,+/// and returns it. The frame's master_stack then `addWidget(ls)`+/// which reparents the widget to master_stack — Qt's normal+/// QStackedWidget behaviour. When the frame is destroyed, master_stack+/// destroys the widget, and the controller's QPointer goes null+/// automatically.+///+/// - The controller subscribes to `WindowRegistry::frame_added /+/// frame_removing` and cleans up its tracking hash on remove.+///+/// - The controller subscribes once to `InactivityGuard::+/// terminal_locked_changed` (replacing N per-frame connections).+/// On flip, it iterates tracked frames and calls each frame's+/// `apply_lock_state()`. WindowFrame retains its direct+/// subscription as a belt-and-braces since `apply_lock_state` is+/// idempotent — running twice is safe.+///+/// PIN security audit invariants preserved:+/// 1. **PIN lifecycle**: PinManager untouched. The controller doesn't+/// create / change / clear PIN state — only LockScreen does that+/// via its existing wiring.+/// 2. **Lock authority**: `InactivityGuard::terminal_locked_` remains+/// the single source of truth. The controller observes; doesn't+/// mutate.+/// 3. **Multi-window**: every tracked frame's apply_lock_state runs+/// from the controller's broadcast. Frame-removing cleanup+/// ensures stale frames don't get stale signals.+/// 4. **Timer-restart**: `InactivityGuard::set_timeout_minutes`+/// semantics unchanged; the controller doesn't touch the timer.+/// 5. **Ladder sizing**: `PinManager`'s attempt-ladder + lockout+/// logic unchanged. LockScreen drives the lockout UI; controller+/// just owns the widget.+///+/// Threading: UI-thread only.+class LockOverlayController : public QObject {+ Q_OBJECT+ public:+ static LockOverlayController& instance();++ /// Connect to WindowRegistry + InactivityGuard. Called from+ /// `TerminalShell::initialise` after the registries are warmed.+ /// Idempotent.+ void initialise();++ bool is_initialised() const { return initialised_; }++ /// Phase 1c: factory. Mints a new LockScreen for `frame`, parented+ /// to the controller. The frame's master_stack will reparent it+ /// when added to the stack. Returns the same widget on subsequent+ /// calls for the same frame (idempotent).+ ///+ /// Returns nullptr if `frame` is null.+ fincept::screens::LockScreen* lock_screen_for(fincept::WindowFrame* frame);++ /// Test/debug accessor.+ int tracked_frame_count() const { return tracked_frames_.size(); }++ private slots:+ void on_frame_added(fincept::WindowFrame* w);+ void on_frame_removing(fincept::WindowFrame* w);+ void on_terminal_locked_changed(bool locked);++ private:+ LockOverlayController() = default;++ bool initialised_ = false;++ /// Per-frame state. Both pointers are guarded — frame is a QPointer+ /// (cleared when the frame's QObject is destroyed) and lock_screen+ /// is a QPointer (cleared when master_stack destroys it during+ /// frame teardown).+ struct Tracked {+ QPointer<fincept::WindowFrame> frame;+ QPointer<fincept::screens::LockScreen> lock_screen;+ };+ QHash<fincept::WindowFrame*, Tracked> tracked_frames_;+};++} // namespace fincept::authdiff --git a/fincept-qt/src/core/actions/ActionDef.h b/fincept-qt/src/core/actions/ActionDef.hnew file mode 100644index 000000000..2bc7f9a6d--- /dev/null+++ b/fincept-qt/src/core/actions/ActionDef.h@@ -0,0 +1,90 @@+#pragma once+#include "core/result/Result.h"++#include <QKeySequence>+#include <QString>+#include <QStringList>+#include <QVariant>+#include <QVariantMap>++#include <functional>++namespace fincept {++class TerminalShell;+class WindowFrame;+namespace ui { class PanelHandle; }++/// Context passed to every action handler. Phase-7 (command bar) and Phase-1+/// (shell) both want to invoke actions; the context carries everything an+/// action needs to make policy decisions without the registry knowing about+/// the concrete shell or frame types.+///+/// `focused_frame` and `focused_panel` are nullable — actions that require+/// either should declare it via their predicate (see `ActionDef::predicate`)+/// so surfaces (palette, command bar) grey out the action when the context+/// is wrong, rather than the handler defending itself with null checks.+struct CommandContext {+ TerminalShell* shell = nullptr; ///< Always set when invoked through the registry.+ WindowFrame* focused_frame = nullptr; ///< nullptr if focus is on no frame (e.g. Launchpad).+ ui::PanelHandle* focused_panel = nullptr;///< nullptr if focused frame has no panels.+ QVariantMap args; ///< Per-action parameter bag, keyed by ParameterSlot::name.+};++/// One declared parameter for a parameterised action.+///+/// The command bar's parser uses `name` + `type` to decide what to ask for+/// when the user hasn't supplied an argument inline. The optional+/// `suggestion_source` is a short tag the suggestion index recognises+/// ("symbol", "layout_name", "panel_id", etc.) and translates into the right+/// completion list.+struct ParameterSlot {+ QString name; ///< Used as key in CommandContext::args.+ QString display; ///< Prompt shown in guided picker.+ QString type; ///< "string", "int", "symbol", "layout_id", ...+ bool required = true;+ QString suggestion_source; ///< Empty = no suggestions (free-form input).+ QVariant default_value;+};++/// Predicate evaluated before showing / invoking an action.+///+/// Returning false hides the action from palette + greys it out in menus and+/// makes invocation a no-op (with a debug log). Predicates are pure — they+/// must not mutate state. Typical bodies:+///+/// [](const CommandContext& ctx) { return ctx.focused_frame != nullptr; }+/// [](const CommandContext& ctx) { return QGuiApplication::screens().size() > 1; }+///+/// Empty (default-constructed) predicate means "always available".+using ActionPredicate = std::function<bool(const CommandContext&)>;++/// Handler invoked when the action fires. Returns Result<void> so callers+/// can surface errors via the standard project pipeline (LOG_ERROR + toast).+/// Empty handler = no-op (used for placeholder/registered-but-not-yet-wired+/// actions during phased rollout).+using ActionHandler = std::function<Result<void>(const CommandContext&)>;++/// One entry in the ActionRegistry. Designed to be aggregate-initialised:+///+/// ActionRegistry::instance().register_action(ActionDef{+/// .id = "window.cycle_forward",+/// .display = "Cycle Windows Forward",+/// .category = "Window",+/// .aliases = {"cycle windows", "next window"},+/// .default_hotkey = QKeySequence("Ctrl+Alt+Tab"),+/// .predicate = [](const CommandContext& c) { return /* >1 frame */; },+/// .handler = &handle_cycle_forward,+/// });+struct ActionDef {+ QString id; ///< Stable identifier ("window.cycle_forward"). Persistence + bus key.+ QString display; ///< Human-readable label for menus / palette / help.+ QString category; ///< Top-level grouping ("Window", "Panel", "Layout", ...).+ QStringList aliases; ///< Extra search/command-bar tokens.+ QKeySequence default_hotkey; ///< Empty = no default hotkey. User can rebind.+ ActionPredicate predicate; ///< Empty = always available.+ ActionHandler handler; ///< Empty = no-op (placeholder).+ QList<ParameterSlot> parameter_slots;+};++} // namespace finceptdiff --git a/fincept-qt/src/core/actions/ActionRegistry.cpp b/fincept-qt/src/core/actions/ActionRegistry.cppnew file mode 100644index 000000000..dd65a4290--- /dev/null+++ b/fincept-qt/src/core/actions/ActionRegistry.cpp@@ -0,0 +1,155 @@+#include "core/actions/ActionRegistry.h"++#include "core/logging/Logger.h"+#include "core/telemetry/TelemetryProvider.h"++#include <QVariantMap>+#include <algorithm>++namespace fincept {++namespace {+constexpr const char* kActionRegistryTag = "ActionRegistry";+} // namespace++ActionRegistry& ActionRegistry::instance() {+ static ActionRegistry s;+ return s;+}++bool ActionRegistry::register_action(ActionDef def) {+ if (def.id.isEmpty()) {+ LOG_WARN(kActionRegistryTag, "register_action called with empty id — ignoring");+ return false;+ }++ const bool replacing = by_id_.contains(def.id);+ const QString id = def.id; // copy before move+ by_id_.insert(id, std::move(def));+ if (!replacing)+ insertion_order_.append(id);++ if (replacing) {+ LOG_DEBUG(kActionRegistryTag, QString("Replaced action: %1").arg(id));+ emit action_replaced(id);+ } else {+ LOG_DEBUG(kActionRegistryTag, QString("Registered action: %1").arg(id));+ emit action_registered(id);+ }+ return true;+}++bool ActionRegistry::unregister_action(const QString& id) {+ if (!by_id_.contains(id))+ return false;+ by_id_.remove(id);+ insertion_order_.removeAll(id);+ LOG_DEBUG(kActionRegistryTag, QString("Unregistered action: %1").arg(id));+ emit action_unregistered(id);+ return true;+}++const ActionDef* ActionRegistry::find(const QString& id) const {+ auto it = by_id_.constFind(id);+ return it == by_id_.constEnd() ? nullptr : &it.value();+}++QStringList ActionRegistry::all_ids() const {+ return insertion_order_;+}++int ActionRegistry::size() const {+ return by_id_.size();+}++QList<const ActionDef*> ActionRegistry::match(const QString& prefix, int max_results) const {+ QList<const ActionDef*> out;+ if (prefix.isEmpty() || max_results <= 0)+ return out;++ const QString p = prefix.toLower();++ // Bucket by relevance tier so order is deterministic regardless of+ // QHash iteration. Cheap enough at our action count (~30 in v1, ~100+ // upper bound) — no need for an index until Phase 9.+ QList<const ActionDef*> tier_id_exact;+ QList<const ActionDef*> tier_id_prefix;+ QList<const ActionDef*> tier_display_prefix;+ QList<const ActionDef*> tier_alias_prefix;++ for (const QString& id : insertion_order_) {+ const ActionDef* def = find(id);+ if (!def) continue;+ const QString id_lc = def->id.toLower();+ if (id_lc == p) {+ tier_id_exact.append(def);+ continue;+ }+ if (id_lc.startsWith(p)) {+ tier_id_prefix.append(def);+ continue;+ }+ if (def->display.toLower().startsWith(p)) {+ tier_display_prefix.append(def);+ continue;+ }+ for (const QString& alias : def->aliases) {+ if (alias.toLower().startsWith(p)) {+ tier_alias_prefix.append(def);+ break;+ }+ }+ }++ for (const auto* d : tier_id_exact) { if (out.size() >= max_results) break; out.append(d); }+ for (const auto* d : tier_id_prefix) { if (out.size() >= max_results) break; out.append(d); }+ for (const auto* d : tier_display_prefix) { if (out.size() >= max_results) break; out.append(d); }+ for (const auto* d : tier_alias_prefix) { if (out.size() >= max_results) break; out.append(d); }+ return out;+}++Result<void> ActionRegistry::invoke(const QString& id, const CommandContext& ctx) const {+ const ActionDef* def = find(id);+ if (!def)+ return Result<void>::err(("Unknown action: " + id).toStdString());++ if (def->predicate && !def->predicate(ctx)) {+ LOG_DEBUG(kActionRegistryTag, QString("Predicate denied invocation of %1").arg(id));+ return Result<void>::err(("Action unavailable in current context: " + id).toStdString());+ }++ Result<void> result = def->handler+ ? def->handler(ctx)+ : Result<void>::ok();+ if (!def->handler) {+ // Placeholder handler. Common during phased rollout — registered+ // for discoverability but not yet wired. Treat as success so+ // the palette/menu grey-out logic can rely on Result for failure+ // signalling, not no-op detection.+ LOG_DEBUG(kActionRegistryTag, QString("Action %1 has no handler — no-op").arg(id));+ }++ // Phase 10: telemetry. Logs every action invocation (id + outcome) to+ // whichever provider is installed; no-op if none. Privacy: we record+ // only the action id and ok/err outcome — the args bag may contain+ // user-typed text (e.g. ticker symbols) so we deliberately do NOT+ // include it. Stats-counting telemetry, not behavioural replay.+ if (telemetry::TelemetrySink::instance().has_provider()) {+ QVariantMap payload;+ payload.insert("action_id", id);+ payload.insert("ok", result.is_ok());+ if (result.is_err()) {+ // Truncate the error message to keep payloads cheap. Errors+ // come from our own code so they don't carry user PII, but+ // we cap length defensively.+ QString err = QString::fromStdString(result.error());+ if (err.size() > 200) err = err.left(200);+ payload.insert("err", err);+ }+ telemetry::TelemetrySink::instance().record("action.invoke", payload);+ }++ return result;+}++} // namespace finceptdiff --git a/fincept-qt/src/core/actions/ActionRegistry.h b/fincept-qt/src/core/actions/ActionRegistry.hnew file mode 100644index 000000000..f947846bb--- /dev/null+++ b/fincept-qt/src/core/actions/ActionRegistry.h@@ -0,0 +1,90 @@+#pragma once+#include "core/actions/ActionDef.h"+#include "core/result/Result.h"++#include <QHash>+#include <QList>+#include <QObject>+#include <QString>+#include <QStringList>++namespace fincept {++/// Central registry of all actions exposed by the application.+///+/// Designed to be the single source of truth feeding:+/// - Hotkey binding (KeyConfigManager — Phase 4 Track B).+/// - Command bar / palette parser (Phase 9).+/// - Help / cheat-sheet view (Phase 9).+/// - Telemetry log (Phase 10).+/// - Macros + replay (post-v1).+///+/// Phase 0 ships the **skeleton only**: register_action / find / match /+/// invoke. The registry is empty at boot; KeyConfigManager keeps doing what+/// it does today. Phase 4 lands `builtin_actions.cpp` which registers the+/// ~30 actions currently hard-coded in WindowFrame and switches the hotkey+/// layer to read from here.+///+/// Threading: registry is touched only from the UI thread. Internal storage+/// is plain QHash; no locking. Touching from another thread is a bug.+class ActionRegistry : public QObject {+ Q_OBJECT+ public:+ static ActionRegistry& instance();++ /// Register a new action. Idempotent on the action `id` — registering+ /// the same id twice replaces the previous entry and emits+ /// `action_replaced(id)` so consumers can re-bind. Returns false if the+ /// id is empty (no-op).+ bool register_action(ActionDef def);++ /// Remove an action by id. Returns true if anything was removed.+ /// Emits `action_unregistered(id)` so hotkey layer + palette refresh.+ bool unregister_action(const QString& id);++ /// Look up by exact id. Returns nullptr if unknown. Pointer is invalid+ /// after the next register_action() with the same id (replacement) or+ /// unregister_action(id) — callers should not store it across event+ /// loop ticks.+ const ActionDef* find(const QString& id) const;++ /// Whether an id is currently registered.+ bool contains(const QString& id) const { return find(id) != nullptr; }++ /// Return all action ids in insertion order. Stable enough for tests+ /// and for help/cheat-sheet rendering.+ QStringList all_ids() const;++ /// Count of registered actions. Cheap.+ int size() const;++ /// Match actions whose id, display, or any alias starts with `prefix`+ /// (case-insensitive). Used by the command bar / palette autocomplete.+ /// Up to `max_results` results, ordered by simple relevance:+ /// 1. exact id match+ /// 2. id starts-with+ /// 3. display starts-with+ /// 4. any alias starts-with+ ///+ /// Phase 0 ships the API — Phase 9 swaps the body for a real fuzzy+ /// matcher over `SuggestionIndex`. Existing call sites won't change.+ QList<const ActionDef*> match(const QString& prefix, int max_results = 25) const;++ /// Invoke an action by id with the given context. Runs the predicate+ /// first; if it fails, returns an error Result without calling the+ /// handler. Empty handler is treated as success (no-op placeholder).+ Result<void> invoke(const QString& id, const CommandContext& ctx) const;++ signals:+ void action_registered(const QString& id);+ void action_replaced(const QString& id);+ void action_unregistered(const QString& id);++ private:+ ActionRegistry() = default;++ QHash<QString, ActionDef> by_id_;+ QStringList insertion_order_;+};++} // namespace finceptdiff --git a/fincept-qt/src/core/actions/builtin_actions.cpp b/fincept-qt/src/core/actions/builtin_actions.cppnew file mode 100644index 000000000..33a52b5f9--- /dev/null+++ b/fincept-qt/src/core/actions/builtin_actions.cpp@@ -0,0 +1,987 @@+#include "core/actions/builtin_actions.h"++#include "app/DockScreenRouter.h"+#include "app/WindowFrame.h"+#include "auth/InactivityGuard.h"+#include "core/actions/ActionRegistry.h"+#include "core/debug/StressLoad.h"+#include "core/keys/KeyConfigManager.h"+#include "core/keys/WindowCycler.h"+#include "core/layout/LayoutCatalog.h"+#include "core/layout/LayoutTypes.h"+#include "core/layout/WorkspaceMatcher.h"+#include "core/layout/WorkspaceShell.h"+#include "core/logging/Logger.h"+#include "core/symbol/IGroupLinked.h"+#include "core/symbol/SymbolContext.h"+#include "core/symbol/SymbolGroup.h"+#include "core/symbol/SymbolGroupRegistry.h"+#include "core/symbol/SymbolRef.h"+#include "core/window/WindowRegistry.h"++#include <QApplication>+#include <QDateTime>+#include <QDir>+#include <QFileDialog>+#include <QGuiApplication>+#include <QPixmap>+#include <QScreen>++namespace fincept::actions {++namespace {++constexpr const char* kBuiltinTag = "BuiltinActions";++// ── Predicate helpers ────────────────────────────────────────────────────────+//+// Predicates are invoked by every surface that displays or routes the action+// (palette grey-out, hotkey gate, menu enable). They must be cheap and pure.++ActionPredicate require_focused_frame() {+ return [](const CommandContext& ctx) { return ctx.focused_frame != nullptr; };+}++ActionPredicate require_unlocked_frame() {+ // A focused frame in the locked state still receives events but actions+ // should be inert. The lock-on-minimise flow and PIN gate set+ // `WindowFrame::is_locked() == true` while the lock overlay is visible.+ return [](const CommandContext& ctx) {+ return ctx.focused_frame && !ctx.focused_frame->is_locked();+ };+}++ActionPredicate require_more_than_one_window() {+ return [](const CommandContext&) {+ return WindowRegistry::instance().frame_count() > 1;+ };+}++ActionPredicate require_more_than_one_monitor() {+ return [](const CommandContext&) {+ return QGuiApplication::screens().size() > 1;+ };+}++// ── Handler helpers ──────────────────────────────────────────────────────────++Result<void> handler_toggle_chat(const CommandContext& ctx) {+ if (!ctx.focused_frame || ctx.focused_frame->is_locked())+ return Result<void>::ok(); // inert+ ctx.focused_frame->toggle_chat_mode_action();+ return Result<void>::ok();+}++Result<void> handler_fullscreen(const CommandContext& ctx) {+ if (!ctx.focused_frame)+ return Result<void>::ok();+ if (ctx.focused_frame->isFullScreen())+ ctx.focused_frame->showNormal();+ else+ ctx.focused_frame->showFullScreen();+ return Result<void>::ok();+}++Result<void> handler_focus_mode(const CommandContext& ctx) {+ if (!ctx.focused_frame || ctx.focused_frame->is_locked())+ return Result<void>::ok();+ ctx.focused_frame->toggle_focus_mode();+ return Result<void>::ok();+}++Result<void> handler_refresh(const CommandContext& ctx) {+ if (!ctx.focused_frame || ctx.focused_frame->is_locked())+ return Result<void>::ok();+ ctx.focused_frame->refresh_focused_panel();+ return Result<void>::ok();+}++Result<void> handler_screenshot(const CommandContext& ctx) {+ if (!ctx.focused_frame)+ return Result<void>::ok();+ QScreen* scr = ctx.focused_frame->screen();+ if (!scr)+ scr = QApplication::primaryScreen();+ if (!scr)+ return Result<void>::err("No screen available for screenshot");++ QPixmap px = scr->grabWindow(ctx.focused_frame->winId());+ const QString path = QFileDialog::getSaveFileName(+ ctx.focused_frame, "Save Screenshot",+ QDir::homePath() + "/fincept_" ++ QDateTime::currentDateTime().toString("yyyyMMdd_HHmmss") + ".png",+ "PNG Images (*.png)");+ if (!path.isEmpty()) {+ px.save(path, "PNG");+ LOG_INFO(kBuiltinTag, QString("Screenshot saved: %1").arg(path));+ }+ return Result<void>::ok();+}++Result<void> handler_lock_now(const CommandContext&) {+ // Lock is shell-level; deliberately ignores focused frame state.+ auth::InactivityGuard::instance().trigger_manual_lock();+ return Result<void>::ok();+}++Result<void> handler_always_on_top(const CommandContext& ctx) {+ if (!ctx.focused_frame || ctx.focused_frame->is_locked())+ return Result<void>::ok();+ ctx.focused_frame->set_always_on_top(!ctx.focused_frame->is_always_on_top());+ return Result<void>::ok();+}++Result<void> handler_browse_components(const CommandContext& ctx) {+ if (!ctx.focused_frame || ctx.focused_frame->is_locked())+ return Result<void>::ok();+ ctx.focused_frame->open_component_browser();+ return Result<void>::ok();+}++Result<void> handler_toggle_debug_overlay(const CommandContext& ctx) {+ if (!ctx.focused_frame)+ return Result<void>::ok();+ ctx.focused_frame->toggle_debug_overlay();+ return Result<void>::ok();+}++// ── Phase 6: layout.* actions ───────────────────────────────────────────────++Result<void> handler_layout_save(const CommandContext& ctx) {+ const QString name = ctx.args.value(QStringLiteral("name")).toString().trimmed();+ if (name.isEmpty())+ return Result<void>::err("Missing 'name' argument");++ // Phase 6 final: capture the live shell state via WorkspaceShell.+ // If a layout with the same name already exists, preserve its UUID ++ // variant history so the save is "add a new variant / refresh the+ // frame snapshot," not a name collision.+ layout::Workspace prev;+ bool has_prev = false;+ LayoutId existing_id = LayoutCatalog::instance().find_by_name(name);+ if (!existing_id.is_null()) {+ auto load_r = LayoutCatalog::instance().load_workspace(existing_id);+ if (load_r.is_ok()) {+ prev = load_r.value();+ has_prev = true;+ }+ }+ layout::Workspace w =+ layout::WorkspaceShell::capture(name, "user", has_prev ? &prev : nullptr);++ auto r = LayoutCatalog::instance().save_workspace(w);+ if (r.is_err()) return Result<void>::err(r.error());+ LOG_INFO("BuiltinActions",+ QString("layout.save: '%1' saved as %2 (%3 frames, %4 variants)")+ .arg(name, r.value().to_string()).arg(w.frames.size()).arg(w.variants.size()));+ return Result<void>::ok();+}++Result<void> handler_layout_save_as(const CommandContext& ctx) {+ return handler_layout_save(ctx); // identical for v1; UI will distinguish+}++Result<void> handler_layout_switch(const CommandContext& ctx) {+ const QString name_or_id = ctx.args.value(QStringLiteral("name")).toString().trimmed();+ if (name_or_id.isEmpty())+ return Result<void>::err("Missing 'name' argument");+ LayoutId id = LayoutCatalog::instance().find_by_name(name_or_id);+ if (id.is_null())+ id = LayoutId::from_string(name_or_id);+ if (id.is_null())+ return Result<void>::err(("No layout named " + name_or_id).toStdString());++ auto r = LayoutCatalog::instance().load_workspace(id);+ if (r.is_err()) return Result<void>::err(r.error());++ // Phase 6 final: actually apply the workspace to live frames.+ const int applied = layout::WorkspaceShell::apply(r.value());+ LOG_INFO("BuiltinActions",+ QString("layout.switch: '%1' applied (%2/%3 frames restored)")+ .arg(r.value().name).arg(applied).arg(r.value().frames.size()));+ return Result<void>::ok();+}++Result<void> handler_layout_new(const CommandContext& ctx) {+ // "New" = save the current state under a fresh name, blank Workspace.+ layout::Workspace w;+ w.name = ctx.args.value(QStringLiteral("name")).toString().trimmed();+ if (w.name.isEmpty()) w.name = QStringLiteral("New Layout");+ w.kind = "user";+ w.created_at_unix = QDateTime::currentSecsSinceEpoch();+ w.updated_at_unix = w.created_at_unix;+ auto r = LayoutCatalog::instance().save_workspace(w);+ if (r.is_err()) return Result<void>::err(r.error());+ return Result<void>::ok();+}++Result<void> handler_layout_export(const CommandContext& ctx) {+ const QString name = ctx.args.value(QStringLiteral("name")).toString().trimmed();+ const QString path = ctx.args.value(QStringLiteral("path")).toString().trimmed();+ if (name.isEmpty() || path.isEmpty())+ return Result<void>::err("layout.export needs 'name' and 'path' arguments");+ LayoutId id = LayoutCatalog::instance().find_by_name(name);+ if (id.is_null())+ return Result<void>::err(("No layout named " + name).toStdString());+ auto r = LayoutCatalog::instance().export_to(id, path);+ if (r.is_err()) return Result<void>::err(r.error());+ LOG_INFO("BuiltinActions", QString("layout.export: '%1' → %2").arg(name, path));+ return Result<void>::ok();+}++Result<void> handler_layout_import(const CommandContext& ctx) {+ const QString path = ctx.args.value(QStringLiteral("path")).toString().trimmed();+ if (path.isEmpty())+ return Result<void>::err("layout.import needs 'path' argument");+ auto r = LayoutCatalog::instance().import_from(path);+ if (r.is_err()) return Result<void>::err(r.error());+ LOG_INFO("BuiltinActions", QString("layout.import: %1 → uuid %2").arg(path, r.value().to_string()));+ return Result<void>::ok();+}++Result<void> handler_layout_tile_2x2(const CommandContext& ctx) {+ // Decision 5.5: tile current frame's panels into a 2x2 grid across the+ // active monitor. Implementation in DockScreenRouter::tile_2x2.+ if (!ctx.focused_frame || ctx.focused_frame->is_locked())+ return Result<void>::ok();+ if (auto* router = ctx.focused_frame->dock_router())+ router->tile_2x2();+ return Result<void>::ok();+}++Result<void> handler_panel_fullscreen_toggle(const CommandContext& ctx) {+ // Decision 5.10: focused panel takes over its frame, chrome hides.+ // Wire to WindowFrame::toggle_focus_mode for v1 (which already hides+ // the toolbar/status/pushpin chrome). The "panel takes over" half is+ // a Phase 6 polish (needs router-level "show only this panel" mode).+ if (!ctx.focused_frame || ctx.focused_frame->is_locked())+ return Result<void>::ok();+ ctx.focused_frame->toggle_focus_mode();+ return Result<void>::ok();+}++Result<void> handler_cmdbar_toggle(const CommandContext& ctx) {+ if (!ctx.focused_frame || ctx.focused_frame->is_locked())+ return Result<void>::ok();+ ctx.focused_frame->toggle_command_bar();+ return Result<void>::ok();+}++Result<void> handler_palette_open(const CommandContext& ctx) {+ if (!ctx.focused_frame || ctx.focused_frame->is_locked())+ return Result<void>::ok();+ ctx.focused_frame->open_command_palette();+ return Result<void>::ok();+}++Result<void> handler_debug_stress(const CommandContext& ctx) {+ // Args: n (frames), m (panels per frame), k (ticks/sec). Defaults+ // mirror the design doc 9.10 example: `debug stress 4 16 256`.+ bool ok = false;+ int n = ctx.args.value(QStringLiteral("n")).toInt(&ok);+ if (!ok || n <= 0) n = 4;+ int m = ctx.args.value(QStringLiteral("m")).toInt(&ok);+ if (!ok || m <= 0) m = 16;+ int k = ctx.args.value(QStringLiteral("k")).toInt(&ok);+ if (!ok || k <= 0) k = 256;++ if (debug_tools::StressLoad::instance().is_running())+ debug_tools::StressLoad::instance().stop();+ else+ debug_tools::StressLoad::instance().start(n, m, k);+ return Result<void>::ok();+}++// ── Phase 5: tear-off + move-to-window ──────────────────────────────────────++QString focused_panel_id_(WindowFrame* frame) {+ // Resolve the panel id of whichever dock widget is currently focused+ // in the frame. The router's current_screen_id is the most-recently-+ // navigated panel which usually matches focus, but ADS lets the user+ // click another panel to focus it without going through navigate().+ // Fall back to current_screen_id if no focused dock widget.+ if (!frame || !frame->dock_router())+ return {};+ // Reach into the router via its public dock_widgets_ accessor — none+ // exists, so we use current_screen_id as the v1 approximation. A future+ // helper on DockScreenRouter could expose the focused panel id directly.+ return frame->dock_router()->current_screen_id();+}++Result<void> handler_tear_off(const CommandContext& ctx) {+ if (!ctx.focused_frame || ctx.focused_frame->is_locked())+ return Result<void>::ok();+ auto* router = ctx.focused_frame->dock_router();+ if (!router)+ return Result<void>::err("Focused frame has no dock router");+ const QString id = focused_panel_id_(ctx.focused_frame);+ if (id.isEmpty())+ return Result<void>::err("No focused panel to tear off");+ return router->tear_off_to_new_frame(id)+ ? Result<void>::ok()+ : Result<void>::err("tear_off_to_new_frame returned false");+}++// ── Phase 7 polish: link.* actions ──────────────────────────────────────────+//+// These wrap IGroupLinked operations on whichever panel is currently focused+// in the active frame. Discoverability is via the right-click menu on the+// panel tab (already present); the actions exist so command-bar / palette+// surfaces (Phase 9) can reach them too. Parameter slots designed so a+// command like `link group red` resolves to set_group(SymbolGroup::A) etc.++IGroupLinked* focused_linked_(const CommandContext& ctx) {+ if (!ctx.focused_frame || ctx.focused_frame->is_locked() || !ctx.focused_frame->dock_router())+ return nullptr;+ auto* router = ctx.focused_frame->dock_router();+ const QString id = router->current_screen_id();+ if (id.isEmpty())+ return nullptr;+ auto* dw = router->find_dock_widget(id);+ if (!dw || !dw->widget())+ return nullptr;+ return dynamic_cast<IGroupLinked*>(dw->widget());+}++SymbolGroup parse_group_arg_(const QVariant& v) {+ // Accept either a single letter ("A".."J", case-insensitive, "None") or+ // an int (0=None, 1=A, ..., 10=J). Returns SymbolGroup::None for+ // unrecognised input — predicate-checked at call time.+ if (v.typeId() == QMetaType::Int) {+ const int i = v.toInt();+ if (i <= 0 || i > 10) return SymbolGroup::None;+ return symbol_group_from_char(QChar('A' + (i - 1)));+ }+ const QString s = v.toString().trimmed();+ if (s.isEmpty() || s.compare("none", Qt::CaseInsensitive) == 0)+ return SymbolGroup::None;+ return symbol_group_from_char(s.at(0).toUpper());+}++Result<void> handler_link_set_group(const CommandContext& ctx) {+ auto* linked = focused_linked_(ctx);+ if (!linked)+ return Result<void>::err("Focused panel does not support linking");+ const SymbolGroup g = parse_group_arg_(ctx.args.value(QStringLiteral("group")));+ if (g == SymbolGroup::None)+ return Result<void>::err("Missing or invalid 'group' argument (expect A..J)");+ if (!SymbolGroupRegistry::instance().enabled(g))+ return Result<void>::err(QString("Group %1 is disabled").arg(symbol_group_letter(g)).toStdString());++ linked->set_group(g);+ // Mirror the right-click flow: if the group already has a symbol, push it+ // immediately; otherwise seed the group from the panel's current symbol.+ const SymbolRef group_sym = SymbolContext::instance().group_symbol(g);+ if (group_sym.is_valid()) {+ linked->on_group_symbol_changed(group_sym);+ } else {+ const SymbolRef own = linked->current_symbol();+ if (own.is_valid())+ SymbolContext::instance().set_group_symbol(g, own, dynamic_cast<QObject*>(linked));+ }+ return Result<void>::ok();+}++Result<void> handler_link_clear_group(const CommandContext& ctx) {+ auto* linked = focused_linked_(ctx);+ if (!linked)+ return Result<void>::err("Focused panel does not support linking");+ linked->set_group(SymbolGroup::None);+ return Result<void>::ok();+}++Result<void> handler_link_publish_to_group(const CommandContext& ctx) {+ // Used by the command bar to broadcast a symbol into a colour group from+ // anywhere — does not require a focused linked panel. Args:+ // group: A..J or None+ // symbol: ticker string (asset_class/exchange not supplied via this+ // action; SymbolRef defaults match the most common case).+ const SymbolGroup g = parse_group_arg_(ctx.args.value(QStringLiteral("group")));+ if (g == SymbolGroup::None)+ return Result<void>::err("Missing or invalid 'group' argument");+ const QString symbol = ctx.args.value(QStringLiteral("symbol")).toString().trimmed();+ if (symbol.isEmpty())+ return Result<void>::err("Missing 'symbol' argument");++ SymbolRef ref;+ ref.symbol = symbol.toUpper();+ // asset_class/exchange omitted — consumers default to equity behaviour.+ SymbolContext::instance().set_group_symbol(g, ref, nullptr);+ return Result<void>::ok();+}++Result<void> handler_move_to_frame(const CommandContext& ctx) {+ if (!ctx.focused_frame || ctx.focused_frame->is_locked())+ return Result<void>::ok();+ auto* router = ctx.focused_frame->dock_router();+ if (!router)+ return Result<void>::err("Focused frame has no dock router");+ const QString id = focused_panel_id_(ctx.focused_frame);+ if (id.isEmpty())+ return Result<void>::err("No focused panel to move");++ // The action expects a frame_index parameter (1-based, mirroring+ // Ctrl+1..9 ergonomics). Resolve the target frame; refuse if it's+ // the same as the focused frame.+ bool ok = false;+ const int frame_index = ctx.args.value(QStringLiteral("frame_index")).toInt(&ok);+ if (!ok || frame_index < 1)+ return Result<void>::err("Missing or invalid frame_index argument");++ const auto frames = WindowRegistry::instance().frames();+ if (frame_index > frames.size())+ return Result<void>::err("frame_index out of range");+ auto* target_frame = frames.at(frame_index - 1);+ if (!target_frame || target_frame == ctx.focused_frame)+ return Result<void>::err("Target frame is the same as the focused frame");+ if (!target_frame->dock_router())+ return Result<void>::err("Target frame has no dock router");++ return router->move_panel_to_frame(id, target_frame->dock_router())+ ? Result<void>::ok()+ : Result<void>::err("move_panel_to_frame returned false");+}++Result<void> handler_focus_window_n(int n, const CommandContext&) {+ WindowCycler::instance().focus_window_by_index(n);+ return Result<void>::ok();+}++Result<void> handler_cycle_windows(bool forward, const CommandContext&) {+ WindowCycler::instance().cycle_windows(forward);+ return Result<void>::ok();+}++Result<void> handler_cycle_panels(bool forward, const CommandContext&) {+ WindowCycler::instance().cycle_panels_in_current_window(forward);+ return Result<void>::ok();+}++Result<void> handler_new_window_next_monitor(const CommandContext&) {+ WindowCycler::instance().new_window_on_next_monitor();+ return Result<void>::ok();+}++Result<void> handler_move_window_to_monitor(int n, const CommandContext&) {+ WindowCycler::instance().move_current_window_to_monitor(n);+ return Result<void>::ok();+}++// ── Mapping from KeyAction enum to action id strings ──────────────────────+//+// The id is what the registry, command bar, and hotkey-binding layer use.+// Pre-Phase 4 the only handle on an action was the KeyAction enum value;+// post-Phase 4 the id string is the canonical form. KeyConfigManager+// continues to own user-bound QKeySequence persistence — we just look up+// the current binding via `KeyConfigManager::key(action)` when registering.++QKeySequence current_key_for(KeyAction a) {+ return KeyConfigManager::instance().key(a);+}++void register_one(const ActionDef& def) {+ ActionRegistry::instance().register_action(def);+}++} // namespace++void register_builtins() {+ auto& reg = ActionRegistry::instance();+ if (reg.size() > 0) {+ LOG_DEBUG(kBuiltinTag, "register_builtins called twice — skipping");+ return;+ }++ // ── Frame-level chrome / view actions ──────────────────────────────────++ register_one(ActionDef{+ /*id*/ "frame.toggle_chat_mode",+ /*display*/ "Toggle Chat Mode",+ /*category*/ "Frame",+ /*aliases*/ {"chat", "toggle chat"},+ /*default_hotkey*/ current_key_for(KeyAction::ToggleChat),+ /*predicate*/ require_unlocked_frame(),+ /*handler*/ &handler_toggle_chat,+ /*parameter_slots*/ {},+ });++ register_one(ActionDef{+ "frame.toggle_fullscreen",+ "Toggle Fullscreen",+ "Frame",+ {"fullscreen"},+ current_key_for(KeyAction::Fullscreen),+ require_focused_frame(),+ &handler_fullscreen,+ {},+ });++ register_one(ActionDef{+ "frame.toggle_focus_mode",+ "Toggle Focus Mode",+ "Frame",+ {"focus mode", "distraction free"},+ current_key_for(KeyAction::FocusMode),+ require_unlocked_frame(),+ &handler_focus_mode,+ {},+ });++ register_one(ActionDef{+ "frame.toggle_always_on_top",+ "Toggle Always On Top",+ "Frame",+ {"always on top", "pin window"},+ current_key_for(KeyAction::ToggleAlwaysOnTop),+ require_unlocked_frame(),+ &handler_always_on_top,+ {},+ });++ register_one(ActionDef{+ "frame.screenshot",+ "Save Screenshot",+ "Frame",+ {"screenshot", "capture"},+ current_key_for(KeyAction::Screenshot),+ require_focused_frame(),+ &handler_screenshot,+ {},+ });++ register_one(ActionDef{+ "frame.browse_components",+ "Browse Components",+ "Frame",+ {"components", "screen browser"},+ current_key_for(KeyAction::BrowseComponents),+ require_unlocked_frame(),+ &handler_browse_components,+ {},+ });++ // Phase 10 trim: debug overlay toggle. No default hotkey — discoverable+ // via command bar. Frame-level so each frame has its own overlay (the+ // user can leave it on for the frame they're tuning and off elsewhere).+ register_one(ActionDef{+ "debug.overlay",+ "Toggle Debug Overlay",+ "Debug",+ {"debug", "overlay", "stats"},+ QKeySequence(),+ require_focused_frame(),+ &handler_toggle_debug_overlay,+ {},+ });++ // ── Phase 6: layout.* actions ─────────────────────────────────────────++ register_one(ActionDef{+ "layout.save",+ "Save Current Layout",+ "Layout",+ {"save layout", "save workspace"},+ QKeySequence(),+ /*predicate*/ {},+ &handler_layout_save,+ {ParameterSlot{"name", "Layout name", "string", true, "", {}}},+ });++ register_one(ActionDef{+ "layout.save_as",+ "Save Layout As…",+ "Layout",+ {"save as", "save workspace as"},+ QKeySequence(),+ /*predicate*/ {},+ &handler_layout_save_as,+ {ParameterSlot{"name", "Layout name", "string", true, "", {}}},+ });++ register_one(ActionDef{+ "layout.switch",+ "Switch Layout",+ "Layout",+ {"switch layout", "load layout"},+ QKeySequence(),+ /*predicate*/ {},+ &handler_layout_switch,+ {ParameterSlot{"name", "Layout name or UUID", "string", true, "layout_name", {}}},+ });++ register_one(ActionDef{+ "layout.new",+ "New Layout",+ "Layout",+ {"new layout"},+ QKeySequence(),+ /*predicate*/ {},+ &handler_layout_new,+ {ParameterSlot{"name", "Layout name", "string", false, "", "New Layout"}},+ });++ register_one(ActionDef{+ "layout.export",+ "Export Layout",+ "Layout",+ {"export layout"},+ QKeySequence(),+ /*predicate*/ {},+ &handler_layout_export,+ {+ ParameterSlot{"name", "Layout name", "string", true, "layout_name", {}},+ ParameterSlot{"path", "Export path", "string", true, "", {}},+ },+ });++ register_one(ActionDef{+ "layout.import",+ "Import Layout",+ "Layout",+ {"import layout"},+ QKeySequence(),+ /*predicate*/ {},+ &handler_layout_import,+ {ParameterSlot{"path", "Import path", "string", true, "", {}}},+ });++ register_one(ActionDef{+ "layout.tile_2x2",+ "Tile Current Layout 2x2",+ "Layout",+ {"tile", "2x2"},+ QKeySequence(),+ require_unlocked_frame(),+ &handler_layout_tile_2x2,+ {},+ });++ register_one(ActionDef{+ "panel.fullscreen_toggle",+ "Fullscreen Focused Panel",+ "Panel",+ {"panel fullscreen", "zoom panel"},+ QKeySequence(),+ require_unlocked_frame(),+ &handler_panel_fullscreen_toggle,+ {},+ });++ // ── Phase 9: command bar + palette ──────────────────────────────────────++ register_one(ActionDef{+ "cmdbar.toggle",+ "Toggle Command Bar",+ "Command",+ {"command bar", "show command bar"},+ QKeySequence(QStringLiteral("Ctrl+\\")),+ require_unlocked_frame(),+ &handler_cmdbar_toggle,+ {},+ });++ register_one(ActionDef{+ "palette.open",+ "Open Command Palette",+ "Command",+ {"palette", "command palette"},+ QKeySequence(QStringLiteral("Ctrl+K")),+ require_unlocked_frame(),+ &handler_palette_open,+ {},+ });++ register_one(ActionDef{+ "debug.stress",+ "Toggle Stress Load (N frames × M panels × K ticks/sec)",+ "Debug",+ {"stress", "synthetic load", "perf test"},+ QKeySequence(),+ /*predicate*/ {},+ &handler_debug_stress,+ {+ ParameterSlot{"n", "Frame count", "int", false, "", 4},+ ParameterSlot{"m", "Panels per frame", "int", false, "", 16},+ ParameterSlot{"k", "Ticks per second", "int", false, "", 256},+ },+ });++ // ── Panel-level actions ────────────────────────────────────────────────++ register_one(ActionDef{+ "panel.refresh",+ "Refresh Focused Panel",+ "Panel",+ {"refresh", "reload"},+ current_key_for(KeyAction::Refresh),+ require_unlocked_frame(),+ &handler_refresh,+ {},+ });++ register_one(ActionDef{+ "panel.cycle_forward",+ "Cycle Panels Forward",+ "Panel",+ {"next panel"},+ current_key_for(KeyAction::CyclePanelsForward),+ require_unlocked_frame(),+ [](const CommandContext& ctx) { return handler_cycle_panels(true, ctx); },+ {},+ });++ register_one(ActionDef{+ "panel.cycle_back",+ "Cycle Panels Back",+ "Panel",+ {"previous panel"},+ current_key_for(KeyAction::CyclePanelsBack),+ require_unlocked_frame(),+ [](const CommandContext& ctx) { return handler_cycle_panels(false, ctx); },+ {},+ });++ // Phase 5: tear off the focused panel into a brand-new window. No+ // default hotkey — discoverability via the right-click menu and the+ // command bar (when Phase 9 lands).+ register_one(ActionDef{+ "panel.tear_off",+ "Tear off panel into new window",+ "Panel",+ {"tear off", "panel popout", "popout panel"},+ QKeySequence(),+ require_unlocked_frame(),+ &handler_tear_off,+ {},+ });++ // Phase 5: move the focused panel to another frame by display number.+ // Parameter slot frame_index (1-based) drives the target lookup. The+ // command-bar parser populates it from typed args; the right-click+ // menu invokes move_panel_to_frame directly without going through+ // the registry, so this entry is mostly for command-bar / future+ // palette discoverability.+ // ── Phase 7 polish: link.* actions ─────────────────────────────────────+ //+ // Discoverability is via the right-click panel menu (already present);+ // these registrations expose the same operations to the command bar and+ // palette (Phase 9 consumers).++ register_one(ActionDef{+ "link.set_group",+ "Link Panel to Group",+ "Link",+ {"link", "link to group", "set group"},+ QKeySequence(),+ require_unlocked_frame(),+ &handler_link_set_group,+ {+ ParameterSlot{+ /*name*/ "group",+ /*display*/ "Group letter (A..J or None)",+ /*type*/ "string",+ /*required*/ true,+ /*suggestion_source*/ "link_groups",+ /*default_value*/ {},+ },+ },+ });++ register_one(ActionDef{+ "link.clear_group",+ "Unlink Panel",+ "Link",+ {"unlink", "clear link"},+ QKeySequence(),+ require_unlocked_frame(),+ &handler_link_clear_group,+ {},+ });++ register_one(ActionDef{+ "link.publish_to_group",+ "Publish Symbol to Group",+ "Link",+ {"publish", "broadcast"},+ QKeySequence(),+ /*predicate*/ {}, // works without a focused panel — broadcasts globally+ &handler_link_publish_to_group,+ {+ ParameterSlot{"group", "Group letter (A..J)", "string", true, "link_groups", {}},+ ParameterSlot{"symbol", "Symbol ticker", "string", true, "symbol", {}},+ },+ });++ register_one(ActionDef{+ "panel.move_to_frame",+ "Move panel to window…",+ "Panel",+ {"move panel", "send to window"},+ QKeySequence(),+ require_more_than_one_window(),+ &handler_move_to_frame,+ // parameter_slots+ {+ ParameterSlot{+ /*name*/ "frame_index",+ /*display*/ "Window number",+ /*type*/ "int",+ /*required*/ true,+ /*suggestion_source*/ "open_frames",+ /*default_value*/ {},+ },+ },+ });++ // ── Window-level actions (cross-frame) ─────────────────────────────────++ register_one(ActionDef{+ "window.cycle_forward",+ "Cycle Windows Forward",+ "Window",+ {"next window"},+ current_key_for(KeyAction::CycleWindowsForward),+ require_more_than_one_window(),+ [](const CommandContext& ctx) { return handler_cycle_windows(true, ctx); },+ {},+ });++ register_one(ActionDef{+ "window.cycle_back",+ "Cycle Windows Back",+ "Window",+ {"previous window"},+ current_key_for(KeyAction::CycleWindowsBack),+ require_more_than_one_window(),+ [](const CommandContext& ctx) { return handler_cycle_windows(false, ctx); },+ {},+ });++ register_one(ActionDef{+ "window.new_on_next_monitor",+ "New Window on Next Monitor",+ "Window",+ {"new window", "spawn window"},+ current_key_for(KeyAction::NewWindowNextMonitor),+ /*predicate*/ {}, // always available — works on any monitor count+ &handler_new_window_next_monitor,+ {},+ });++ // FocusWindow1..9 — generated via a loop because the only difference is+ // the index. Each registers as window.focus_1, window.focus_2, etc.+ {+ const KeyAction focus_keys[9] = {+ KeyAction::FocusWindow1, KeyAction::FocusWindow2, KeyAction::FocusWindow3,+ KeyAction::FocusWindow4, KeyAction::FocusWindow5, KeyAction::FocusWindow6,+ KeyAction::FocusWindow7, KeyAction::FocusWindow8, KeyAction::FocusWindow9,+ };+ for (int i = 0; i < 9; ++i) {+ register_one(ActionDef{+ QString("window.focus_%1").arg(i + 1),+ QString("Focus Window %1").arg(i + 1),+ "Window",+ {QString("window %1").arg(i + 1)},+ current_key_for(focus_keys[i]),+ /*predicate*/ {}, // no-op if index out of range — registry layer doesn't need to know+ [i](const CommandContext& ctx) { return handler_focus_window_n(i, ctx); },+ {},+ });+ }+ }++ // MoveWindowToMonitor1..9 — same pattern.+ {+ const KeyAction move_keys[9] = {+ KeyAction::MoveWindowToMonitor1, KeyAction::MoveWindowToMonitor2,+ KeyAction::MoveWindowToMonitor3, KeyAction::MoveWindowToMonitor4,+ KeyAction::MoveWindowToMonitor5, KeyAction::MoveWindowToMonitor6,+ KeyAction::MoveWindowToMonitor7, KeyAction::MoveWindowToMonitor8,+ KeyAction::MoveWindowToMonitor9,+ };+ for (int i = 0; i < 9; ++i) {+ register_one(ActionDef{+ QString("window.move_to_monitor_%1").arg(i + 1),+ QString("Move Window to Monitor %1").arg(i + 1),+ "Window",+ {QString("monitor %1").arg(i + 1)},+ current_key_for(move_keys[i]),+ require_more_than_one_monitor(),+ [i](const CommandContext& ctx) { return handler_move_window_to_monitor(i, ctx); },+ {},+ });+ }+ }++ // ── Terminal-level actions (shell-scoped, ignore focused frame) ────────++ register_one(ActionDef{+ "terminal.lock_now",+ "Lock Terminal",+ "Terminal",+ {"lock", "lock now"},+ current_key_for(KeyAction::LockNow),+ /*predicate*/ {}, // always available+ &handler_lock_now,+ {},+ });++ LOG_INFO(kBuiltinTag, QString("Registered %1 builtin actions")+ .arg(ActionRegistry::instance().size()));+}++QString action_id_for(KeyAction a) {+ // Kept in sync with the register_one() calls above. Per-screen+ // KeyActions (NavNext, NewsOpen, RunCell, etc.) intentionally return+ // empty — those bind directly inside their owning screens, not via+ // the global ActionRegistry.+ switch (a) {+ case KeyAction::Refresh: return QStringLiteral("panel.refresh");+ case KeyAction::ToggleChat: return QStringLiteral("frame.toggle_chat_mode");+ case KeyAction::FocusMode: return QStringLiteral("frame.toggle_focus_mode");+ case KeyAction::Fullscreen: return QStringLiteral("frame.toggle_fullscreen");+ case KeyAction::Screenshot: return QStringLiteral("frame.screenshot");+ case KeyAction::LockNow: return QStringLiteral("terminal.lock_now");+ case KeyAction::ToggleAlwaysOnTop: return QStringLiteral("frame.toggle_always_on_top");+ case KeyAction::BrowseComponents: return QStringLiteral("frame.browse_components");+ case KeyAction::CyclePanelsForward: return QStringLiteral("panel.cycle_forward");+ case KeyAction::CyclePanelsBack: return QStringLiteral("panel.cycle_back");+ case KeyAction::CycleWindowsForward: return QStringLiteral("window.cycle_forward");+ case KeyAction::CycleWindowsBack: return QStringLiteral("window.cycle_back");+ case KeyAction::NewWindowNextMonitor: return QStringLiteral("window.new_on_next_monitor");+ case KeyAction::FocusWindow1: return QStringLiteral("window.focus_1");+ case KeyAction::FocusWindow2: return QStringLiteral("window.focus_2");+ case KeyAction::FocusWindow3: return QStringLiteral("window.focus_3");+ case KeyAction::FocusWindow4: return QStringLiteral("window.focus_4");+ case KeyAction::FocusWindow5: return QStringLiteral("window.focus_5");+ case KeyAction::FocusWindow6: return QStringLiteral("window.focus_6");+ case KeyAction::FocusWindow7: return QStringLiteral("window.focus_7");+ case KeyAction::FocusWindow8: return QStringLiteral("window.focus_8");+ case KeyAction::FocusWindow9: return QStringLiteral("window.focus_9");+ case KeyAction::MoveWindowToMonitor1: return QStringLiteral("window.move_to_monitor_1");+ case KeyAction::MoveWindowToMonitor2: return QStringLiteral("window.move_to_monitor_2");+ case KeyAction::MoveWindowToMonitor3: return QStringLiteral("window.move_to_monitor_3");+ case KeyAction::MoveWindowToMonitor4: return QStringLiteral("window.move_to_monitor_4");+ case KeyAction::MoveWindowToMonitor5: return QStringLiteral("window.move_to_monitor_5");+ case KeyAction::MoveWindowToMonitor6: return QStringLiteral("window.move_to_monitor_6");+ case KeyAction::MoveWindowToMonitor7: return QStringLiteral("window.move_to_monitor_7");+ case KeyAction::MoveWindowToMonitor8: return QStringLiteral("window.move_to_monitor_8");+ case KeyAction::MoveWindowToMonitor9: return QStringLiteral("window.move_to_monitor_9");+ // Per-screen actions — not in ActionRegistry yet.+ case KeyAction::NavNext:+ case KeyAction::NavPrev:+ case KeyAction::NavAccept:+ case KeyAction::NavEscape:+ case KeyAction::NewsNext:+ case KeyAction::NewsPrev:+ case KeyAction::NewsOpen:+ case KeyAction::NewsClose:+ case KeyAction::RunCell:+ case KeyAction::RunAndNext:+ case KeyAction::RenameCell:+ return {};+ }+ return {};+}++} // namespace fincept::actionsdiff --git a/fincept-qt/src/core/actions/builtin_actions.h b/fincept-qt/src/core/actions/builtin_actions.hnew file mode 100644index 000000000..9dcb0904b--- /dev/null+++ b/fincept-qt/src/core/actions/builtin_actions.h@@ -0,0 +1,46 @@+#pragma once+#include "core/keys/KeyActions.h"++#include <QString>++namespace fincept::actions {++/// Register the built-in actions with `ActionRegistry::instance()`.+///+/// Called exactly once at process startup from `TerminalShell::initialise()`.+/// Subsequent calls are no-ops because the registry's `register_action()` is+/// idempotent on the action id.+///+/// The actions registered here are the canonical replacement for the ~30+/// hard-coded `connect(...)` calls that used to live in MainWindow's+/// constructor (lines 393–543 pre-Phase 4). Each action carries:+///+/// - id: e.g. "window.cycle_forward", "panel.refresh", "terminal.lock_now"+/// - default_hotkey: synced from KeyConfigManager so user-bound keys win+/// - predicate: gate that hides the action in surfaces when its context+/// isn't satisfied (e.g. "requires_more_than_one_monitor")+/// - handler: takes CommandContext and invokes the appropriate API on+/// the focused frame, the shell, or the keyboard policy+///+/// The hotkey binding layer in WindowFrame's constructor walks+/// `ActionRegistry::all_ids()` to install per-frame QActions that route+/// `triggered` signals through `ActionRegistry::invoke(id, ctx)`. The+/// `ctx.focused_frame` is resolved live at invoke time, fixing the+/// pre-Phase 4 latent bug where multi-window setups could route an+/// action to a non-focused frame whose `this` was captured in the+/// original lambda.+void register_builtins();++/// Map a KeyConfigManager `KeyAction` enum value to its canonical+/// `ActionRegistry` action id. Returns an empty string for KeyActions that+/// aren't (yet) modelled as ActionRegistry actions — the per-screen ones+/// (NavNext, NewsOpen, RunCell, etc.) which still belong to specific+/// screens, not the global registry.+///+/// WindowFrame's keyboard-binding loop uses this to wire each+/// KeyConfigManager-owned QAction's `triggered` signal to the corresponding+/// registry handler, preserving live re-binding when the user changes a+/// hotkey in Settings.+QString action_id_for(KeyAction a);++} // namespace fincept::actionsdiff --git a/fincept-qt/src/core/config/ProfileManager.cpp b/fincept-qt/src/core/config/ProfileManager.cppindex 17aefb63b..e38d9a854 100644--- a/fincept-qt/src/core/config/ProfileManager.cpp+++ b/fincept-qt/src/core/config/ProfileManager.cpp@@ -8,16 +8,13 @@#include <QJsonArray>#include <QJsonDocument>#include <QJsonObject>+#include <QJsonValue>namespace fincept {-ProfileManager& ProfileManager::instance() {- static ProfileManager s;- return s;-}+namespace {-void ProfileManager::set_active(const QString& name) {- // Sanitise: only allow alphanumeric, dash, underscore+QString sanitise_name(const QString& name) {QString clean = name.trimmed().toLower();for (QChar& c : clean) {if (!c.isLetterOrNumber() && c != '-' && c != '_')@@ -25,20 +22,41 @@ void ProfileManager::set_active(const QString& name) {}if (clean.isEmpty())clean = "default";+ return clean;+}- active_profile_ = clean;+void ensure_profile_dirs(const QString& root) {+ QDir().mkpath(root + "/data");+ QDir().mkpath(root + "/logs");+ QDir().mkpath(root + "/cache");+ QDir().mkpath(root + "/files");+ QDir().mkpath(root + "/workspaces");+}- // Ensure the profile directory tree exists- QDir().mkpath(profile_root() + "/data");- QDir().mkpath(profile_root() + "/logs");- QDir().mkpath(profile_root() + "/cache");- QDir().mkpath(profile_root() + "/files");- QDir().mkpath(profile_root() + "/workspaces");+} // namespace- // Register in manifest if not already there- QStringList existing = list_profiles();- if (!existing.contains(active_profile_)) {- existing.append(active_profile_);+ProfileManager& ProfileManager::instance() {+ static ProfileManager s;+ return s;+}++void ProfileManager::set_active(const QString& name) {+ const QString clean = sanitise_name(name);+ active_profile_ = clean;+ ensure_profile_dirs(profile_root());++ // Mint a UUID if the profile is new to the manifest. We do this through+ // create_profile() so the manifest stays consistent — set_active() is the+ // path users hit on first launch (with name="default") and we want the+ // default profile to acquire its persistent UUID then, not on the second+ // launch.+ load_id_cache_locked();+ if (!id_cache_.contains(clean)) {+ const ProfileId minted = ProfileId::generate();+ id_cache_.insert(clean, minted);+ QStringList existing = list_profiles();+ if (!existing.contains(clean))+ existing.append(clean);save_manifest(existing);}}@@ -47,6 +65,22 @@ QString ProfileManager::active() const {return active_profile_;}+ProfileId ProfileManager::active_profile_id() const {+ load_id_cache_locked();+ auto it = id_cache_.constFind(active_profile_);+ if (it != id_cache_.constEnd())+ return it.value();+ // No entry yet — synthesise + persist. This handles the rare case where+ // a profile directory was created out-of-band (e.g. user copied folder).+ const ProfileId minted = ProfileId::generate();+ id_cache_.insert(active_profile_, minted);+ QStringList existing = list_profiles();+ if (!existing.contains(active_profile_))+ existing.append(active_profile_);+ save_manifest(existing);+ return minted;+}+bool ProfileManager::is_custom_profile() const {return active_profile_ != "default";}@@ -70,54 +104,72 @@ QString ProfileManager::secure_key_prefix() const {}QStringList ProfileManager::list_profiles() const {+ load_id_cache_locked();QStringList result{"default"};+ for (auto it = id_cache_.constBegin(); it != id_cache_.constEnd(); ++it) {+ if (!result.contains(it.key()))+ result.append(it.key());+ }+ return result;+}- QFile f(manifest_path());- if (!f.open(QIODevice::ReadOnly))- return result;-- const QJsonDocument doc = QJsonDocument::fromJson(f.readAll());- f.close();+QList<ProfileManager::Entry> ProfileManager::profile_entries() const {+ load_id_cache_locked();+ QList<Entry> out;+ // Always emit "default" first so UI ordering is stable.+ if (id_cache_.contains("default"))+ out.append({"default", id_cache_.value("default")});+ for (auto it = id_cache_.constBegin(); it != id_cache_.constEnd(); ++it) {+ if (it.key() == "default") continue;+ out.append({it.key(), it.value()});+ }+ return out;+}- if (!doc.isObject())- return result;+ProfileId ProfileManager::profile_id_for(const QString& name) const {+ load_id_cache_locked();+ return id_cache_.value(sanitise_name(name));+}- const QJsonArray arr = doc.object().value("profiles").toArray();- for (const QJsonValue& v : arr) {- const QString name = v.toString();- if (!name.isEmpty() && !result.contains(name))- result.append(name);+QString ProfileManager::profile_name_for(const ProfileId& id) const {+ load_id_cache_locked();+ for (auto it = id_cache_.constBegin(); it != id_cache_.constEnd(); ++it) {+ if (it.value() == id)+ return it.key();}- return result;+ return {};}-void ProfileManager::create_profile(const QString& name) {- // Sanitise: same rules as set_active()- QString clean = name.trimmed().toLower();- for (QChar& c : clean) {- if (!c.isLetterOrNumber() && c != '-' && c != '_')- c = '_';- }+ProfileId ProfileManager::create_profile(const QString& name) {+ const QString clean = sanitise_name(name);if (clean.isEmpty())- return;+ return ProfileId();++ load_id_cache_locked();+ if (id_cache_.contains(clean))+ return id_cache_.value(clean); // idempotent++ const ProfileId minted = ProfileId::generate();+ id_cache_.insert(clean, minted);QStringList profiles = list_profiles();- if (!profiles.contains(clean)) {+ if (!profiles.contains(clean))profiles.append(clean);- save_manifest(profiles);- }- // Create directory tree eagerly so it's ready for use+ save_manifest(profiles);++ // Create directory tree eagerly so it's ready for use.const QString root = AppPaths::root() + "/profiles/" + clean;- QDir().mkpath(root + "/data");- QDir().mkpath(root + "/logs");- QDir().mkpath(root + "/cache");- QDir().mkpath(root + "/files");- QDir().mkpath(root + "/workspaces");+ ensure_profile_dirs(root);+ return minted;}void ProfileManager::delete_profile(const QString& name) {if (name == "default")return; // cannot delete the default profile++ load_id_cache_locked();+ id_cache_.remove(name);+QStringList profiles = list_profiles();profiles.removeAll(name);save_manifest(profiles);@@ -128,13 +180,84 @@ QString ProfileManager::manifest_path() const {return AppPaths::root() + "/profiles.json";}+void ProfileManager::load_id_cache_locked() const {+ if (id_cache_loaded_)+ return;+ id_cache_loaded_ = true;++ // Default profile always exists in cache; UUID is minted on first read+ // if the manifest doesn't already have it.+ if (!id_cache_.contains("default"))+ id_cache_.insert("default", ProfileId::generate());++ QFile f(manifest_path());+ if (!f.open(QIODevice::ReadOnly))+ return; // first run — keep the freshly-minted default UUID++ const QJsonDocument doc = QJsonDocument::fromJson(f.readAll());+ f.close();+ if (!doc.isObject())+ return;++ const QJsonArray arr = doc.object().value("profiles").toArray();+ bool needs_rewrite = false;+ for (const QJsonValue& v : arr) {+ if (v.isString()) {+ // Legacy format: bare string. Mint a UUID for it, flag manifest+ // rewrite so the next save persists the upgraded form.+ const QString name = v.toString();+ if (name.isEmpty()) continue;+ if (!id_cache_.contains(name))+ id_cache_.insert(name, ProfileId::generate());+ needs_rewrite = true;+ } else if (v.isObject()) {+ const QJsonObject obj = v.toObject();+ const QString name = obj.value("name").toString();+ if (name.isEmpty()) continue;+ const QString id_str = obj.value("id").toString();+ ProfileId id = ProfileId::from_string(id_str);+ if (id.is_null()) {+ id = ProfileId::generate();+ needs_rewrite = true;+ }+ id_cache_.insert(name, id);+ }+ }++ if (needs_rewrite) {+ QStringList names;+ for (auto it = id_cache_.constBegin(); it != id_cache_.constEnd(); ++it)+ names.append(it.key());+ save_manifest(names);+ }+}+void ProfileManager::save_manifest(const QStringList& profiles) const {+ // Ensure every name has an id in the cache before writing.+ for (const QString& p : profiles) {+ if (!id_cache_.contains(p))+ id_cache_.insert(p, ProfileId::generate());+ }+QJsonArray arr;- for (const QString& p : profiles)- arr.append(p);+ // Always serialise "default" first for stable diffs.+ QStringList ordered;+ if (profiles.contains("default"))+ ordered.append("default");+ for (const QString& p : profiles) {+ if (p != "default" && !ordered.contains(p))+ ordered.append(p);+ }+ for (const QString& p : ordered) {+ QJsonObject entry;+ entry["name"] = p;+ entry["id"] = id_cache_.value(p).to_string();+ arr.append(entry);+ }QJsonObject obj;obj["profiles"] = arr;+ obj["schema_version"] = 2; // v1 = bare strings; v2 = {name, id} objects.QFile f(manifest_path());if (f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {diff --git a/fincept-qt/src/core/config/ProfileManager.h b/fincept-qt/src/core/config/ProfileManager.hindex d61efcd2e..8789188b5 100644--- a/fincept-qt/src/core/config/ProfileManager.h+++ b/fincept-qt/src/core/config/ProfileManager.h@@ -1,4 +1,7 @@#pragma once+#include "core/identity/Uuid.h"++#include <QHash>#include <QString>#include <QStringList>@@ -14,8 +17,14 @@ namespace fincept {/// Profiles are stored under:/// %LOCALAPPDATA%/com.fincept.terminal/profiles/<name>////-/// A manifest at root/profiles.json tracks the list of profiles.-/// The default profile is named "default".+/// A manifest at root/profiles.json tracks the list of profiles. Each entry+/// carries a stable `ProfileId` UUID alongside its human-readable name —+/// names are what the UI shows, UUIDs are what code uses for identity. The+/// distinction matters for cloud sync (a name can be reused on a different+/// machine; a UUID cannot collide) and for the multi-window refactor where+/// per-profile state is keyed by UUID downstream.+///+/// The default profile is named "default" and is auto-created on first run.////// Call set_active() BEFORE AppPaths::ensure_all() in main().class ProfileManager {@@ -23,20 +32,43 @@ class ProfileManager {static ProfileManager& instance();/// Set the active profile. Must be called before AppPaths is used.- /// Creates the profile directory if it doesn't exist.+ /// Creates the profile directory + manifest entry (with a freshly-minted+ /// UUID) if the profile name is not yet known.void set_active(const QString& name);/// Returns the active profile name (default: "default").QString active() const;+ /// Stable UUID of the active profile. Lazy-mints + persists if the+ /// active profile is unknown to the manifest (e.g. first run, or a+ /// profile created on disk by hand).+ ProfileId active_profile_id() const;+/// Returns true if a non-default profile is active.bool is_custom_profile() const;/// Returns all known profile names from the manifest.QStringList list_profiles() const;+ /// Returns the manifest entries: pairs of (name, ProfileId) in+ /// definition order. The "default" profile is always present even if+ /// missing from the manifest file.+ struct Entry {+ QString name;+ ProfileId id;+ };+ QList<Entry> profile_entries() const;++ /// Look up a profile's UUID by its name. Null on miss.+ ProfileId profile_id_for(const QString& name) const;++ /// Look up a profile's name by its UUID. Empty on miss.+ QString profile_name_for(const ProfileId& id) const;+/// Creates a new profile entry in the manifest (does not switch to it).- void create_profile(const QString& name);+ /// Mints a fresh UUID. Idempotent: if the name already exists, returns+ /// the existing UUID without touching the manifest.+ ProfileId create_profile(const QString& name);/// Deletes a profile from the manifest. Does NOT delete its data directory/// (user must do that manually to avoid accidental data loss).@@ -60,7 +92,22 @@ class ProfileManager {QString active_profile_{"default"};+ /// Cache of (name → ProfileId) loaded from the manifest. Populated lazily+ /// on first read; mutated by create_profile / delete_profile / set_active+ /// (when minting a new UUID for a previously-unknown name).+ mutable QHash<QString, ProfileId> id_cache_;+ mutable bool id_cache_loaded_ = false;+QString manifest_path() const;++ /// Read the manifest into id_cache_. Idempotent. Tolerates legacy+ /// manifests that store profiles as plain strings rather than {name,id}+ /// objects: legacy entries get UUIDs minted + the manifest rewritten on+ /// next save.+ void load_id_cache_locked() const;++ /// Persist the current name list + UUID map back to disk. Always writes+ /// the new {name, id} object format.void save_manifest(const QStringList& profiles) const;};diff --git a/fincept-qt/src/core/debug/StressLoad.cpp b/fincept-qt/src/core/debug/StressLoad.cppnew file mode 100644index 000000000..4e7533c15--- /dev/null+++ b/fincept-qt/src/core/debug/StressLoad.cpp@@ -0,0 +1,105 @@+#include "core/debug/StressLoad.h"++#include "app/WindowFrame.h"+#include "core/logging/Logger.h"+#include "core/window/WindowRegistry.h"+#include "datahub/DataHub.h"++#include <QDateTime>+#include <QString>+#include <QVariant>++#include <algorithm>++namespace fincept::debug_tools {++namespace {+constexpr const char* kStressTag = "StressLoad";+} // namespace++StressLoad& StressLoad::instance() {+ static StressLoad s;+ return s;+}++StressLoad::StressLoad() {+ tick_timer_.setSingleShot(false);+ connect(&tick_timer_, &QTimer::timeout, this, &StressLoad::on_tick);+}++bool StressLoad::start(int n_frames, int m_panels_per_frame, int k_ticks_per_sec) {+ if (running_)+ stop();++ n_frames_ = std::clamp(n_frames, 1, 16);+ m_panels_ = std::clamp(m_panels_per_frame, 1, 64);+ k_ticks_per_sec_ = std::clamp(k_ticks_per_sec, 1, 10000);++ LOG_INFO(kStressTag, QString("Starting stress: %1 frames × %2 panels, %3 ticks/sec")+ .arg(n_frames_).arg(m_panels_).arg(k_ticks_per_sec_));++ // Spawn frames beyond what already exists. Each spawn registers with+ // WindowRegistry automatically via WindowFrame's constructor.+ const int existing = WindowRegistry::instance().frame_count();+ for (int i = existing; i < n_frames_; ++i) {+ auto* w = new WindowFrame(WindowFrame::next_window_id());+ w->setAttribute(Qt::WA_DeleteOnClose);+ spawned_window_ids_.append(w->window_id());+ w->show();+ }++ // Panel materialisation in frames: drive via the existing route. We+ // can't easily open M arbitrary panels without enumerating registered+ // factories; for v1 the harness focuses on DataHub fanout pressure+ // rather than panel-spawn cost. Phase 6's full layout-load benchmark+ // is the right place for "open 50 panels" — see PanelMaterialiser tick.++ // Tick interval: 1000ms / K. At K=1 → 1000ms (one tick/sec).+ const int interval_ms = std::max(1, 1000 / k_ticks_per_sec_);+ tick_timer_.setInterval(interval_ms);+ total_ticks_ = 0;+ running_ = true;+ tick_timer_.start();+ return true;+}++void StressLoad::stop() {+ if (!running_)+ return;+ tick_timer_.stop();+ close_spawned_frames();+ LOG_INFO(kStressTag, QString("Stopped after %1 total ticks").arg(total_ticks_));+ running_ = false;+}++void StressLoad::on_tick() {+ // Fan a synthetic publish across N×M topics — each frame's slice gets+ // its own band so DataHub's fanout exercises the full subscriber map.+ auto& hub = datahub::DataHub::instance();+ const qint64 now_ms = QDateTime::currentMSecsSinceEpoch();+ for (int f = 0; f < n_frames_; ++f) {+ for (int p = 0; p < m_panels_; ++p) {+ const QString topic = QString("stress:tick:%1:%2").arg(f).arg(p);+ // Payload: a small map with timestamp + sequence. Cheap to+ // serialise; mimics the shape of real tick data.+ QVariantMap v;+ v.insert("ts_ms", now_ms);+ v.insert("seq", total_ticks_);+ hub.publish(topic, QVariant::fromValue(v));+ }+ }+ ++total_ticks_;+}++void StressLoad::close_spawned_frames() {+ // Close frames the harness created. Other (user) frames are untouched.+ const auto frames = WindowRegistry::instance().frames();+ for (WindowFrame* w : frames) {+ if (!w) continue;+ if (spawned_window_ids_.contains(w->window_id()))+ w->close();+ }+ spawned_window_ids_.clear();+}++} // namespace fincept::debug_toolsdiff --git a/fincept-qt/src/core/debug/StressLoad.h b/fincept-qt/src/core/debug/StressLoad.hnew file mode 100644index 000000000..0e1bae164--- /dev/null+++ b/fincept-qt/src/core/debug/StressLoad.h@@ -0,0 +1,65 @@+#pragma once++#include <QObject>+#include <QString>+#include <QTimer>++namespace fincept::debug_tools {++/// Phase 10: synthetic load harness for verifying the 16/200/1000 scale+/// claim from the design doc.+///+/// `debug.stress` action triggers `start(n_frames, m_panels_per_frame, k_ticks_per_sec)`.+/// The harness spawns N WindowFrames, opens M panels per frame (cycling+/// through registered factories), then pumps K synthetic publishes per+/// second into DataHub on `stress:tick:N` topics. Each frame's panels+/// subscribe to a slice of those topics so the fanout pipeline is+/// exercised end-to-end.+///+/// `stop()` halts the tick loop and closes the spawned frames. The harness+/// is reentrant — calling start() while already running stops first.+///+/// Threading: tick generation runs on a single QTimer on the UI thread.+/// At K=1000 this is ~1ms per fire — well under the budget on idle CPU.+/// If you want to stress the multi-thread paths, set K very high; the+/// hub queues to its own thread internally.+class StressLoad : public QObject {+ Q_OBJECT+ public:+ static StressLoad& instance();++ /// Start the harness. Returns true on successful start; false if+ /// arguments are invalid or out of range.+ /// n_frames: clamped to [1, 16]+ /// m_panels_per_frame: clamped to [1, 64]+ /// k_ticks_per_sec: clamped to [1, 10000]+ bool start(int n_frames, int m_panels_per_frame, int k_ticks_per_sec);++ /// Stop the harness. Closes the spawned frames and halts ticks.+ /// No-op if not running.+ void stop();++ bool is_running() const { return running_; }++ /// Stats for the debug overlay — total ticks fired so far.+ qint64 total_ticks() const { return total_ticks_; }++ private:+ StressLoad();++ void on_tick();+ void close_spawned_frames();++ bool running_ = false;+ int n_frames_ = 0;+ int m_panels_ = 0;+ int k_ticks_per_sec_ = 0;+ QTimer tick_timer_;+ qint64 total_ticks_ = 0;++ /// window_ids of frames spawned by this harness, so stop() can close+ /// only what we created — leaves any pre-existing user frames alone.+ QList<int> spawned_window_ids_;+};++} // namespace fincept::debug_toolsdiff --git a/fincept-qt/src/core/identity/Uuid.h b/fincept-qt/src/core/identity/Uuid.hnew file mode 100644index 000000000..bc4e7096c--- /dev/null+++ b/fincept-qt/src/core/identity/Uuid.h@@ -0,0 +1,85 @@+#pragma once+#include <QHash>+#include <QMetaType>+#include <QString>+#include <QUuid>++#include <functional>++namespace fincept {++/// Strongly-typed UUID newtype.+///+/// `QUuid` is structurally weak: a `WindowId` and a `PanelInstanceId` are the+/// same type to the compiler, so passing one where the other is expected is a+/// silent bug. The newtype below tags each kind with a phantom struct so the+/// type system catches mistakes that would otherwise need careful review.+///+/// All operations are inline / header-only; the macro at the bottom registers+/// QHash + Q_DECLARE_METATYPE so the typed ids flow through QVariant, signal/+/// slot queues, and QHash without per-id-type boilerplate.+///+/// Usage:+/// auto id = WindowId::generate(); // new random uuid+/// auto same = WindowId::from_string(s); // null on parse failure+/// QString txt = id.to_string(); // canonical 8-4-4-4-12 form+/// if (id.is_null()) ... // null/zero check+/// QHash<WindowId, Foo> map; // works (qHash overload below)+template <typename Tag>+class TypedUuid {+ public:+ constexpr TypedUuid() = default;+ explicit TypedUuid(const QUuid& uuid) : uuid_(uuid) {}++ /// Generate a fresh random uuid (v4).+ static TypedUuid generate() { return TypedUuid(QUuid::createUuid()); }++ /// Parse from canonical 8-4-4-4-12 string. Returns a null TypedUuid on+ /// failure — call is_null() to discriminate.+ static TypedUuid from_string(const QString& s) {+ return TypedUuid(QUuid::fromString(s));+ }++ /// Canonical hyphenated form without surrounding braces:+ /// "ee5d3c0e-9c4b-4f0a-9e0a-1c2b3a4d5e6f"+ QString to_string() const {+ return uuid_.toString(QUuid::WithoutBraces);+ }++ bool is_null() const { return uuid_.isNull(); }+ const QUuid& raw() const { return uuid_; }++ bool operator==(const TypedUuid& other) const { return uuid_ == other.uuid_; }+ bool operator!=(const TypedUuid& other) const { return uuid_ != other.uuid_; }+ bool operator<(const TypedUuid& other) const { return uuid_ < other.uuid_; }++ private:+ QUuid uuid_;+};++template <typename Tag>+inline size_t qHash(const TypedUuid<Tag>& id, size_t seed = 0) noexcept {+ return qHash(id.raw(), seed);+}++// ── Tags + concrete types ────────────────────────────────────────────────────+//+// Each tag is an empty struct; `WindowId` and `PanelInstanceId` are distinct+// types even though they share the same underlying representation.++struct WindowIdTag {};+struct PanelInstanceIdTag {};+struct LayoutIdTag {};+struct ProfileIdTag {};++using WindowId = TypedUuid<WindowIdTag>;+using PanelInstanceId = TypedUuid<PanelInstanceIdTag>;+using LayoutId = TypedUuid<LayoutIdTag>;+using ProfileId = TypedUuid<ProfileIdTag>;++} // namespace fincept++Q_DECLARE_METATYPE(fincept::WindowId)+Q_DECLARE_METATYPE(fincept::PanelInstanceId)+Q_DECLARE_METATYPE(fincept::LayoutId)+Q_DECLARE_METATYPE(fincept::ProfileId)diff --git a/fincept-qt/src/core/keys/KeyActions.h b/fincept-qt/src/core/keys/KeyActions.hindex 3c2dc9d7c..cedf73706 100644--- a/fincept-qt/src/core/keys/KeyActions.h+++ b/fincept-qt/src/core/keys/KeyActions.h@@ -1,10 +1,10 @@-// src/core/keys/KeyActions.h+// src/core/keys/KeyActions.h#pragma oncenamespace fincept {enum class KeyAction {- // Global (MainWindow)+ // Global (WindowFrame)Refresh,ToggleChat,FocusMode,@@ -29,7 +29,7 @@ enum class KeyAction {RenameCell,// Window / Panel Navigation (Phase 3)- // Focus a specific MainWindow by its 1-based ordinal across open windows+ // Focus a specific WindowFrame by its 1-based ordinal across open windows// (Ctrl+1..9 by default). Ctrl+1 always targets window_id = 0.FocusWindow1,FocusWindow2,@@ -41,18 +41,18 @@ enum class KeyAction {FocusWindow8,FocusWindow9,- // Cycle active dock widget inside the focused MainWindow.+ // Cycle active dock widget inside the focused WindowFrame.CyclePanelsForward,CyclePanelsBack,- // Cycle focus between MainWindow instances (Bloomberg PANEL key).+ // Cycle focus between WindowFrame instances (Bloomberg PANEL key).CycleWindowsForward,CycleWindowsBack,- // Spawn a new MainWindow, placed on the next available monitor.+ // Spawn a new WindowFrame, placed on the next available monitor.NewWindowNextMonitor,- // Move the current MainWindow to monitor N (Ctrl+Shift+1..9).+ // Move the current WindowFrame to monitor N (Ctrl+Shift+1..9).MoveWindowToMonitor1,MoveWindowToMonitor2,MoveWindowToMonitor3,diff --git a/fincept-qt/src/core/keys/WindowCycler.cpp b/fincept-qt/src/core/keys/WindowCycler.cppindex a3a7daeba..4bec86ee1 100644--- a/fincept-qt/src/core/keys/WindowCycler.cpp+++ b/fincept-qt/src/core/keys/WindowCycler.cpp@@ -1,8 +1,9 @@-#include "core/keys/WindowCycler.h"+#include "core/keys/WindowCycler.h"#include "app/DockScreenRouter.h"-#include "app/MainWindow.h"+#include "app/WindowFrame.h"#include "core/logging/Logger.h"+#include "core/window/WindowRegistry.h"#include <QApplication>#include <QGuiApplication>@@ -17,49 +18,26 @@ WindowCycler& WindowCycler::instance() {return s;}-void WindowCycler::register_window(MainWindow* w) {- if (!w)- return;- // Skip duplicates — idempotent register keeps callers simple.- for (const QPointer<MainWindow>& p : windows_) {- if (p == w)- return;- }- windows_.append(QPointer<MainWindow>(w));-}--void WindowCycler::unregister_window(MainWindow* w) {- if (!w)- return;- windows_.erase(std::remove_if(windows_.begin(), windows_.end(),- [w](const QPointer<MainWindow>& p) { return p == w || p.isNull(); }),- windows_.end());+void WindowCycler::register_window(WindowFrame* w) {+ WindowRegistry::instance().register_frame(w);}-QList<MainWindow*> WindowCycler::windows() const {- QList<MainWindow*> out;- out.reserve(windows_.size());- for (const QPointer<MainWindow>& p : windows_) {- if (p)- out.append(p.data());- }- std::sort(out.begin(), out.end(),- [](MainWindow* a, MainWindow* b) { return a->window_id() < b->window_id(); });- return out;+void WindowCycler::unregister_window(WindowFrame* w) {+ WindowRegistry::instance().unregister_frame(w);}-MainWindow* WindowCycler::current_focused() const {+WindowFrame* WindowCycler::current_focused() const {auto* aw = QApplication::activeWindow();- if (auto* mw = qobject_cast<MainWindow*>(aw))+ if (auto* mw = qobject_cast<WindowFrame*>(aw))return mw;// Fallback: first sorted window. Useful when activeWindow() is a modal// dialog or the OS just handed focus to another app.- const auto list = windows();+ const auto list = WindowRegistry::instance().frames();return list.isEmpty() ? nullptr : list.first();}void WindowCycler::focus_window_by_index(int n) {- const auto list = windows();+ const auto list = WindowRegistry::instance().frames();if (n < 0 || n >= list.size())return;auto* w = list.at(n);@@ -70,7 +48,7 @@ void WindowCycler::focus_window_by_index(int n) {}void WindowCycler::cycle_windows(bool forward) {- const auto list = windows();+ const auto list = WindowRegistry::instance().frames();if (list.size() < 2)return;auto* current = current_focused();@@ -96,24 +74,53 @@ void WindowCycler::cycle_panels_in_current_window(bool forward) {void WindowCycler::new_window_on_next_monitor() {auto* src = current_focused();- auto* w = new MainWindow(MainWindow::next_window_id());+ auto* w = new WindowFrame(WindowFrame::next_window_id());w->setAttribute(Qt::WA_DeleteOnClose);- // Smart placement: find a screen that doesn't contain the source- // window's centre. Matches the "new window" action in MainWindow's- // toolbar handler — kept in sync intentionally.+ // Decision 5.6: prefer the first monitor that has no frames at all,+ // since that's the case the user most often wants ("put it on my empty+ // 3rd monitor"). Fall back to "first monitor not containing focused+ // window's centre" (the pre-Phase 1 behaviour) when every monitor is+ // populated. Final fallback: don't reposition, let the constructor's+ // default placement run.const auto screens = QGuiApplication::screens();- if (src && screens.size() > 1) {- const QPoint src_centre = src->geometry().center();+ QScreen* target = nullptr;++ if (screens.size() > 1) {+ // Build a set of screens currently hosting at least one frame.+ const auto frames = WindowRegistry::instance().frames();+ QList<QScreen*> occupied;+ for (WindowFrame* mw : frames) {+ if (QScreen* s = mw->screen()) {+ if (!occupied.contains(s))+ occupied.append(s);+ }+ }+ // Tier 1: empty monitor.for (QScreen* s : screens) {- if (!s->geometry().contains(src_centre)) {- const QRect sg = s->availableGeometry();- w->resize(sg.width() * 9 / 10, sg.height() * 9 / 10);- w->move(sg.center() - w->rect().center());+ if (!occupied.contains(s)) {+ target = s;break;}}+ // Tier 2: monitor not containing source centre.+ if (!target && src) {+ const QPoint centre = src->geometry().center();+ for (QScreen* s : screens) {+ if (!s->geometry().contains(centre)) {+ target = s;+ break;+ }+ }+ }}++ if (target) {+ const QRect sg = target->availableGeometry();+ w->resize(sg.width() * 9 / 10, sg.height() * 9 / 10);+ w->move(sg.center() - w->rect().center());+ }+w->show();w->raise();w->activateWindow();diff --git a/fincept-qt/src/core/keys/WindowCycler.h b/fincept-qt/src/core/keys/WindowCycler.hindex d05abc5aa..0aa25b046 100644--- a/fincept-qt/src/core/keys/WindowCycler.h+++ b/fincept-qt/src/core/keys/WindowCycler.h@@ -1,35 +1,31 @@-#pragma once-#include <QList>+#pragma once#include <QObject>-#include <QPointer>namespace fincept {-class MainWindow;+class WindowFrame;-/// Process-global registry of live MainWindow instances, plus the keyboard-/// navigation policies that move focus between them. Kept out of-/// QApplication/QCoreApplication so tests can introspect it without needing-/// a full Qt app instance.+/// Keyboard policy for moving focus between MainWindows and spawning new+/// ones on specific monitors. Storage of which windows exist now lives in+/// `WindowRegistry` (Phase 1 split); WindowCycler is the thin policy layer+/// over it.///-/// MainWindow::MainWindow() calls register_window(this); the destructor calls-/// unregister_window(this) — the cycler holds weak (QPointer) refs so it-/// never keeps a dying window alive.+/// Public API is unchanged from the pre-split version so existing callers+/// (`Ctrl+1..9`, toolbar handlers, `--new-window` IPC) keep working as-is.+/// register_window/unregister_window are thin passthroughs to the registry.///-/// Ordering: windows are stored in insertion order but surfaced to the user-/// in ascending window_id order, so Ctrl+1 = primary, Ctrl+2 = first-/// secondary, and so on. That mapping is stable across a session even if-/// windows are created out of order.+/// Ordering: windows are surfaced to the user in ascending `window_id`+/// order, so Ctrl+1 = primary, Ctrl+2 = first secondary, and so on. Stable+/// across a session even if windows are created out of order.class WindowCycler : public QObject {Q_OBJECTpublic:static WindowCycler& instance();- void register_window(MainWindow* w);- void unregister_window(MainWindow* w);-- /// Return all live MainWindows sorted by window_id (ascending).- QList<MainWindow*> windows() const;+ /// Pass-through to WindowRegistry::register_frame for backward+ /// compatibility with existing call sites.+ void register_window(WindowFrame* w);+ void unregister_window(WindowFrame* w);/// Focus the Nth window (0-based) in window_id order. No-op if N is out/// of range. Activates, raises, and gives keyboard focus to the window.@@ -39,28 +35,32 @@ class WindowCycler : public QObject {/// if fewer than 2 windows are open.void cycle_windows(bool forward);- /// Cycle the focused panel inside whichever MainWindow currently has+ /// Cycle the focused panel inside whichever WindowFrame currently has/// focus. Delegates to that window's DockScreenRouter.void cycle_panels_in_current_window(bool forward);- /// Spawn a new MainWindow placed on the next available monitor (the- /// first monitor that doesn't already host the currently-focused- /// MainWindow's centre). Falls back to the primary screen.+ /// Spawn a new WindowFrame placed on the next available monitor. Per+ /// decision 5.6: prefer the first monitor with no frames at all; fall+ /// back to the first monitor that doesn't contain the focused window's+ /// centre; final fallback is primary screen.void new_window_on_next_monitor();- /// Move the currently-focused MainWindow to monitor N (0-based index+ /// Move the currently-focused WindowFrame to monitor N (0-based index/// into QGuiApplication::screens()). No-op if N is out of range or/// the window is already there.void move_current_window_to_monitor(int monitor_index);+ /// The frame that currently holds focus (active window), or the first+ /// registered frame if focus has wandered to a non-frame top-level+ /// (e.g. a modal dialog). Returns nullptr only when no frames exist.+ /// Phase 4 ActionRegistry handlers use this to resolve `focused_frame`+ /// live at action invocation time.+ WindowFrame* focused_frame() const { return current_focused(); }+private:WindowCycler() = default;- MainWindow* current_focused() const;-- /// Holds weak refs so a destroyed window is silently skipped until the- /// explicit unregister call cleans up the slot.- QList<QPointer<MainWindow>> windows_;+ WindowFrame* current_focused() const;};} // namespace finceptdiff --git a/fincept-qt/src/core/layout/LayoutCatalog.cpp b/fincept-qt/src/core/layout/LayoutCatalog.cppnew file mode 100644index 000000000..c2d76865d--- /dev/null+++ b/fincept-qt/src/core/layout/LayoutCatalog.cpp@@ -0,0 +1,279 @@+#include "core/layout/LayoutCatalog.h"++#include "core/logging/Logger.h"+#include "core/profile/ProfilePaths.h"++#include <QDateTime>+#include <QDir>+#include <QFile>+#include <QFileInfo>+#include <QJsonDocument>+#include <QJsonObject>+#include <QSqlDatabase>+#include <QSqlError>+#include <QSqlQuery>++namespace fincept {++namespace {+constexpr const char* kCatalogTag = "LayoutCatalog";+constexpr const char* kConnectionName = "fincept_layouts_index";++QSqlDatabase& open_index_db_(const QString& path, bool& opened) {+ static QSqlDatabase db;+ if (opened)+ return db;+ db = QSqlDatabase::addDatabase("QSQLITE", kConnectionName);+ db.setDatabaseName(path);+ if (!db.open()) {+ LOG_ERROR(kCatalogTag, QString("Failed to open layouts index db: %1").arg(db.lastError().text()));+ opened = false;+ } else {+ opened = true;+ }+ return db;+}+} // namespace++LayoutCatalog& LayoutCatalog::instance() {+ static LayoutCatalog s;+ return s;+}++Result<void> LayoutCatalog::open() {+ if (opened_)+ return Result<void>::ok();++ // Ensure layouts dir + index file path exist before SQLite opens.+ QDir().mkpath(ProfilePaths::layouts_dir());++ auto& db = open_index_db_(ProfilePaths::layouts_index_db(), opened_);+ if (!opened_)+ return Result<void>::err("layouts_index.db open failed");++ QSqlQuery pragma(db);+ pragma.exec("PRAGMA journal_mode = WAL");+ pragma.exec("PRAGMA synchronous = NORMAL");++ auto r = ensure_index_schema();+ if (r.is_err()) {+ opened_ = false;+ return r;+ }+ LOG_INFO(kCatalogTag, "Layouts catalogue opened: " + ProfilePaths::layouts_index_db());+ return Result<void>::ok();+}++Result<void> LayoutCatalog::ensure_index_schema() {+ QSqlDatabase db = QSqlDatabase::database(kConnectionName);+ if (!db.isOpen())+ return Result<void>::err("index db not open");++ QSqlQuery q(db);+ if (!q.exec("CREATE TABLE IF NOT EXISTS layouts ("+ " uuid TEXT PRIMARY KEY,"+ " name TEXT NOT NULL,"+ " kind TEXT NOT NULL,"+ " created_at_unix INTEGER NOT NULL,"+ " updated_at_unix INTEGER NOT NULL,"+ " description TEXT,"+ " thumbnail_path TEXT"+ ")")) {+ return Result<void>::err(q.lastError().text().toStdString());+ }+ if (!q.exec("CREATE INDEX IF NOT EXISTS idx_layouts_kind_updated "+ "ON layouts(kind, updated_at_unix DESC)")) {+ LOG_WARN(kCatalogTag, QString("idx create failed: %1").arg(q.lastError().text()));+ }+ return Result<void>::ok();+}++QString LayoutCatalog::file_path_for_(const LayoutId& id) const {+ return ProfilePaths::layouts_dir() + "/" + id.to_string() + ".json";+}++Result<void> LayoutCatalog::upsert_index_row(const layout::Workspace& w) {+ QSqlDatabase db = QSqlDatabase::database(kConnectionName);+ if (!db.isOpen())+ return Result<void>::err("index db not open");++ QSqlQuery q(db);+ q.prepare("INSERT INTO layouts(uuid, name, kind, created_at_unix, updated_at_unix, "+ " description, thumbnail_path) "+ "VALUES (?, ?, ?, ?, ?, ?, ?) "+ "ON CONFLICT(uuid) DO UPDATE SET "+ " name=excluded.name, kind=excluded.kind, "+ " updated_at_unix=excluded.updated_at_unix, "+ " description=excluded.description, "+ " thumbnail_path=excluded.thumbnail_path");+ q.addBindValue(w.id.to_string());+ q.addBindValue(w.name);+ q.addBindValue(w.kind);+ q.addBindValue(w.created_at_unix);+ q.addBindValue(w.updated_at_unix);+ q.addBindValue(w.description);+ q.addBindValue(w.thumbnail_path);+ if (!q.exec())+ return Result<void>::err(q.lastError().text().toStdString());+ return Result<void>::ok();+}++Result<LayoutId> LayoutCatalog::save_workspace(const layout::Workspace& w_in) {+ if (!opened_) {+ auto r = open();+ if (r.is_err()) return Result<LayoutId>::err(r.error());+ }++ layout::Workspace w = w_in;+ if (w.id.is_null())+ w.id = LayoutId::generate();+ const qint64 now = QDateTime::currentSecsSinceEpoch();+ if (w.created_at_unix == 0)+ w.created_at_unix = now;+ w.updated_at_unix = now;++ // Write the JSON file first; if that fails, we don't want a stale+ // index row pointing at nothing.+ const QString path = file_path_for_(w.id);+ QFile f(path);+ if (!f.open(QIODevice::WriteOnly | QIODevice::Truncate))+ return Result<LayoutId>::err(("Failed to open " + path + ": " + f.errorString()).toStdString());+ f.write(QJsonDocument(w.to_json()).toJson(QJsonDocument::Indented));+ f.close();++ auto idx = upsert_index_row(w);+ if (idx.is_err()) {+ LOG_WARN(kCatalogTag,+ QString("File written but index update failed for %1: %2")+ .arg(w.id.to_string(), QString::fromStdString(idx.error())));+ return Result<LayoutId>::err(idx.error());+ }+ LOG_INFO(kCatalogTag, QString("Saved layout '%1' (uuid=%2)").arg(w.name, w.id.to_string()));+ emit layout_saved(w.id);+ return Result<LayoutId>::ok(w.id);+}++Result<layout::Workspace> LayoutCatalog::load_workspace(const LayoutId& id) {+ if (!opened_) {+ auto r = open();+ if (r.is_err()) return Result<layout::Workspace>::err(r.error());+ }+ const QString path = file_path_for_(id);+ QFile f(path);+ if (!f.open(QIODevice::ReadOnly))+ return Result<layout::Workspace>::err(("Failed to open " + path + ": " + f.errorString()).toStdString());+ const QByteArray bytes = f.readAll();+ f.close();++ QJsonParseError err;+ const QJsonDocument doc = QJsonDocument::fromJson(bytes, &err);+ if (err.error != QJsonParseError::NoError)+ return Result<layout::Workspace>::err(("Parse error in " + path + ": " + err.errorString()).toStdString());+ if (!doc.isObject())+ return Result<layout::Workspace>::err(("Layout file is not a JSON object: " + path).toStdString());++ return Result<layout::Workspace>::ok(layout::Workspace::from_json(doc.object()));+}++Result<void> LayoutCatalog::remove_layout(const LayoutId& id) {+ if (!opened_) {+ auto r = open();+ if (r.is_err()) return r;+ }+ QFile::remove(file_path_for_(id));+ QSqlDatabase db = QSqlDatabase::database(kConnectionName);+ if (db.isOpen()) {+ QSqlQuery q(db);+ q.prepare("DELETE FROM layouts WHERE uuid = ?");+ q.addBindValue(id.to_string());+ q.exec();+ }+ emit layout_removed(id);+ return Result<void>::ok();+}++Result<QList<LayoutCatalog::Entry>> LayoutCatalog::list_layouts() {+ if (!opened_) {+ auto r = open();+ if (r.is_err()) return Result<QList<Entry>>::err(r.error());+ }+ QSqlDatabase db = QSqlDatabase::database(kConnectionName);+ if (!db.isOpen())+ return Result<QList<Entry>>::err("index db not open");++ QSqlQuery q(db);+ if (!q.exec("SELECT uuid, name, kind, created_at_unix, updated_at_unix, "+ " description, thumbnail_path "+ "FROM layouts ORDER BY updated_at_unix DESC"))+ return Result<QList<Entry>>::err(q.lastError().text().toStdString());++ QList<Entry> out;+ while (q.next()) {+ Entry e;+ e.id = LayoutId::from_string(q.value(0).toString());+ e.name = q.value(1).toString();+ e.kind = q.value(2).toString();+ e.created_at_unix = q.value(3).toLongLong();+ e.updated_at_unix = q.value(4).toLongLong();+ e.description = q.value(5).toString();+ e.thumbnail_path = q.value(6).toString();+ out.append(e);+ }+ return Result<QList<Entry>>::ok(out);+}++Result<QList<LayoutCatalog::Entry>> LayoutCatalog::recent_layouts(int limit, bool include_auto) {+ auto r = list_layouts();+ if (r.is_err()) return r;+ QList<Entry> filtered;+ for (const auto& e : r.value()) {+ if (!include_auto && e.kind == QStringLiteral("auto"))+ continue;+ filtered.append(e);+ if (filtered.size() >= limit) break;+ }+ return Result<QList<Entry>>::ok(filtered);+}++LayoutId LayoutCatalog::find_by_name(const QString& name) {+ auto r = list_layouts();+ if (r.is_err()) return LayoutId();+ for (const auto& e : r.value()) {+ if (e.name.compare(name, Qt::CaseInsensitive) == 0)+ return e.id;+ }+ return LayoutId();+}++Result<void> LayoutCatalog::export_to(const LayoutId& id, const QString& path) {+ auto wr = load_workspace(id);+ if (wr.is_err()) return Result<void>::err(wr.error());+ QFile f(path);+ if (!f.open(QIODevice::WriteOnly | QIODevice::Truncate))+ return Result<void>::err(("Export open failed: " + f.errorString()).toStdString());+ f.write(QJsonDocument(wr.value().to_json()).toJson(QJsonDocument::Indented));+ f.close();+ return Result<void>::ok();+}++Result<LayoutId> LayoutCatalog::import_from(const QString& path) {+ QFile f(path);+ if (!f.open(QIODevice::ReadOnly))+ return Result<LayoutId>::err(("Import open failed: " + f.errorString()).toStdString());+ const QByteArray bytes = f.readAll();+ f.close();++ QJsonParseError err;+ const QJsonDocument doc = QJsonDocument::fromJson(bytes, &err);+ if (err.error != QJsonParseError::NoError)+ return Result<LayoutId>::err(("Parse error: " + err.errorString()).toStdString());++ layout::Workspace w = layout::Workspace::from_json(doc.object());+ // Mint a fresh id so two users importing the same shared file don't+ // collide on the same UUID. Caller can override via save_workspace+ // path-based copy if they really want to preserve cross-user identity.+ w.id = LayoutId::generate();+ return save_workspace(w);+}++} // namespace finceptdiff --git a/fincept-qt/src/core/layout/LayoutCatalog.h b/fincept-qt/src/core/layout/LayoutCatalog.hnew file mode 100644index 000000000..a3b6ff845--- /dev/null+++ b/fincept-qt/src/core/layout/LayoutCatalog.h@@ -0,0 +1,101 @@+#pragma once+#include "core/identity/Uuid.h"+#include "core/layout/LayoutTypes.h"+#include "core/result/Result.h"++#include <QList>+#include <QObject>+#include <QString>++namespace fincept {++/// Phase 6: per-profile saved-layouts catalogue.+///+/// Directory layout (under ProfilePaths::layouts_dir()):+/// <uuid>.json — one Workspace per file (decisions 4.6/4.8)+/// _index.db — SQLite index for fast list/search/recent+///+/// The index db has one table:+/// layouts(+/// uuid TEXT PRIMARY KEY,+/// name TEXT NOT NULL,+/// kind TEXT NOT NULL, -- 'auto' | 'user' | 'builtin' | 'crash_recovery'+/// created_at_unix INTEGER NOT NULL,+/// updated_at_unix INTEGER NOT NULL,+/// description TEXT,+/// thumbnail_path TEXT+/// )+///+/// Insert/update on save_workspace; read on list_layouts. Full Workspace+/// JSON is stored in the per-uuid file, NOT the index, so the index+/// stays small (one row per saved layout).+///+/// Threading: UI thread only. SQLite + filesystem I/O runs synchronously+/// from save/list/load — workspace-level operations are user-driven and+/// rare (a few per session) so no QtConcurrent path needed.+class LayoutCatalog : public QObject {+ Q_OBJECT+ public:+ static LayoutCatalog& instance();++ /// Open the catalogue for the active profile (called from+ /// TerminalShell::initialise after ProfilePaths::ensure_all). Idempotent.+ Result<void> open();++ /// Persist a Workspace to disk (file + index row). Replaces any+ /// existing entry with the same UUID. Returns the saved layout's id+ /// for caller chaining.+ Result<LayoutId> save_workspace(const layout::Workspace& w);++ /// Load a Workspace by UUID. err if file missing / corrupt.+ Result<layout::Workspace> load_workspace(const LayoutId& id);++ /// Remove a layout (file + index row). No-op if not present.+ Result<void> remove_layout(const LayoutId& id);++ /// List all known layouts. Cheap (just the index).+ struct Entry {+ LayoutId id;+ QString name;+ QString kind; ///< 'auto' | 'user' | 'builtin' | 'crash_recovery'+ qint64 created_at_unix = 0;+ qint64 updated_at_unix = 0;+ QString description;+ QString thumbnail_path;+ };+ Result<QList<Entry>> list_layouts();++ /// Most-recent N layouts (by updated_at), excluding 'auto' kind unless+ /// `include_auto=true`. Drives the Launchpad recent list.+ Result<QList<Entry>> recent_layouts(int limit, bool include_auto = false);++ /// Convenience: layout id of any layout matching `name` (case-insensitive),+ /// or null id if none. Used by the `layout.switch` action.+ LayoutId find_by_name(const QString& name);++ /// Export a layout to an arbitrary file path. Same JSON format as the+ /// internal layouts/<uuid>.json file. Path must include the .json+ /// extension by convention; we don't enforce it.+ Result<void> export_to(const LayoutId& id, const QString& path);++ /// Import a JSON file as a new layout. Returns the new layout's UUID+ /// (mints a fresh one if the file doesn't carry a valid id, so two+ /// users importing the same shared file don't collide).+ Result<LayoutId> import_from(const QString& path);++ signals:+ void layout_saved(const LayoutId& id);+ void layout_removed(const LayoutId& id);++ private:+ LayoutCatalog() = default;++ Result<void> ensure_index_schema();+ Result<void> upsert_index_row(const layout::Workspace& w);++ QString file_path_for_(const LayoutId& id) const;++ bool opened_ = false;+};++} // namespace finceptdiff --git a/fincept-qt/src/core/layout/LayoutTypes.cpp b/fincept-qt/src/core/layout/LayoutTypes.cppnew file mode 100644index 000000000..d7c103200--- /dev/null+++ b/fincept-qt/src/core/layout/LayoutTypes.cpp@@ -0,0 +1,215 @@+#include "core/layout/LayoutTypes.h"++#include <QJsonArray>+#include <QJsonDocument>+#include <QJsonObject>+#include <QJsonValue>++namespace fincept::layout {++namespace {++// Tiny helpers — kept local because they only exist to avoid the same six+// lines repeating in every from_json. If they grow, lift to a header.+QJsonObject rect_to_json(const QRect& r) {+ QJsonObject o;+ o["x"] = r.x();+ o["y"] = r.y();+ o["w"] = r.width();+ o["h"] = r.height();+ return o;+}++QRect rect_from_json(const QJsonObject& o) {+ return QRect(o.value("x").toInt(), o.value("y").toInt(),+ o.value("w").toInt(), o.value("h").toInt());+}++QString uuid_to_string(const QUuid& u) { return u.toString(QUuid::WithoutBraces); }++} // namespace++// ── PanelState ───────────────────────────────────────────────────────────────++QJsonObject PanelState::to_json() const {+ QJsonObject o;+ o["instance_id"] = instance_id.to_string();+ o["type_id"] = type_id;+ o["title"] = title;+ o["link_group"] = link_group;+ o["state_blob_b64"] = QString::fromLatin1(state_blob.toBase64());+ o["state_version"] = state_version;+ o["schema_version"] = schema_version;+ return o;+}++PanelState PanelState::from_json(const QJsonObject& obj) {+ PanelState s;+ s.instance_id = PanelInstanceId::from_string(obj.value("instance_id").toString());+ s.type_id = obj.value("type_id").toString();+ s.title = obj.value("title").toString();+ s.link_group = obj.value("link_group").toString();+ s.state_blob = QByteArray::fromBase64(obj.value("state_blob_b64").toString().toLatin1());+ s.state_version = obj.value("state_version").toInt();+ s.schema_version = obj.value("schema_version").toInt(kPanelStateVersion);+ return s;+}++// ── FrameLayout ──────────────────────────────────────────────────────────────++QJsonObject FrameLayout::to_json() const {+ QJsonObject o;+ o["window_id"] = window_id.to_string();+ o["name"] = name;+ QJsonArray panels_arr;+ for (const PanelState& p : panels)+ panels_arr.append(p.to_json());+ o["panels"] = panels_arr;+ o["dock_state_b64"] = QString::fromLatin1(dock_state.toBase64());+ o["active_panel"] = active_panel.to_string();+ o["focus_mode"] = focus_mode;+ o["always_on_top"] = always_on_top;+ o["schema_version"] = schema_version;+ return o;+}++FrameLayout FrameLayout::from_json(const QJsonObject& obj) {+ FrameLayout f;+ f.window_id = WindowId::from_string(obj.value("window_id").toString());+ f.name = obj.value("name").toString();+ const QJsonArray panels_arr = obj.value("panels").toArray();+ for (const QJsonValue& v : panels_arr)+ f.panels.append(PanelState::from_json(v.toObject()));+ f.dock_state = QByteArray::fromBase64(obj.value("dock_state_b64").toString().toLatin1());+ f.active_panel = PanelInstanceId::from_string(obj.value("active_panel").toString());+ f.focus_mode = obj.value("focus_mode").toBool();+ f.always_on_top = obj.value("always_on_top").toBool();+ f.schema_version = obj.value("schema_version").toInt(kFrameLayoutVersion);+ return f;+}++// ── WorkspaceVariant ─────────────────────────────────────────────────────────++QJsonObject WorkspaceVariant::to_json() const {+ QJsonObject o;+ o["topology"] = topology.to_json();++ QJsonArray geoms;+ for (auto it = frame_geometries.constBegin(); it != frame_geometries.constEnd(); ++it) {+ QJsonObject entry;+ entry["window_id"] = it.key().to_string();+ entry["rect"] = rect_to_json(it.value());+ geoms.append(entry);+ }+ o["frame_geometries"] = geoms;++ QJsonArray screens;+ for (auto it = frame_screens.constBegin(); it != frame_screens.constEnd(); ++it) {+ QJsonObject entry;+ entry["window_id"] = it.key().to_string();+ entry["screen_id"] = it.value();+ screens.append(entry);+ }+ o["frame_screens"] = screens;+ return o;+}++WorkspaceVariant WorkspaceVariant::from_json(const QJsonObject& obj) {+ WorkspaceVariant v;+ v.topology = MonitorTopologyKey::from_json(obj.value("topology"));++ const QJsonArray geoms = obj.value("frame_geometries").toArray();+ for (const QJsonValue& jv : geoms) {+ const QJsonObject entry = jv.toObject();+ const WindowId id = WindowId::from_string(entry.value("window_id").toString());+ if (id.is_null()) continue;+ v.frame_geometries.insert(id, rect_from_json(entry.value("rect").toObject()));+ }++ const QJsonArray screens = obj.value("frame_screens").toArray();+ for (const QJsonValue& jv : screens) {+ const QJsonObject entry = jv.toObject();+ const WindowId id = WindowId::from_string(entry.value("window_id").toString());+ if (id.is_null()) continue;+ v.frame_screens.insert(id, entry.value("screen_id").toString());+ }+ return v;+}++// ── Workspace ────────────────────────────────────────────────────────────────++QJsonObject Workspace::to_json() const {+ QJsonObject o;+ o["id"] = id.to_string();+ o["name"] = name;+ o["kind"] = kind;+ o["description"] = description;+ o["author"] = author;+ o["created_at"] = created_at_unix;+ o["updated_at"] = updated_at_unix;+ o["thumbnail_path"] = thumbnail_path;++ QJsonArray frames_arr;+ for (const FrameLayout& f : frames)+ frames_arr.append(f.to_json());+ o["frames"] = frames_arr;++ QJsonArray variants_arr;+ for (const WorkspaceVariant& v : variants)+ variants_arr.append(v.to_json());+ o["variants"] = variants_arr;++ QJsonArray link_arr;+ for (auto it = link_state.constBegin(); it != link_state.constEnd(); ++it) {+ QJsonObject entry;+ entry["group"] = it.key();+ entry["payload_b64"] = QString::fromLatin1(it.value().toBase64());+ link_arr.append(entry);+ }+ o["link_state"] = link_arr;++ o["schema_version"] = schema_version;+ return o;+}++Workspace Workspace::from_json(const QJsonObject& obj) {+ Workspace w;+ w.id = LayoutId::from_string(obj.value("id").toString());+ w.name = obj.value("name").toString();+ w.kind = obj.value("kind").toString("auto");+ w.description = obj.value("description").toString();+ w.author = obj.value("author").toString();+ w.created_at_unix = static_cast<qint64>(obj.value("created_at").toDouble());+ w.updated_at_unix = static_cast<qint64>(obj.value("updated_at").toDouble());+ w.thumbnail_path = obj.value("thumbnail_path").toString();++ const QJsonArray frames_arr = obj.value("frames").toArray();+ for (const QJsonValue& jv : frames_arr)+ w.frames.append(FrameLayout::from_json(jv.toObject()));++ const QJsonArray variants_arr = obj.value("variants").toArray();+ for (const QJsonValue& jv : variants_arr)+ w.variants.append(WorkspaceVariant::from_json(jv.toObject()));++ const QJsonArray link_arr = obj.value("link_state").toArray();+ for (const QJsonValue& jv : link_arr) {+ const QJsonObject entry = jv.toObject();+ const QString group = entry.value("group").toString();+ if (group.isEmpty()) continue;+ w.link_state.insert(group,+ QByteArray::fromBase64(entry.value("payload_b64").toString().toLatin1()));+ }++ w.schema_version = obj.value("schema_version").toInt(kWorkspaceVersion);+ return w;+}++const WorkspaceVariant* Workspace::find_variant_exact(const MonitorTopologyKey& key) const {+ for (const WorkspaceVariant& v : variants) {+ if (v.topology == key)+ return &v;+ }+ return nullptr;+}++} // namespace fincept::layoutdiff --git a/fincept-qt/src/core/layout/LayoutTypes.h b/fincept-qt/src/core/layout/LayoutTypes.hnew file mode 100644index 000000000..852f95123--- /dev/null+++ b/fincept-qt/src/core/layout/LayoutTypes.h@@ -0,0 +1,151 @@+#pragma once+#include "core/identity/Uuid.h"++#include <QByteArray>+#include <QHash>+#include <QJsonArray>+#include <QJsonObject>+#include <QJsonValue>+#include <QList>+#include <QRect>+#include <QString>+#include <QStringList>++namespace fincept::layout {++// ── Schema versions ──────────────────────────────────────────────────────────+//+// Each layer carries its own version. Bumping a layer's version invalidates+// only that layer; the loader runs migrations layer-by-layer rather than+// discarding the whole workspace on any change.+//+// When you bump these, add a migration in Workspace::migrate_*_from(...).+inline constexpr int kPanelStateVersion = 1;+inline constexpr int kFrameLayoutVersion = 1;+inline constexpr int kWorkspaceVersion = 1;++// ── MonitorTopologyKey ───────────────────────────────────────────────────────+//+// Stable identifier for "the set of monitors currently connected, regardless+// of which order Windows enumerated them this boot." Two physically identical+// setups produce the same key; plugging or unplugging a monitor produces a+// different key. Used by WorkspaceVariant to pick the right layout for the+// current desk vs laptop topology.+//+// Concrete format: a sorted, comma-joined list of per-monitor stable ids. See+// MonitorTopology::current_key() for the producer.+struct MonitorTopologyKey {+ QString value;++ bool is_empty() const { return value.isEmpty(); }+ bool operator==(const MonitorTopologyKey& other) const { return value == other.value; }+ bool operator!=(const MonitorTopologyKey& other) const { return value != other.value; }++ QJsonValue to_json() const { return value; }+ static MonitorTopologyKey from_json(const QJsonValue& v) { return MonitorTopologyKey{v.toString()}; }+};++inline size_t qHash(const MonitorTopologyKey& k, size_t seed = 0) noexcept {+ return qHash(k.value, seed);+}++// ── PanelState ───────────────────────────────────────────────────────────────+//+// The serialised form of one panel inside a frame. The state_blob is what+// IStatefulScreen::save_state() returned, opaque to the layout layer — only+// the panel itself knows how to restore it.+//+// Phase 0 ships the type only; persistence is wired up in Phase 4 (UUID+// keying) and Phase 6 (the workspace pipeline).+struct PanelState {+ PanelInstanceId instance_id; ///< Stable UUID owned by PanelHandle.+ QString type_id; ///< e.g. "watchlist", "crypto_trading".+ QString title; ///< User-renameable display title.+ QString link_group; ///< Empty = unlinked. e.g. "red", "green".+ QByteArray state_blob; ///< Opaque IStatefulScreen state (CBOR/JSON).+ int state_version = 0; ///< IStatefulScreen::state_version() at save time.+ int schema_version = kPanelStateVersion;++ QJsonObject to_json() const;+ static PanelState from_json(const QJsonObject& obj);+};++// ── FrameLayout ──────────────────────────────────────────────────────────────+//+// One frame's worth of layout: which panels exist, the ADS dock state, the+// frame's chrome flags (focus mode, always-on-top), and the active tab.+//+// The dock_state blob is `CDockManager::saveState()` output. Treated opaquely+// by this layer; ADS owns the format. We bump frame_layout schema version+// only when we change *our* surrounding fields, not when ADS changes its+// internal format (that's handled by the existing kDockLayoutVersion).+struct FrameLayout {+ WindowId window_id;+ QString name; ///< Optional user label ("Risk", "Macro").+ QList<PanelState> panels;+ QByteArray dock_state; ///< ADS CDockManager::saveState().+ PanelInstanceId active_panel; ///< Which tab/area is focused.+ bool focus_mode = false;+ bool always_on_top = false;+ int schema_version = kFrameLayoutVersion;++ QJsonObject to_json() const;+ static FrameLayout from_json(const QJsonObject& obj);+};++// ── WorkspaceVariant ─────────────────────────────────────────────────────────+//+// One topology-specific arrangement. A user with a 3-monitor desk + a laptop+// stores two variants of "Morning" — the matcher picks the right one at load+// time based on the currently-connected monitors.+//+// Frame geometries live here, not in FrameLayout, because two variants share+// the same frame *contents* but differ in *placement*.+struct WorkspaceVariant {+ MonitorTopologyKey topology;+ QHash<WindowId, QRect> frame_geometries; ///< Position/size per frame.+ QHash<WindowId, QString> frame_screens; ///< StableScreenId per frame.++ QJsonObject to_json() const;+ static WorkspaceVariant from_json(const QJsonObject& obj);+};++// ── Workspace ────────────────────────────────────────────────────────────────+//+// The top-level layout object. One workspace = N frames + their panels + a+// list of topology variants for placement.+//+// Workspace `kind`:+// "auto" — the live, continuously-saved current state.+// "user" — saved by the user, named, immutable until overwritten.+// "builtin" — first-run default templates (Equity, FX, Quant).+// "crash_recovery"— a snapshot saved by the crash-recovery ring.+struct Workspace {+ LayoutId id;+ QString name;+ QString kind = "auto";+ QString description;+ QString author; ///< For shared/exported layouts.+ qint64 created_at_unix = 0;+ qint64 updated_at_unix = 0;+ QString thumbnail_path; ///< Relative to layouts/ dir.++ QList<FrameLayout> frames;+ QList<WorkspaceVariant> variants; ///< One per saved monitor topology.++ /// Per-link-group last context. Restored on workspace load so AAPL stays+ /// red after a restart. Stored opaquely; LinkManager owns the schema.+ QHash<QString, QByteArray> link_state;++ int schema_version = kWorkspaceVersion;++ QJsonObject to_json() const;+ static Workspace from_json(const QJsonObject& obj);++ /// Find the variant whose topology matches `key` exactly. nullptr if none.+ /// The matcher (Phase 6) walks variants for nearest match when no exact+ /// hit; this method is the cheap exact-match fast path.+ const WorkspaceVariant* find_variant_exact(const MonitorTopologyKey& key) const;+};++} // namespace fincept::layoutdiff --git a/fincept-qt/src/core/layout/WorkspaceMatcher.cpp b/fincept-qt/src/core/layout/WorkspaceMatcher.cppnew file mode 100644index 000000000..11db3b9d5--- /dev/null+++ b/fincept-qt/src/core/layout/WorkspaceMatcher.cpp@@ -0,0 +1,49 @@+#include "core/layout/WorkspaceMatcher.h"++#include "core/logging/Logger.h"++#include <QString>+#include <cstdlib>++namespace fincept::layout {++int WorkspaceMatcher::monitor_count(const MonitorTopologyKey& key) {+ if (key.value.isEmpty())+ return 0;+ // Topology key format: comma-joined sorted monitor stable ids+ // (per MonitorTopology::current_key). Count = comma count + 1.+ return key.value.count(QChar(',')) + 1;+}++const WorkspaceVariant* WorkspaceMatcher::match(const Workspace& workspace,+ const MonitorTopologyKey& current_topology) {+ if (workspace.variants.isEmpty())+ return nullptr;++ // Tier 1: exact match.+ if (const auto* exact = workspace.find_variant_exact(current_topology))+ return exact;++ // Tier 2: nearest by monitor count.+ const int target_count = monitor_count(current_topology);+ const WorkspaceVariant* best = nullptr;+ int best_delta = INT32_MAX;+ for (const auto& v : workspace.variants) {+ const int v_count = monitor_count(v.topology);+ const int delta = std::abs(v_count - target_count);+ // Strictly less so ties resolve to the *first* variant the user+ // saved — list order in the JSON is preserved at load time.+ if (delta < best_delta) {+ best = &v;+ best_delta = delta;+ }+ }+ if (best) {+ LOG_INFO("WorkspaceMatcher",+ QString("No exact topology match — falling back to '%1' (delta=%2)")+ .arg(best->topology.value).arg(best_delta));+ }+ return best;+}++} // namespace fincept::layoutdiff --git a/fincept-qt/src/core/layout/WorkspaceMatcher.h b/fincept-qt/src/core/layout/WorkspaceMatcher.hnew file mode 100644index 000000000..b65cec186--- /dev/null+++ b/fincept-qt/src/core/layout/WorkspaceMatcher.h@@ -0,0 +1,32 @@+#pragma once+#include "core/layout/LayoutTypes.h"++namespace fincept::layout {++/// Phase 6: matches a current monitor topology to the best `WorkspaceVariant`+/// inside a Workspace. Implements decision 4.5 (per-topology variants).+///+/// Algorithm:+/// 1. Exact topology key match → return that variant.+/// 2. Otherwise, return the variant with the closest monitor count+/// (ties broken by recency = list order, latest-defined wins).+/// 3. If the workspace has no variants at all, return nullptr — caller+/// falls back to hard-bind via SessionManager (Phase 1 behaviour).+///+/// Pure function — no Qt connections, no state. Easy to unit-test.+class WorkspaceMatcher {+ public:+ /// Walk `workspace.variants` and return the best match, or nullptr+ /// if no variant is suitable. The returned pointer aliases into the+ /// workspace argument; do not store across mutations.+ static const WorkspaceVariant* match(const Workspace& workspace,+ const MonitorTopologyKey& current_topology);++ /// How many monitors the topology key represents — counts comma-+ /// separated entries. Used by the matcher's tier-2 nearest-by-count+ /// step but exposed publicly for UI surfaces ("Saved variant for+ /// 3-monitor layout") and tests.+ static int monitor_count(const MonitorTopologyKey& key);+};++} // namespace fincept::layoutdiff --git a/fincept-qt/src/core/layout/WorkspaceShell.cpp b/fincept-qt/src/core/layout/WorkspaceShell.cppnew file mode 100644index 000000000..fbdc488df--- /dev/null+++ b/fincept-qt/src/core/layout/WorkspaceShell.cpp@@ -0,0 +1,137 @@+#include "core/layout/WorkspaceShell.h"++#include "app/WindowFrame.h"+#include "core/identity/Uuid.h"+#include "core/layout/WorkspaceMatcher.h"+#include "core/logging/Logger.h"+#include "core/screen/MonitorTopology.h"+#include "core/window/WindowRegistry.h"++#include <QApplication>+#include <QDateTime>++namespace fincept::layout {++namespace {+constexpr const char* kShellTag = "WorkspaceShell";+} // namespace++Workspace WorkspaceShell::capture(const QString& name, const QString& kind,+ const Workspace* previous) {+ Workspace w;+ if (previous) {+ // Preserve identity + variant history. Caller's intent: "save the+ // current state as a new variant of this workspace."+ w.id = previous->id;+ w.created_at_unix = previous->created_at_unix;+ w.variants = previous->variants;+ w.author = previous->author;+ w.description = previous->description;+ w.thumbnail_path = previous->thumbnail_path;+ } else {+ w.id = LayoutId::generate();+ w.created_at_unix = QDateTime::currentSecsSinceEpoch();+ }+ w.name = name;+ w.kind = kind;+ w.updated_at_unix = QDateTime::currentSecsSinceEpoch();+ w.schema_version = kWorkspaceVersion;++ // Capture each frame's layout.+ const auto frames = fincept::WindowRegistry::instance().frames();+ for (auto* frame : frames) {+ if (!frame) continue;+ FrameLayout fl = frame->capture_layout();+ w.frames.append(fl);+ }++ // Capture / update the topology variant for the current monitor set.+ const MonitorTopologyKey current = fincept::MonitorTopology::current_key();+ WorkspaceVariant variant;+ variant.topology = current;+ for (auto* frame : frames) {+ if (!frame) continue;+ const WindowId id = frame->frame_uuid();+ variant.frame_geometries.insert(id, frame->geometry());+ if (auto* scr = frame->screen())+ variant.frame_screens.insert(id, fincept::MonitorTopology::stable_id(scr));+ }++ // Replace any existing variant for this exact topology, else append.+ bool replaced = false;+ for (int i = 0; i < w.variants.size(); ++i) {+ if (w.variants[i].topology == current) {+ w.variants[i] = variant;+ replaced = true;+ break;+ }+ }+ if (!replaced)+ w.variants.append(variant);++ LOG_INFO(kShellTag,+ QString("capture: '%1' (uuid=%2) → %3 frames, %4 variants, topology=%5")+ .arg(name, w.id.to_string()).arg(w.frames.size()).arg(w.variants.size()).arg(current.value));+ return w;+}++int WorkspaceShell::apply(const Workspace& workspace) {+ if (workspace.frames.isEmpty()) {+ LOG_INFO(kShellTag, QString("apply: workspace '%1' has no frames — nothing to do").arg(workspace.name));+ return 0;+ }++ // Match the workspace's variants against the current topology to pick+ // the best frame geometry set. Falls back to nullptr if no variant+ // matches; we then apply layouts without geometry hints (frames keep+ // their current size/position).+ const MonitorTopologyKey current = fincept::MonitorTopology::current_key();+ const WorkspaceVariant* variant = WorkspaceMatcher::match(workspace, current);++ LOG_INFO(kShellTag,+ QString("apply: '%1' (uuid=%2) → %3 frames; matched variant: %4")+ .arg(workspace.name, workspace.id.to_string()).arg(workspace.frames.size())+ .arg(variant ? variant->topology.value : QStringLiteral("(none)")));++ int applied = 0;+ auto frames_now = fincept::WindowRegistry::instance().frames();++ for (const auto& fl : workspace.frames) {+ // Find an existing frame matching this window_id; else spawn new.+ fincept::WindowFrame* target = nullptr;+ for (auto* f : frames_now) {+ if (f && f->frame_uuid() == fl.window_id) {+ target = f;+ break;+ }+ }+ if (!target) {+ // Spawn a fresh frame. The constructor's frame_uuid_ is+ // freshly generated; we can't easily override it because+ // WindowId is process-stable per construction. Instead, reuse+ // an unused existing frame if available; else create a new one.+ // For v1 we accept that the new frame's UUID differs from the+ // saved one — the FrameLayout's panel UUIDs are what really+ // matter for state restoration.+ target = new fincept::WindowFrame(fincept::WindowFrame::next_window_id());+ target->setAttribute(Qt::WA_DeleteOnClose);+ target->show();+ frames_now.append(target);+ }++ // Apply geometry from the matched variant (if any).+ if (variant) {+ const auto geo_it = variant->frame_geometries.constFind(fl.window_id);+ if (geo_it != variant->frame_geometries.constEnd())+ target->setGeometry(geo_it.value());+ }++ if (target->apply_layout(fl))+ ++applied;+ }++ LOG_INFO(kShellTag, QString("apply: %1/%2 frames restored cleanly").arg(applied).arg(workspace.frames.size()));+ return applied;+}++} // namespace fincept::layoutdiff --git a/fincept-qt/src/core/layout/WorkspaceShell.h b/fincept-qt/src/core/layout/WorkspaceShell.hnew file mode 100644index 000000000..de327d8db--- /dev/null+++ b/fincept-qt/src/core/layout/WorkspaceShell.h@@ -0,0 +1,45 @@+#pragma once+#include "core/layout/LayoutTypes.h"++namespace fincept::layout {++/// Phase 6 final: shell-level Workspace capture/apply helpers.+///+/// These walk `WindowRegistry` (every live `WindowFrame`) and either+/// gather their `FrameLayout`s into a `Workspace`, or take a saved+/// `Workspace` and apply each of its FrameLayouts to existing or+/// freshly-spawned frames.+///+/// `capture` also captures the current monitor topology and stores+/// per-frame geometry into a `WorkspaceVariant`, so the workspace+/// becomes self-contained for the desk-vs-laptop variant matcher+/// (decision 4.5).+///+/// `apply` consults `WorkspaceMatcher::match` to pick the variant that+/// best fits the current monitor topology, then applies frame+/// geometries from that variant after each frame's `apply_layout`+/// finishes restoring its dock contents.+class WorkspaceShell {+ public:+ /// Capture the current shell state into a `Workspace`. The returned+ /// Workspace gets a fresh UUID + updated_at timestamp and a+ /// `WorkspaceVariant` for the current monitor topology.+ ///+ /// `name` and `kind` populate the Workspace metadata. If `previous`+ /// is provided, its UUID + variants list are preserved (so adding+ /// a new variant for a different monitor topology doesn't lose the+ /// existing variants).+ static Workspace capture(const QString& name, const QString& kind = "user",+ const Workspace* previous = nullptr);++ /// Apply a saved Workspace to the current shell. Walks the workspace's+ /// frames, reuses existing frames where window UUIDs match, spawns+ /// new frames otherwise. Each frame's apply_layout restores dock+ /// contents. The matched WorkspaceVariant (via WorkspaceMatcher)+ /// supplies frame geometries.+ ///+ /// Returns the number of frames successfully applied.+ static int apply(const Workspace& workspace);+};++} // namespace fincept::layoutdiff --git a/fincept-qt/src/core/logging/LogTags.h b/fincept-qt/src/core/logging/LogTags.hindex 31b98ab97..8f374f8c9 100644--- a/fincept-qt/src/core/logging/LogTags.h+++ b/fincept-qt/src/core/logging/LogTags.h@@ -21,7 +21,8 @@ inline constexpr const char* kHttp = "HTTP";inline constexpr const char* kWebSocket = "WebSocket";inline constexpr const char* kPython = "Python";inline constexpr const char* kTheme = "ThemeManager";-inline constexpr const char* kMainWindow = "MainWindow";+inline constexpr const char* kMainWindow = "WindowFrame"; // legacy name kept as kMainWindow for one release; new code can use kWindowFrame+inline constexpr const char* kWindowFrame = "WindowFrame";inline constexpr const char* kRouter = "ScreenRouter";inline constexpr const char* kMarketData = "MarketData";inline constexpr const char* kNews = "News";diff --git a/fincept-qt/src/core/panel/PanelHandle.cpp b/fincept-qt/src/core/panel/PanelHandle.cppnew file mode 100644index 000000000..df61d0aca--- /dev/null+++ b/fincept-qt/src/core/panel/PanelHandle.cpp@@ -0,0 +1,61 @@+#include "core/panel/PanelHandle.h"++#include <DockWidget.h>++namespace fincept {++PanelHandle::PanelHandle(PanelInstanceId instance_id,+ QString type_id,+ QString title,+ WindowId frame_id,+ QObject* parent)+ : QObject(parent),+ instance_id_(instance_id),+ type_id_(std::move(type_id)),+ title_(std::move(title)),+ frame_id_(frame_id) {}++void PanelHandle::set_title(const QString& t) {+ if (title_ == t) return;+ title_ = t;+ emit title_changed(t);+}++void PanelHandle::set_frame_id(WindowId id) {+ if (frame_id_ == id) return;+ frame_id_ = id;+ emit frame_id_changed(id);+}++void PanelHandle::set_link_group(const QString& g) {+ if (link_group_ == g) return;+ link_group_ = g;+ emit link_group_changed(g);+}++void PanelHandle::set_state(State s) {+ if (state_ == s) return;+ state_ = s;+ emit state_changed(s);+}++void PanelHandle::set_dock_widget(ads::CDockWidget* dw) {+ dock_widget_ = dw;+}++void PanelHandle::set_state_blob(const QByteArray& blob, int version) {+ last_state_blob_ = blob;+ last_state_version_ = version;+}++void PanelHandle::record_render_time_ms(int ms) {+ // Append; trim head when over limit. Vector is small (<= kRenderSampleLimit)+ // so the front-erase O(n) cost is dominated by the cache-friendly contiguous+ // layout. A circular buffer would be marginally faster but adds API surface+ // we don't need this phase.+ render_time_samples_ms_.append(ms);+ while (render_time_samples_ms_.size() > kRenderSampleLimit)+ render_time_samples_ms_.removeFirst();+}++} // namespace finceptdiff --git a/fincept-qt/src/core/panel/PanelHandle.h b/fincept-qt/src/core/panel/PanelHandle.hnew file mode 100644index 000000000..11028f981--- /dev/null+++ b/fincept-qt/src/core/panel/PanelHandle.h@@ -0,0 +1,117 @@+#pragma once+#include "core/identity/Uuid.h"++#include <QObject>+#include <QPointer>+#include <QString>+#include <QVector>++namespace ads {+class CDockWidget;+}++namespace fincept {++class WindowFrame;++/// Shell-side representation of a single panel (a screen instance docked+/// into some `WindowFrame`).+///+/// The handle exists whether or not the panel's widget is actually+/// materialised on screen. That distinction matters at scale: a layout with+/// 200 panels keeps 200 handles in `PanelRegistry` cheaply, but only the+/// visible ones own live `CDockWidget` + screen `QWidget` instances. When+/// a panel becomes visible (`State::Active`) the handle gains a non-null+/// `dock_widget()`; when it's dematerialised it returns to `State::Suspended`+/// and the dock pointer goes back to null.+///+/// State machine (decisions 1.8 + 2.7):+///+/// Spawning — handle just registered; no widget yet.+/// Materialising — widget under construction (factory running).+/// Active — widget alive, dock widget added to a frame's manager.+/// Suspended — widget dematerialised, state_blob preserved.+/// Closing — close request in flight; flushing pending state.+/// Closed — terminal state; handle about to be unregistered.+///+/// Phase 4 ships the handle and the registry. Phase 5 (tear-off) and+/// Phase 7 (linking) consume them. Phase 8 wires the dematerialisation+/// budget that drives Suspended ↔ Active transitions.+class PanelHandle : public QObject {+ Q_OBJECT+ public:+ enum class State {+ Spawning,+ Materialising,+ Active,+ Suspended,+ Closing,+ Closed,+ };+ Q_ENUM(State)++ PanelHandle(PanelInstanceId instance_id,+ QString type_id,+ QString title,+ WindowId frame_id,+ QObject* parent = nullptr);++ PanelInstanceId instance_id() const { return instance_id_; }+ const QString& type_id() const { return type_id_; }+ const QString& title() const { return title_; }+ WindowId frame_id() const { return frame_id_; }+ State state() const { return state_; }++ /// Optional user-visible link group ("red", "green", ... or "" = unlinked).+ /// Phase 7 (LinkManager) will mutate this; Phase 4 just stores it.+ const QString& link_group() const { return link_group_; }++ /// Last serialised IStatefulScreen state blob. Preserved across the+ /// Suspended ↔ Active transition so re-materialisation restores filters,+ /// scroll, sub-panel state without round-tripping the cache db.+ const QByteArray& last_state_blob() const { return last_state_blob_; }+ int last_state_version() const { return last_state_version_; }++ /// Live dock widget pointer, or nullptr while Suspended/Closed.+ ads::CDockWidget* dock_widget() const { return dock_widget_.data(); }++ /// Render-time samples (most-recent first). Phase 8 surfaces these in+ /// the debug overlay; Phase 4 stores them so the pipeline is in place.+ const QVector<int>& render_time_samples_ms() const { return render_time_samples_ms_; }++ // ── Setters (called by PanelRegistry / the router) ─────────────────────++ void set_title(const QString& t);+ void set_frame_id(WindowId id);+ void set_link_group(const QString& g);+ void set_state(State s);+ void set_dock_widget(ads::CDockWidget* dw);+ void set_state_blob(const QByteArray& blob, int version);++ /// Push a render-time sample. Caps the buffer at `kRenderSampleLimit`.+ void record_render_time_ms(int ms);+ static constexpr int kRenderSampleLimit = 64;++ signals:+ void title_changed(const QString& title);+ void frame_id_changed(WindowId id);+ void link_group_changed(const QString& group);+ void state_changed(PanelHandle::State new_state);++ private:+ PanelInstanceId instance_id_;+ QString type_id_;+ QString title_;+ WindowId frame_id_;+ QString link_group_;++ State state_ = State::Spawning;+ QPointer<ads::CDockWidget> dock_widget_;++ QByteArray last_state_blob_;+ int last_state_version_ = 0;++ QVector<int> render_time_samples_ms_;+};++} // namespace finceptdiff --git a/fincept-qt/src/core/panel/PanelMaterialiser.cpp b/fincept-qt/src/core/panel/PanelMaterialiser.cppnew file mode 100644index 000000000..984fdf397--- /dev/null+++ b/fincept-qt/src/core/panel/PanelMaterialiser.cpp@@ -0,0 +1,91 @@+#include "core/panel/PanelMaterialiser.h"++#include "core/logging/Logger.h"++namespace fincept {++namespace {+constexpr const char* kMatTag = "PanelMaterialiser";+} // namespace++PanelMaterialiser& PanelMaterialiser::instance() {+ static PanelMaterialiser s;+ return s;+}++PanelMaterialiser::PanelMaterialiser() {+ tick_timer_.setSingleShot(false);+ tick_timer_.setInterval(kDefaultTickIntervalMs);+ connect(&tick_timer_, &QTimer::timeout, this, &PanelMaterialiser::tick);+}++void PanelMaterialiser::enqueue(const QString& id, std::function<void()> work, int priority) {+ if (!work)+ return;+ Item item{id, std::move(work)};+ switch (priority) {+ case 0: q_priority_0_.enqueue(std::move(item)); break;+ case 1: q_priority_1_.enqueue(std::move(item)); break;+ default: q_priority_2_.enqueue(std::move(item)); break;+ }+ if (!tick_timer_.isActive())+ tick_timer_.start();+}++void PanelMaterialiser::drain_all_now() {+ auto run_all = [](QQueue<Item>& q) {+ while (!q.isEmpty()) {+ Item it = q.dequeue();+ if (it.work) it.work();+ }+ };+ run_all(q_priority_0_);+ run_all(q_priority_1_);+ run_all(q_priority_2_);+ tick_timer_.stop();+ emit queue_drained();+}++int PanelMaterialiser::pending_count() const {+ return q_priority_0_.size() + q_priority_1_.size() + q_priority_2_.size();+}++void PanelMaterialiser::set_tick_interval_ms(int ms) {+ if (ms < 1) ms = 1;+ tick_timer_.setInterval(ms);+}++void PanelMaterialiser::set_max_per_tick(int n) {+ if (n < 1) n = 1;+ max_per_tick_ = n;+}++void PanelMaterialiser::tick() {+ int budget = max_per_tick_;++ // Drain priority 0 first — foreground tabs are what the user actually+ // sees, so spending the entire tick on them is fine.+ while (budget > 0 && !q_priority_0_.isEmpty()) {+ Item it = q_priority_0_.dequeue();+ if (it.work) it.work();+ --budget;+ }+ while (budget > 0 && !q_priority_1_.isEmpty()) {+ Item it = q_priority_1_.dequeue();+ if (it.work) it.work();+ --budget;+ }+ while (budget > 0 && !q_priority_2_.isEmpty()) {+ Item it = q_priority_2_.dequeue();+ if (it.work) it.work();+ --budget;+ }++ if (pending_count() == 0) {+ tick_timer_.stop();+ LOG_DEBUG(kMatTag, "Queue drained");+ emit queue_drained();+ }+}++} // namespace finceptdiff --git a/fincept-qt/src/core/panel/PanelMaterialiser.h b/fincept-qt/src/core/panel/PanelMaterialiser.hnew file mode 100644index 000000000..f95a18d21--- /dev/null+++ b/fincept-qt/src/core/panel/PanelMaterialiser.h@@ -0,0 +1,91 @@+#pragma once++#include <QObject>+#include <QQueue>+#include <QString>+#include <QTimer>+#include <functional>++namespace fincept {++/// Phase 8 / decision 9.3: staged panel-widget construction.+///+/// On layout load with many panels (50+ panels in a Bloomberg-style+/// workspace), materialising every panel's screen widget synchronously+/// freezes the UI for several seconds. This class spreads construction+/// across UI ticks so the user sees the foreground tab of each visible+/// frame appear immediately, then the rest fill in over the next ~200ms+/// without blocking.+///+/// Usage:+/// ```+/// PanelMaterialiser::instance().enqueue("watchlist",+/// [](){ DockScreenRouter::navigate("watchlist"); }, /*priority=*/0);+/// ```+///+/// Priorities (lower number = higher priority — runs sooner):+/// 0 — foreground tab on a visible frame (drained immediately)+/// 1 — non-foreground tabs on visible frames+/// 2 — anything on hidden / minimised frames+///+/// Each tick the materialiser drains up to `kMaxPerTick` items, picking+/// from the highest-priority bucket first.+///+/// Threading: UI-thread only (we're calling into Qt widgets directly).+class PanelMaterialiser : public QObject {+ Q_OBJECT+ public:+ static PanelMaterialiser& instance();++ /// Construction work to run later. The id is for logging/dedup;+ /// the lambda is the actual constructor invocation (typically a call+ /// into DockScreenRouter::navigate or materialize_screen).+ void enqueue(const QString& id, std::function<void()> work, int priority = 1);++ /// Drain everything synchronously. Used by tests + by tear-off paths+ /// that need a panel up *now*. Avoid on the UI thread during normal+ /// operation — the whole point of this class is to NOT block.+ void drain_all_now();++ /// Number of items still queued. Inspectable from the debug overlay.+ int pending_count() const;++ /// Interval between materialisation ticks. Default 16ms (~60fps frame+ /// budget). Tunable for tests.+ void set_tick_interval_ms(int ms);++ /// How many items to drain per tick. Default 4. Lower = smoother UI+ /// during a layout load, higher = layout finishes faster.+ void set_max_per_tick(int n);++ /// Default max-per-tick. 4 keeps layout-load under ~16ms per frame+ /// budget on the panel constructors that take 2-4ms each (the typical+ /// case once factories are warm).+ static constexpr int kDefaultMaxPerTick = 4;+ static constexpr int kDefaultTickIntervalMs = 16;++ signals:+ /// Fires after every drain — useful for the debug overlay's pending+ /// count and for tests that want to wait until the queue is empty.+ void queue_drained();++ private:+ PanelMaterialiser();++ void tick();++ struct Item {+ QString id;+ std::function<void()> work;+ };++ // Three priority buckets. Drained in 0 → 1 → 2 order each tick.+ QQueue<Item> q_priority_0_;+ QQueue<Item> q_priority_1_;+ QQueue<Item> q_priority_2_;++ QTimer tick_timer_;+ int max_per_tick_ = kDefaultMaxPerTick;+};++} // namespace finceptdiff --git a/fincept-qt/src/core/panel/PanelRegistry.cpp b/fincept-qt/src/core/panel/PanelRegistry.cppnew file mode 100644index 000000000..4e4f72e53--- /dev/null+++ b/fincept-qt/src/core/panel/PanelRegistry.cpp@@ -0,0 +1,136 @@+#include "core/panel/PanelRegistry.h"++#include "core/logging/Logger.h"+#include "core/panel/PanelHandle.h"++namespace fincept {++namespace {+constexpr const char* kPanelRegistryTag = "PanelRegistry";+} // namespace++PanelRegistry& PanelRegistry::instance() {+ static PanelRegistry s;+ return s;+}++PanelHandle* PanelRegistry::register_panel(PanelHandle* handle) {+ if (!handle) {+ LOG_WARN(kPanelRegistryTag, "register_panel called with null handle");+ return nullptr;+ }+ const PanelInstanceId id = handle->instance_id();+ if (id.is_null()) {+ LOG_WARN(kPanelRegistryTag, "register_panel called with null instance_id");+ return nullptr;+ }++ const bool replacing = by_id_.contains(id);+ if (replacing) {+ // Tear down the old entry first so signal connections don't double-fire.+ PanelHandle* old = by_id_.value(id);+ if (old && old != handle)+ old->deleteLater();+ } else {+ insertion_order_.append(id);+ }++ handle->setParent(this);+ by_id_.insert(id, handle);+ wire_handle_signals(handle);++ if (replacing) {+ LOG_DEBUG(kPanelRegistryTag, QString("Replaced panel: %1 (%2)")+ .arg(id.to_string(), handle->type_id()));+ emit panel_replaced(id);+ } else {+ LOG_DEBUG(kPanelRegistryTag, QString("Registered panel: %1 (%2)")+ .arg(id.to_string(), handle->type_id()));+ emit panel_added(id);+ }+ return handle;+}++void PanelRegistry::unregister_panel(PanelInstanceId id) {+ auto it = by_id_.constFind(id);+ if (it == by_id_.constEnd())+ return;+ PanelHandle* handle = it.value();+ by_id_.erase(it);+ insertion_order_.removeAll(id);+ LOG_DEBUG(kPanelRegistryTag, QString("Unregistered panel: %1").arg(id.to_string()));+ emit panel_removed(id);+ if (handle)+ handle->deleteLater();+}++PanelHandle* PanelRegistry::find(PanelInstanceId id) const {+ return by_id_.value(id, nullptr);+}++QList<PanelHandle*> PanelRegistry::all_panels() const {+ QList<PanelHandle*> out;+ out.reserve(insertion_order_.size());+ for (const PanelInstanceId& id : insertion_order_) {+ if (PanelHandle* h = by_id_.value(id, nullptr))+ out.append(h);+ }+ return out;+}++QList<PanelHandle*> PanelRegistry::find_by_type(const QString& type_id) const {+ QList<PanelHandle*> out;+ for (const PanelInstanceId& id : insertion_order_) {+ PanelHandle* h = by_id_.value(id, nullptr);+ if (h && h->type_id() == type_id)+ out.append(h);+ }+ return out;+}++QList<PanelHandle*> PanelRegistry::find_by_frame(WindowId frame_id) const {+ QList<PanelHandle*> out;+ for (const PanelInstanceId& id : insertion_order_) {+ PanelHandle* h = by_id_.value(id, nullptr);+ if (h && h->frame_id() == frame_id)+ out.append(h);+ }+ return out;+}++QList<PanelHandle*> PanelRegistry::find_by_group(const QString& link_group) const {+ QList<PanelHandle*> out;+ for (const PanelInstanceId& id : insertion_order_) {+ PanelHandle* h = by_id_.value(id, nullptr);+ if (h && h->link_group() == link_group)+ out.append(h);+ }+ return out;+}++int PanelRegistry::size() const {+ return by_id_.size();+}++void PanelRegistry::wire_handle_signals(PanelHandle* handle) {+ // The registry doesn't maintain per-attribute index lists today —+ // find_by_* methods walk the insertion order each call. At expected+ // panel counts (≤200) this is faster than maintaining index hashes+ // because the working set fits in cache and the bulk consumers+ // (linking, palette) need ordered output anyway.+ //+ // We still re-emit a coarse `panel_metadata_changed` so consumers like+ // the status bar can refresh their summary without subscribing to+ // every PanelHandle individually.+ const PanelInstanceId id = handle->instance_id();+ connect(handle, &PanelHandle::title_changed, this,+ [this, id](const QString&) { emit panel_metadata_changed(id); });+ connect(handle, &PanelHandle::frame_id_changed, this,+ [this, id](WindowId) { emit panel_metadata_changed(id); });+ connect(handle, &PanelHandle::link_group_changed, this,+ [this, id](const QString&) { emit panel_metadata_changed(id); });+ connect(handle, &PanelHandle::state_changed, this,+ [this, id](PanelHandle::State) { emit panel_metadata_changed(id); });+}++} // namespace finceptdiff --git a/fincept-qt/src/core/panel/PanelRegistry.h b/fincept-qt/src/core/panel/PanelRegistry.hnew file mode 100644index 000000000..957d7eaf9--- /dev/null+++ b/fincept-qt/src/core/panel/PanelRegistry.h@@ -0,0 +1,89 @@+#pragma once+#include "core/identity/Uuid.h"++#include <QHash>+#include <QList>+#include <QObject>+#include <QString>++namespace fincept {++class PanelHandle;+class WindowFrame;++/// Process-singleton registry of every `PanelHandle` in the shell.+///+/// Indexed by:+/// - instance UUID (primary key, every lookup goes through this)+/// - type id (e.g. "watchlist") — find_by_type+/// - frame id (the WindowFrame the panel currently lives in) — find_by_frame+/// - link group ("red", "green", ...) — find_by_group+///+/// Indices are maintained on register / unregister / set_frame_id /+/// set_link_group / set_type_id. The handles emit signals on each mutation;+/// the registry connects to them at registration time and updates the+/// per-attribute index lists.+///+/// Phase 4 ships the registry. Consumers landing later:+/// - Phase 5 (tear-off): re-parents handles between frames.+/// - Phase 7 (linking): walks find_by_group on every LinkManager publish.+/// - Phase 8 (lifecycle): drives Suspended ↔ Active state transitions.+///+/// Threading: UI-thread only. Same constraint as WindowRegistry.+class PanelRegistry : public QObject {+ Q_OBJECT+ public:+ static PanelRegistry& instance();++ /// Take ownership of a handle (the registry parents it). Returns the+ /// pointer back for caller convenience. Idempotent on `instance_id` —+ /// repeat registration replaces the existing entry and emits+ /// `panel_replaced(id)`.+ PanelHandle* register_panel(PanelHandle* handle);++ /// Detach + delete the handle. Emits `panel_removed` before destroying.+ /// No-op if the id isn't registered.+ void unregister_panel(PanelInstanceId id);++ /// Lookup. Returns nullptr if not registered. Pointer remains valid+ /// until unregister_panel(id) for that id.+ PanelHandle* find(PanelInstanceId id) const;++ /// All registered handles in insertion order.+ QList<PanelHandle*> all_panels() const;++ /// Filtered views. Each returns a fresh QList of currently-matching+ /// handles, sorted by insertion order.+ QList<PanelHandle*> find_by_type(const QString& type_id) const;+ QList<PanelHandle*> find_by_frame(WindowId frame_id) const;+ QList<PanelHandle*> find_by_group(const QString& link_group) const;++ int size() const;++ signals:+ void panel_added(PanelInstanceId id);+ void panel_replaced(PanelInstanceId id);+ void panel_removed(PanelInstanceId id);++ /// Coarse signal fired whenever any indexed attribute changes+ /// (frame, group, type). Subscribers that care about specific+ /// attribute changes connect directly to PanelHandle's per-attribute+ /// signals; this is for bulk consumers (status bar, palette).+ void panel_metadata_changed(PanelInstanceId id);++ private:+ PanelRegistry() = default;++ /// Connect a handle's per-attribute signals so the registry's indices+ /// stay coherent. Called from register_panel.+ void wire_handle_signals(PanelHandle* handle);++ /// Primary store: instance_id → handle. Owns lifetime via QObject+ /// parenting (registry is the parent).+ QHash<PanelInstanceId, PanelHandle*> by_id_;++ /// Insertion order, for stable iteration in all_panels().+ QList<PanelInstanceId> insertion_order_;+};++} // namespace finceptdiff --git a/fincept-qt/src/core/profile/ProfilePaths.cpp b/fincept-qt/src/core/profile/ProfilePaths.cppnew file mode 100644index 000000000..b17a3bdd3--- /dev/null+++ b/fincept-qt/src/core/profile/ProfilePaths.cpp@@ -0,0 +1,65 @@+#include "core/profile/ProfilePaths.h"++#include "core/config/ProfileManager.h"+#include "core/identity/Uuid.h"+#include "core/logging/Logger.h"++#include <QDir>+#include <QFileInfo>++namespace fincept {++QString ProfilePaths::profile_root() {+ return ProfileManager::instance().profile_root();+}++QString ProfilePaths::workspace_db() {+ return profile_root() + "/workspace.db";+}++QString ProfilePaths::layouts_dir() {+ return profile_root() + "/layouts";+}++QString ProfilePaths::layouts_index_db() {+ return layouts_dir() + "/_index.db";+}++QString ProfilePaths::panel_cache_db() {+ return profile_root() + "/cache.db";+}++QString ProfilePaths::crashes_dir() {+ return profile_root() + "/crashes";+}++void ProfilePaths::ensure_all() {+ const QString root = profile_root();+ if (root.isEmpty()) {+ LOG_ERROR("ProfilePaths",+ "ensure_all() called before ProfileManager::set_active() — skipping");+ return;+ }++ // Mirror AppPaths::ensure_all() failure-reporting pattern: try mkpath,+ // log diagnostics on failure rather than throwing.+ const auto try_mkpath = [](const QString& p) {+ if (QDir().mkpath(p))+ return;+ const QFileInfo info(p);+ LOG_WARN("ProfilePaths",+ QString("mkpath failed: %1 exists=%2 isDir=%3 writable=%4")+ .arg(p).arg(info.exists()).arg(info.isDir()).arg(info.isWritable()));+ };++ try_mkpath(layouts_dir());+ try_mkpath(crashes_dir());+ // workspace.db / cache.db / layouts_index.db are files — created by their+ // respective stores on first open. Don't pre-create.+}++ProfileId ProfilePaths::active_profile_id() {+ return ProfileManager::instance().active_profile_id();+}++} // namespace finceptdiff --git a/fincept-qt/src/core/profile/ProfilePaths.h b/fincept-qt/src/core/profile/ProfilePaths.hnew file mode 100644index 000000000..5c32c813a--- /dev/null+++ b/fincept-qt/src/core/profile/ProfilePaths.h@@ -0,0 +1,75 @@+#pragma once+#include "core/identity/Uuid.h"++#include <QString>++namespace fincept {++/// Resolves the paths the multi-window refactor introduces, scoped to the+/// currently-active profile.+///+/// `AppPaths` (in core/config/) already covers the legacy layout —+/// data/, logs/, cache/, files/, workspaces/, etc. Those keep working+/// unchanged. `ProfilePaths` adds the *new* directories the refactor needs+/// without disturbing the legacy tree:+///+/// <profile_root>/+/// workspace.db (Phase 2 — live state, WAL SQLite)+/// layouts/ (Phase 6 — saved layouts, JSON-per-file)+/// cache.db (Phase 4 — panel state, distinct from legacy /data/cache.db)+/// crashes/ (Phase 10 — minidumps; legacy /crashdumps/ remains for old code)+///+/// All accessors are pure path computation — they do not touch the filesystem.+/// Use ensure_all() once at shell startup (after ProfileManager::set_active())+/// to create the directory tree.+///+/// Why a separate class: the legacy AppPaths is wired into 100+ call sites+/// for fincept.db/cache.db/runtime/. Touching it risks breaking unrelated+/// subsystems. ProfilePaths is the new, isolated surface for the new code.+/// Phase 6 will gradually migrate consumers off AppPaths::workspaces() onto+/// ProfilePaths::layouts_dir(); until then both coexist.+class ProfilePaths {+ public:+ /// Active profile's filesystem root. Equivalent to+ /// ProfileManager::instance().profile_root() — exposed here so callers+ /// can stay in the new namespace.+ static QString profile_root();++ /// New SQLite live-workspace database. Phase 2 schema.+ /// Distinct from AppPaths::data()/fincept.db (the application DB).+ static QString workspace_db();++ /// Directory holding one JSON file per saved layout, plus a small+ /// SQLite index. Replaces AppPaths::workspaces() (.fwsp files) in Phase 6.+ static QString layouts_dir();++ /// Index db inside layouts_dir(). Tracks (uuid, name, type, created,+ /// updated, thumbnail_path) for fast list/search.+ static QString layouts_index_db();++ /// Per-panel persisted state (filters, scroll, sub-panel state). Keyed+ /// by PanelInstanceId in Phase 4. Distinct from the legacy+ /// AppPaths::data()/cache.db which holds market-data caches and+ /// screen-state for the pre-UUID system; the two coexist during the+ /// migration window.+ static QString panel_cache_db();++ /// Minidumps written by Phase 10's CrashReporter. Legacy+ /// AppPaths::crashdumps() stays for the old crash handler until it's+ /// retired.+ static QString crashes_dir();++ /// Create the new directory tree under the current profile root if it+ /// doesn't exist. Safe to call repeatedly. No-op if profile_root() is+ /// empty (which would mean ProfileManager::set_active() was never called+ /// — diagnosed as an error).+ static void ensure_all();++ /// Stable UUID of the active profile. May be null if ProfileManager+ /// hasn't loaded the manifest yet — callers should treat null as+ /// "shell init not complete." Convenience passthrough to+ /// ProfileManager::active_profile_id().+ static ProfileId active_profile_id();+};++} // namespace finceptdiff --git a/fincept-qt/src/core/screen/MonitorTopology.cpp b/fincept-qt/src/core/screen/MonitorTopology.cppnew file mode 100644index 000000000..ccce44738--- /dev/null+++ b/fincept-qt/src/core/screen/MonitorTopology.cpp@@ -0,0 +1,83 @@+#include "core/screen/MonitorTopology.h"++#include <QCryptographicHash>+#include <QGuiApplication>+#include <QScreen>+#include <QStringList>++#include <algorithm>++namespace fincept {++namespace {++QString hash_fields(const QScreen* screen) {+ // Compose a deterministic fingerprint from properties that are stable+ // across reboots and dock reorderings:+ // manufacturer, model, physical size, current resolution, position+ //+ // Position is included so two physically-identical monitors at different+ // desk slots get distinct ids; otherwise a layout couldn't pin one panel+ // to "the left monitor" vs "the right monitor" when both are the same+ // make/model.+ QString fingerprint;+ fingerprint += screen->manufacturer();+ fingerprint += '/';+ fingerprint += screen->model();+ fingerprint += '/';+ const QSize sz = screen->size();+ fingerprint += QString::number(sz.width()) + 'x' + QString::number(sz.height());+ fingerprint += '/';+ fingerprint += QString::number(screen->physicalSize().width(), 'f', 1) + 'x';+ fingerprint += QString::number(screen->physicalSize().height(), 'f', 1);+ fingerprint += '/';+ const QRect g = screen->geometry();+ fingerprint += QString::number(g.x()) + ',' + QString::number(g.y());++ const QByteArray digest =+ QCryptographicHash::hash(fingerprint.toUtf8(), QCryptographicHash::Sha256);+ // 16 hex chars = 64 bits of fingerprint, enough to make collision over+ // any realistic monitor count negligible while keeping ids short.+ return "h:" + QString::fromLatin1(digest.toHex().left(16));+}++} // namespace++QString MonitorTopology::stable_id(const QScreen* screen) {+ if (!screen)+ return {};++ const QString serial = screen->serialNumber();+ if (!serial.isEmpty())+ return "s:" + serial;++ return hash_fields(screen);+}++layout::MonitorTopologyKey MonitorTopology::current_key() {+ const QList<QScreen*> screens = QGuiApplication::screens();+ if (screens.isEmpty())+ return {};++ QStringList ids;+ ids.reserve(screens.size());+ for (const QScreen* s : screens) {+ const QString id = stable_id(s);+ if (!id.isEmpty())+ ids.append(id);+ }+ std::sort(ids.begin(), ids.end());+ return layout::MonitorTopologyKey{ids.join(',')};+}++QScreen* MonitorTopology::find_screen_by_stable_id(const QString& stable_id) {+ if (stable_id.isEmpty())+ return nullptr;+ for (QScreen* s : QGuiApplication::screens()) {+ if (MonitorTopology::stable_id(s) == stable_id)+ return s;+ }+ return nullptr;+}++} // namespace finceptdiff --git a/fincept-qt/src/core/screen/MonitorTopology.h b/fincept-qt/src/core/screen/MonitorTopology.hnew file mode 100644index 000000000..90718f96d--- /dev/null+++ b/fincept-qt/src/core/screen/MonitorTopology.h@@ -0,0 +1,48 @@+#pragma once+#include "core/layout/LayoutTypes.h"++#include <QString>++class QScreen;++namespace fincept {++/// Stable monitor identification + topology hashing.+///+/// `QScreen::name()` is what today's code persists when pinning a window to+/// a monitor (`SessionManager::save_screen_name`). It works most of the time+/// on Windows (`\\.\DISPLAY1` etc.) but breaks on:+/// - USB-C dock plug/unplug (display name shifts).+/// - Reboot enumeration changes (different boot order = different name).+/// - Multiple identical monitors (all named "DISPLAY3" on different machines).+///+/// `MonitorTopology` defines a composite, stable id derived from properties+/// the OS exposes consistently across hot-plug events:+///+/// StableScreenId = serialNumber (Qt 6.0+, when present)+/// | hash("manufacturer/model/widthxheight/x@y")+///+/// Hash collisions across truly-identical monitors are fine — they're+/// interchangeable for layout placement.+///+/// `MonitorTopologyKey` (defined in LayoutTypes.h) is the key for an entire+/// connected-monitor configuration: a sorted, comma-joined list of stable+/// ids. Two physically-identical desk setups produce the same topology key;+/// plugging/unplugging produces a different key. WorkspaceVariant matching+/// (Phase 6) keys off this.+class MonitorTopology {+ public:+ /// Stable id for a single screen. Never empty for a connected screen.+ /// Result is deterministic per physical monitor across boots / dock+ /// reorderings (best-effort — see class doc).+ static QString stable_id(const QScreen* screen);++ /// Topology key for the full set of screens currently connected. Returns+ /// empty key if QGuiApplication has no screens (test harnesses, headless).+ static layout::MonitorTopologyKey current_key();++ /// Find a connected screen whose stable id matches. nullptr if not present.+ static QScreen* find_screen_by_stable_id(const QString& stable_id);+};++} // namespace finceptdiff --git a/fincept-qt/src/core/screen/MonitorWatcher.cpp b/fincept-qt/src/core/screen/MonitorWatcher.cppnew file mode 100644index 000000000..963999b12--- /dev/null+++ b/fincept-qt/src/core/screen/MonitorWatcher.cpp@@ -0,0 +1,62 @@+#include "core/screen/MonitorWatcher.h"++#include "core/logging/Logger.h"+#include "core/screen/MonitorTopology.h"++#include <QGuiApplication>+#include <QScreen>++namespace fincept {++namespace {+constexpr int kDebounceMs = 500;+} // namespace++MonitorWatcher& MonitorWatcher::instance() {+ static MonitorWatcher s;+ return s;+}++MonitorWatcher::MonitorWatcher() {+ debounce_.setSingleShot(true);+ debounce_.setInterval(kDebounceMs);+ connect(&debounce_, &QTimer::timeout, this, &MonitorWatcher::on_debounce_fired);++ // Seed the cached topology before any consumer asks.+ current_topology_ = MonitorTopology::current_key();++ auto* app = QGuiApplication::instance();+ if (auto* gapp = qobject_cast<QGuiApplication*>(app)) {+ connect(gapp, &QGuiApplication::screenAdded, this,+ [this](QScreen*) { on_raw_screen_event(); });+ connect(gapp, &QGuiApplication::screenRemoved, this,+ [this](QScreen*) { on_raw_screen_event(); });+ connect(gapp, &QGuiApplication::primaryScreenChanged, this,+ [this](QScreen*) { on_raw_screen_event(); });+ }++ LOG_INFO("MonitorWatcher",+ QString("Initialised; topology=%1").arg(current_topology_.value));+}++void MonitorWatcher::on_raw_screen_event() {+ // Restart the debounce on every raw event so the timer only fires+ // 500 ms after the last event in a burst. Update the cached topology+ // immediately so a consumer asking via current_topology() during a+ // burst sees the latest snapshot.+ current_topology_ = MonitorTopology::current_key();+ debounce_.start();+}++void MonitorWatcher::on_debounce_fired() {+ // Re-read at the end of the debounce window — the raw events updated+ // the cache during the burst, but we want to be doubly sure on emit.+ const auto fresh = MonitorTopology::current_key();+ if (fresh.value != current_topology_.value)+ current_topology_ = fresh;+ LOG_INFO("MonitorWatcher",+ QString("Topology settled to: %1").arg(current_topology_.value));+ emit topology_changed(current_topology_);+}++} // namespace finceptdiff --git a/fincept-qt/src/core/screen/MonitorWatcher.h b/fincept-qt/src/core/screen/MonitorWatcher.hnew file mode 100644index 000000000..570ced9a2--- /dev/null+++ b/fincept-qt/src/core/screen/MonitorWatcher.h@@ -0,0 +1,54 @@+#pragma once+#include "core/layout/LayoutTypes.h"++#include <QObject>+#include <QTimer>++namespace fincept {++/// Process-singleton that listens for monitor topology changes — screens+/// added, removed, primary-changed — and emits a debounced+/// `topology_changed` signal once the OS settles.+///+/// Why debounce: laptop lid close/open and dock plug/unplug can produce+/// 3–5 raw screen events in rapid succession (Qt fires+/// `screenAdded` → `screenRemoved` → `primaryScreenChanged` separately).+/// Reacting to each one individually would re-arrange windows mid-flight.+/// 500 ms debounce per design-doc decision 5.1 / 5.7 lets the dust settle.+///+/// Phase 6 saved-layout work consumes `topology_changed` to ask+/// "does the active workspace have a saved variant for this new topology?+/// If yes, prompt the user to switch."+///+/// Threading: hub-style — connects to `QGuiApplication` signals on the GUI+/// thread; the debounce QTimer also lives on the GUI thread. No worker thread.+class MonitorWatcher : public QObject {+ Q_OBJECT+ public:+ static MonitorWatcher& instance();++ /// Currently-known topology key. Cached so consumers can read without+ /// re-walking the screen list. Updated immediately when the underlying+ /// QGuiApplication signal fires; the debounced public signal is what+ /// notifies subscribers, but the cached value is fresh either way.+ layout::MonitorTopologyKey current_topology() const { return current_topology_; }++ signals:+ /// Emitted after a 500 ms quiet period following the last raw screen+ /// event. The argument is the new topology key (current_topology()).+ /// Subscribers compare against the previously-seen key to decide+ /// whether to act — Qt's signal queue may deliver multiple in flight+ /// during transitions on some platforms.+ void topology_changed(const layout::MonitorTopologyKey& new_topology);++ private:+ MonitorWatcher();++ void on_raw_screen_event();+ void on_debounce_fired();++ layout::MonitorTopologyKey current_topology_;+ QTimer debounce_;+};++} // namespace finceptdiff --git a/fincept-qt/src/core/session/ScreenStateManager.cpp b/fincept-qt/src/core/session/ScreenStateManager.cppindex cf85944c5..2b42e0d1d 100644--- a/fincept-qt/src/core/session/ScreenStateManager.cpp+++ b/fincept-qt/src/core/session/ScreenStateManager.cpp@@ -114,14 +114,18 @@ QVariantMap ScreenStateManager::load_direct(const QString& key, int expected_ver// ── Private: flush pending ───────────────────────────────────────────────────void ScreenStateManager::flush_pending() {- if (pending_saves_.isEmpty())+ // Phase 4b: flush both the legacy screen-key table and the UUID table.+ // Snapshot + clear each separately so new notify_* calls during the+ // async write don't get clobbered by this flush.+ if (pending_saves_.isEmpty() && pending_uuid_saves_.isEmpty())return;- // Snapshot and clear immediately so new notify_changed() calls during- // the async write don't get cleared by a later flush.const auto snapshot = pending_saves_;pending_saves_.clear();+ const auto uuid_snapshot = pending_uuid_saves_;+ pending_uuid_saves_.clear();+for (auto it = snapshot.constBegin(); it != snapshot.constEnd(); ++it) {screens::IStatefulScreen* screen = it.value();if (!screen)@@ -134,7 +138,23 @@ void ScreenStateManager::flush_pending() {write_async(key, state, version, sid);}- LOG_DEBUG("ScreenState", QString("Flushed %1 pending screen states").arg(snapshot.size()));++ for (auto it = uuid_snapshot.constBegin(); it != uuid_snapshot.constEnd(); ++it) {+ screens::IStatefulScreen* screen = it.value();+ if (!screen)+ continue;++ const QString instance_uuid = it.key();+ const QString screen_key = screen->state_key();+ const QVariantMap state = screen->save_state();+ const int version = screen->state_version();+ const QString sid = session_id_;++ write_async_by_uuid(instance_uuid, screen_key, state, version, sid);+ }++ LOG_DEBUG("ScreenState", QString("Flushed %1 legacy + %2 UUID-keyed screen states")+ .arg(snapshot.size()).arg(uuid_snapshot.size()));}// ── Private static: async SQLite write ───────────────────────────────────────@@ -156,4 +176,105 @@ void ScreenStateManager::write_async(const QString& key, const QVariantMap& stat});}+void ScreenStateManager::write_async_by_uuid(const QString& instance_uuid,+ const QString& screen_key,+ const QVariantMap& state,+ int version,+ const QString& session_id) {+ std::ignore = QtConcurrent::run([instance_uuid, screen_key, state, version, session_id]() {+ QJsonObject obj;+ for (auto it = state.constBegin(); it != state.constEnd(); ++it)+ obj.insert(it.key(), QJsonValue::fromVariant(it.value()));++ auto r = TabSessionStore::instance().save_screen_state_by_uuid(+ instance_uuid, screen_key, obj, version, session_id);++ if (r.is_err()) {+ LOG_WARN("ScreenState",+ QString("UUID write failed for %1 (%2): %3")+ .arg(instance_uuid, screen_key, QString::fromStdString(r.error())));+ }+ });+}++// ── UUID-keyed public API ────────────────────────────────────────────────────++void ScreenStateManager::restore_by_uuid(screens::IStatefulScreen* screen,+ const QString& instance_uuid,+ bool fallback_to_screen_key) {+ if (!screen)+ return;+ const int expected = screen->state_version();++ // First try the UUID-keyed row (the new path).+ auto by_uuid = TabSessionStore::instance().load_screen_state_by_uuid(instance_uuid, expected);+ if (by_uuid.is_err()) {+ LOG_WARN("ScreenState", QString("UUID load failed for %1: %2")+ .arg(instance_uuid, QString::fromStdString(by_uuid.error())));+ return;+ }++ QJsonObject obj = by_uuid.value();+ if (obj.isEmpty() && fallback_to_screen_key) {+ // No UUID-keyed row yet. Fall back to the legacy screen_key path+ // so users upgrading from a pre-Phase-4b build keep their state.+ // The next save will write a UUID-keyed row, so the fallback is a+ // one-time migration assist per panel.+ const QString legacy_key = screen->state_key();+ if (!legacy_key.isEmpty()) {+ auto legacy = TabSessionStore::instance().load_screen_state(legacy_key, expected);+ if (legacy.is_ok())+ obj = legacy.value();+ }+ }++ if (obj.isEmpty()) {+ LOG_DEBUG("ScreenState", QString("No saved state for uuid=%1").arg(instance_uuid));+ return;+ }++ QVariantMap state_map;+ for (auto it = obj.constBegin(); it != obj.constEnd(); ++it)+ state_map.insert(it.key(), it.value().toVariant());++ screen->restore_state(state_map);+ LOG_DEBUG("ScreenState", QString("Restored state for uuid=%1").arg(instance_uuid));+}++void ScreenStateManager::save_now_by_uuid(screens::IStatefulScreen* screen,+ const QString& instance_uuid) {+ if (!screen || instance_uuid.isEmpty())+ return;++ const QString screen_key = screen->state_key();+ const QVariantMap state = screen->save_state();+ const int version = screen->state_version();+ const QString sid = session_id_;++ pending_uuid_saves_.remove(instance_uuid);+ write_async_by_uuid(instance_uuid, screen_key, state, version, sid);+ LOG_DEBUG("ScreenState", QString("save_now_by_uuid dispatched for %1").arg(instance_uuid));+}++void ScreenStateManager::notify_changed_by_uuid(screens::IStatefulScreen* screen,+ const QString& instance_uuid) {+ if (!screen || instance_uuid.isEmpty())+ return;+ pending_uuid_saves_.insert(instance_uuid, screen);+ debounce_timer_->start();+}++void ScreenStateManager::erase_by_uuid(const QString& instance_uuid) {+ pending_uuid_saves_.remove(instance_uuid);+ // Run the delete async so the caller (closeEvent) doesn't block on disk.+ std::ignore = QtConcurrent::run([instance_uuid]() {+ auto r = TabSessionStore::instance().remove_screen_state_by_uuid(instance_uuid);+ if (r.is_err()) {+ LOG_WARN("ScreenState",+ QString("erase_by_uuid failed for %1: %2")+ .arg(instance_uuid, QString::fromStdString(r.error())));+ }+ });+}+} // namespace finceptdiff --git a/fincept-qt/src/core/session/ScreenStateManager.h b/fincept-qt/src/core/session/ScreenStateManager.hindex 5e8e520f4..cf5ba264d 100644--- a/fincept-qt/src/core/session/ScreenStateManager.h+++ b/fincept-qt/src/core/session/ScreenStateManager.h@@ -55,6 +55,38 @@ class ScreenStateManager : public QObject {/// Returns empty map if nothing stored or version mismatch.QVariantMap load_direct(const QString& key, int expected_version = 1);+ // ── Phase 4b: instance-UUID-keyed save/restore overloads ─────────────────+ //+ // Identical semantics to the screen-key versions, but storage is keyed+ // by per-panel UUID so two open panels of the same screen type don't+ // overwrite each other's state. DockScreenRouter uses these for any+ // screen that has a PanelHandle (which, post-Phase 4, is every panel).+ //+ // The legacy screen-key API stays for non-panel callers+ // (IWorkspaceParticipant, etc.) and for the migration window where+ // some screens haven't been wired to their PanelHandle yet.++ /// Restore state into `screen` under the given instance UUID. Looks up+ /// the row in `screen_state` by `instance_uuid`. Falls back to the+ /// screen_key path if no UUID-keyed row exists yet — handy during the+ /// migration window so existing screens don't lose their state.+ void restore_by_uuid(screens::IStatefulScreen* screen,+ const QString& instance_uuid,+ bool fallback_to_screen_key = true);++ /// Save now (async) under the given instance UUID. The screen's+ /// state_key() is also written into the `screen_key` column for+ /// diagnostics; the actual lookup key is the UUID.+ void save_now_by_uuid(screens::IStatefulScreen* screen, const QString& instance_uuid);++ /// Notify changed under UUID. The debounce key is the UUID, so two+ /// open watchlists with rapid changes don't coalesce into one row.+ void notify_changed_by_uuid(screens::IStatefulScreen* screen, const QString& instance_uuid);++ /// Drop the UUID-keyed row. Called by DockScreenRouter when a panel+ /// closes permanently (vs. temporary dematerialisation).+ void erase_by_uuid(const QString& instance_uuid);+private:explicit ScreenStateManager(QObject* parent = nullptr);@@ -64,7 +96,16 @@ class ScreenStateManager : public QObject {/// Perform the actual async SQLite write for one screen.static void write_async(const QString& key, const QVariantMap& state, int version, const QString& session_id);+ /// Phase 4b: UUID-keyed async write. Stores under instance_uuid+ /// (primary lookup) while also recording screen_key for diagnostics.+ static void write_async_by_uuid(const QString& instance_uuid,+ const QString& screen_key,+ const QVariantMap& state,+ int version,+ const QString& session_id);+QHash<QString, screens::IStatefulScreen*> pending_saves_; // key → screen ptr+ QHash<QString, screens::IStatefulScreen*> pending_uuid_saves_; // instance_uuid → screen ptrQTimer* debounce_timer_ = nullptr;QString session_id_;};diff --git a/fincept-qt/src/core/session/SessionManager.cpp b/fincept-qt/src/core/session/SessionManager.cppindex 3e58529e8..1434232fc 100644--- a/fincept-qt/src/core/session/SessionManager.cpp+++ b/fincept-qt/src/core/session/SessionManager.cpp@@ -1,4 +1,17 @@-#include "core/session/SessionManager.h"+#include "core/session/SessionManager.h"++#include "app/TerminalShell.h"+#include "core/logging/Logger.h"+#include "core/screen/MonitorTopology.h"+#include "storage/workspace/WorkspaceSnapshotRing.h"++#include <QGuiApplication>+#include <QJsonArray>+#include <QJsonDocument>+#include <QJsonObject>+#include <QJsonValue>+#include <QScreen>+#include <QStringList>namespace fincept {@@ -46,6 +59,7 @@ void SessionManager::save_geometry(int window_id, const QByteArray& geometry, coconst QString prefix = QString("window_%1/").arg(window_id);settings_.setValue(prefix + "geometry", geometry);settings_.setValue(prefix + "state", state);+ request_snapshot_(false);}QByteArray SessionManager::load_geometry(int window_id) const {@@ -79,6 +93,7 @@ void SessionManager::save_window_ids(const QList<int>& ids) {for (int id : ids)v.append(id);settings_.setValue("window_ids", v);+ request_snapshot_(false);}QList<int> SessionManager::load_window_ids() const {@@ -95,12 +110,48 @@ QList<int> SessionManager::load_window_ids() const {}void SessionManager::save_screen_name(int window_id, const QString& screen_name) {+ // Phase 6 trim: store both the legacy QScreen::name() (back-compat) and+ // the stable id (decision 5.2). On restore, prefer the stable id —+ // survives USB-C dock reorderings and Windows enumeration shuffles.+ // Legacy name kept so users downgrading don't lose their layout.const QString prefix = QString("window_%1/").arg(window_id);settings_.setValue(prefix + "screen_name", screen_name);++ // Resolve the stable id by walking screens for one whose QScreen::name()+ // matches what the caller passed. The caller is WindowFrame::closeEvent+ // which already has the QScreen* in hand and reads its name(), so this+ // back-mapping is a small price to keep the public API stable.+ if (auto* gapp = QGuiApplication::instance(); gapp != nullptr) {+ for (QScreen* s : QGuiApplication::screens()) {+ if (s && s->name() == screen_name) {+ const QString stable = MonitorTopology::stable_id(s);+ if (!stable.isEmpty()) {+ settings_.setValue(prefix + "screen_stable_id", stable);+ }+ break;+ }+ }+ }++ request_snapshot_(false);}QString SessionManager::load_screen_name(int window_id) const {+ // Phase 6 trim: prefer stable id lookup, fall back to legacy+ // QScreen::name(). Stable-id resolution: walk current screens, return+ // the QScreen::name() of whichever has the matching stable id. If no+ // current screen matches (monitor disconnected since save), fall back+ // to the legacy name field — caller may further fall back to primary+ // screen. The double-write in save_screen_name guarantees both keys+ // are present after Phase 6 ships.const QString prefix = QString("window_%1/").arg(window_id);+ const QString stable = settings_.value(prefix + "screen_stable_id").toString();+ if (!stable.isEmpty()) {+ for (QScreen* s : QGuiApplication::screens()) {+ if (s && MonitorTopology::stable_id(s) == stable)+ return s->name();+ }+ }return settings_.value(prefix + "screen_name").toString();}@@ -117,6 +168,7 @@ bool SessionManager::load_window_flag(int window_id, const QString& name, bool dvoid SessionManager::save_dock_layout(int window_id, const QByteArray& layout) {const QString prefix = QString("window_%1/").arg(window_id);settings_.setValue(prefix + "dock_layout", layout);+ request_snapshot_(false);}QByteArray SessionManager::load_dock_layout(int window_id) const {@@ -168,4 +220,115 @@ QString SessionManager::last_screen() const {return settings_.value("session/last_screen", "dashboard").toString();}+void SessionManager::flush_snapshot_now() {+ request_snapshot_(/*force=*/true);+}++void SessionManager::request_snapshot_(bool force) {+ // The shell may not be initialised yet during very early ProfileManager+ // accesses (some legacy paths read settings before main.cpp constructs+ // the shell). In that case there's no WorkspaceDb to write to — silently+ // skip; QSettings already has the data, no work is lost.+ auto* ring = TerminalShell::instance().snapshot_ring();+ if (!ring)+ return;++ const QByteArray payload = build_snapshot_payload_();+ if (payload.isEmpty())+ return; // QSettings empty — nothing useful to snapshot.++ // For non-forced calls the ring rate-limits to 60s; this is the auto-+ // save throttle. Forced flushes (closeEvent, manual layout-save) write+ // immediately. Either way, ring trims oldest auto rows when we exceed+ // the ring size.+ auto r = ring->add(payload, "auto", force);+ if (r.is_err()) {+ LOG_WARN("SessionManager", QString("Snapshot write failed: %1")+ .arg(QString::fromStdString(r.error())));+ }+}++QByteArray SessionManager::build_snapshot_payload_() const {+ // Phase 2 payload format: a flat JSON object mirroring the QSettings+ // state that's relevant to multi-window restoration.+ //+ // {+ // "schema": "phase2-mirror",+ // "window_ids": [0, 1, 3],+ // "last_screen": "dashboard",+ // "windows": {+ // "0": { "geometry": "<base64>", "state": "<base64>",+ // "dock_layout": "<base64>", "screen_name": "...",+ // "flags": { "always_on_top": true } },+ // ...+ // }+ // }+ //+ // Phase 6 swaps this for proper Workspace::to_json() once UUIDs and+ // FrameLayout/PanelState are wired through WindowFrame. Until then the+ // mirror format is what the recovery path will read back.+ QJsonObject root;+ root["schema"] = "phase2-mirror";++ // window_ids+ {+ QJsonArray arr;+ const QVariantList v = settings_.value("window_ids").toList();+ for (const QVariant& x : v) {+ bool ok = false;+ const int id = x.toInt(&ok);+ if (ok)+ arr.append(id);+ }+ root["window_ids"] = arr;+ }++ root["last_screen"] = settings_.value("session/last_screen", "dashboard").toString();++ // Per-window keys. Walk QSettings groups instead of taking a window-id+ // list as input — handles the case where QSettings has stale keys for+ // windows that no longer exist (we want them in the snapshot too so+ // recovery can offer to restore them).+ QJsonObject windows_obj;+ const QStringList top_groups = settings_.childGroups();+ for (const QString& g : top_groups) {+ if (!g.startsWith("window_"))+ continue;+ const QString id_str = g.mid(QStringLiteral("window_").size());+ bool ok = false;+ (void) id_str.toInt(&ok);+ if (!ok)+ continue;++ QJsonObject win;+ settings_.beginGroup(g);+ const QByteArray geom = settings_.value("geometry").toByteArray();+ if (!geom.isEmpty()) win["geometry"] = QString::fromLatin1(geom.toBase64());+ const QByteArray state = settings_.value("state").toByteArray();+ if (!state.isEmpty()) win["state"] = QString::fromLatin1(state.toBase64());+ const QByteArray dock = settings_.value("dock_layout").toByteArray();+ if (!dock.isEmpty()) win["dock_layout"] = QString::fromLatin1(dock.toBase64());+ const int dlv = settings_.value("dock_layout_version", 0).toInt();+ if (dlv != 0) win["dock_layout_version"] = dlv;+ const QString sn = settings_.value("screen_name").toString();+ if (!sn.isEmpty()) win["screen_name"] = sn;++ // Flags subgroup. QSettings nests flat under window_<id>/flags/<name>.+ QJsonObject flags;+ settings_.beginGroup("flags");+ const QStringList flag_keys = settings_.childKeys();+ for (const QString& fk : flag_keys)+ flags[fk] = settings_.value(fk).toBool();+ settings_.endGroup();+ if (!flags.isEmpty()) win["flags"] = flags;++ settings_.endGroup();+ if (!win.isEmpty())+ windows_obj[id_str] = win;+ }+ root["windows"] = windows_obj;++ return QJsonDocument(root).toJson(QJsonDocument::Compact);+}+} // namespace finceptdiff --git a/fincept-qt/src/core/session/SessionManager.h b/fincept-qt/src/core/session/SessionManager.hindex 92d6e4ee8..9d82d12e4 100644--- a/fincept-qt/src/core/session/SessionManager.h+++ b/fincept-qt/src/core/session/SessionManager.h@@ -1,4 +1,4 @@-#pragma once+#pragma once#include <QElapsedTimer>#include <QList>#include <QObject>@@ -64,11 +64,34 @@ class SessionManager : public QObject {void set_last_screen(const QString& screen_id);QString last_screen() const;+ /// Force an immediate snapshot of the current QSettings-backed state+ /// into the WorkspaceDb ring buffer. Used by closeEvent paths that+ /// want to bypass the auto-rate limit on a real shutdown. The Phase 2+ /// auto path still rate-limits so this is the only "always now" hook.+ /// No-op if WorkspaceDb isn't open (early init or shutdown teardown).+ void flush_snapshot_now();+signals:void session_started();private:SessionManager() = default;++ /// Internal: triggered by every save_* call. Builds a JSON payload+ /// from the union of `window_<id>/*` keys + `window_ids` + `last_screen`+ /// and pushes through WorkspaceSnapshotRing::add_auto, which rate-limits+ /// to 60s. This is the Phase 2 "double-write" — QSettings still gets+ /// the per-key write (legacy reads keep working) and WorkspaceDb gets+ /// the consolidated snapshot.+ ///+ /// Phase 6 replaces this with proper Workspace serialisation once+ /// FrameLayout/PanelState are wired through WindowFrame.+ void request_snapshot_(bool force);++ /// Build a JSON payload representing the current QSettings state.+ /// Used by request_snapshot_() and exposed for testing.+ QByteArray build_snapshot_payload_() const;+QElapsedTimer elapsed_;mutable QSettings settings_{"Fincept", "FinceptTerminal"};};diff --git a/fincept-qt/src/core/symbol/SymbolGroupRegistry.cpp b/fincept-qt/src/core/symbol/SymbolGroupRegistry.cppindex 3ac3fded8..baab89de4 100644--- a/fincept-qt/src/core/symbol/SymbolGroupRegistry.cpp+++ b/fincept-qt/src/core/symbol/SymbolGroupRegistry.cpp@@ -1,13 +1,25 @@#include "core/symbol/SymbolGroupRegistry.h"+#include "core/config/ProfileManager.h"+#include <QSettings>namespace fincept {namespace {-QString settings_key(SymbolGroup g, const char* field) {- return QStringLiteral("symbol_groups/%1/%2").arg(symbol_group_letter(g)).arg(QString::fromLatin1(field));+/// Compose the QSettings key for a slot field, prefixed with the active+/// profile's settings group so two profiles on the same box keep distinct+/// metadata. For the default profile, ProfileManager::settings_group()+/// returns empty and the key reduces to the legacy "symbol_groups/<letter>/<field>".+QString settings_key_for_active_profile(SymbolGroup g, const char* field) {+ const QString profile_group = ProfileManager::instance().settings_group();+ const QString tail = QStringLiteral("symbol_groups/%1/%2")+ .arg(symbol_group_letter(g))+ .arg(QString::fromLatin1(field));+ if (profile_group.isEmpty())+ return tail;+ return profile_group + QStringLiteral("/") + tail;}} // namespace@@ -21,6 +33,28 @@ SymbolGroupRegistry::SymbolGroupRegistry() {load();}+void SymbolGroupRegistry::reload() {+ // Snapshot current state so we only emit signals for slots that actually+ // change. Avoids waking up every badge in the app for slots whose values+ // happen to be identical between profiles (factory defaults match).+ const QHash<SymbolGroup, Slot> before = slots_;+ slots_.clear();+ load();++ for (SymbolGroup g : all_symbol_groups()) {+ const auto bit = before.constFind(g);+ const auto ait = slots_.constFind(g);+ const bool was = bit != before.constEnd();+ const bool is = ait != slots_.constEnd();+ if (!was || !is) {+ emit group_metadata_changed(g);+ continue;+ }+ if (bit->name != ait->name || bit->color != ait->color || bit->enabled != ait->enabled)+ emit group_metadata_changed(g);+ }+}+QString SymbolGroupRegistry::default_name(SymbolGroup g) {if (g == SymbolGroup::None)return {};@@ -66,12 +100,12 @@ void SymbolGroupRegistry::load() {QSettings s;for (SymbolGroup g : all_symbol_groups()) {Slot slot;- slot.name = s.value(settings_key(g, "name"), default_name(g)).toString();- const QString color_str = s.value(settings_key(g, "color"), default_color(g).name()).toString();+ slot.name = s.value(settings_key_for_active_profile(g, "name"), default_name(g)).toString();+ const QString color_str = s.value(settings_key_for_active_profile(g, "color"), default_color(g).name()).toString();slot.color = QColor(color_str);if (!slot.color.isValid())slot.color = default_color(g);- slot.enabled = s.value(settings_key(g, "enabled"), default_enabled(g)).toBool();+ slot.enabled = s.value(settings_key_for_active_profile(g, "enabled"), default_enabled(g)).toBool();slots_.insert(g, std::move(slot));}}@@ -81,9 +115,9 @@ void SymbolGroupRegistry::save_slot(SymbolGroup g) const {if (it == slots_.constEnd())return;QSettings s;- s.setValue(settings_key(g, "name"), it->name);- s.setValue(settings_key(g, "color"), it->color.name());- s.setValue(settings_key(g, "enabled"), it->enabled);+ s.setValue(settings_key_for_active_profile(g, "name"), it->name);+ s.setValue(settings_key_for_active_profile(g, "color"), it->color.name());+ s.setValue(settings_key_for_active_profile(g, "enabled"), it->enabled);}QString SymbolGroupRegistry::name(SymbolGroup g) const {diff --git a/fincept-qt/src/core/symbol/SymbolGroupRegistry.h b/fincept-qt/src/core/symbol/SymbolGroupRegistry.hindex d125293b5..28b20d84c 100644--- a/fincept-qt/src/core/symbol/SymbolGroupRegistry.h+++ b/fincept-qt/src/core/symbol/SymbolGroupRegistry.h@@ -9,7 +9,7 @@namespace fincept {-/// Per-user, per-slot metadata for symbol link groups (A..J).+/// Per-profile, per-slot metadata for symbol link groups (A..J).////// Each slot owns three pieces of state:/// - `name`: human-readable label ("Group A", "Tech Watch", …). Editable.@@ -22,14 +22,24 @@ namespace fincept {/// Renaming "A" to "Tech Watch" does not migrate any saved state; existing/// links keep working under the new label.///-/// Storage: QSettings under `symbol_groups/<letter>/{name,color,enabled}`,-/// global per user (not per workspace). Settings are written immediately on-/// each mutation — no batched flush.+/// Storage: QSettings under `<profile_prefix>symbol_groups/<letter>/{name,color,enabled}`,+/// where `<profile_prefix>` comes from `ProfileManager::settings_group()` —+/// empty for the default profile, `profiles/<name>/` otherwise. This lets two+/// users on a shared box keep distinct group names/colours.+///+/// Settings are written immediately on each mutation — no batched flush.class SymbolGroupRegistry : public QObject {Q_OBJECTpublic:static SymbolGroupRegistry& instance();+ /// Re-read all slots from QSettings under the current profile's settings+ /// group. Call this after switching profiles so the badge palette /+ /// names reflect the new active user. Emits `group_metadata_changed`+ /// for every slot whose value actually differs from what was loaded.+ /// Idempotent if the profile didn't change.+ void reload();+QString name(SymbolGroup g) const;QColor color(SymbolGroup g) const;bool enabled(SymbolGroup g) const;diff --git a/fincept-qt/src/core/telemetry/LocalTelemetrySink.cpp b/fincept-qt/src/core/telemetry/LocalTelemetrySink.cppnew file mode 100644index 000000000..1078fe0c5--- /dev/null+++ b/fincept-qt/src/core/telemetry/LocalTelemetrySink.cpp@@ -0,0 +1,88 @@+#include "core/telemetry/LocalTelemetrySink.h"++#include "app/TerminalShell.h"+#include "core/logging/Logger.h"+#include "storage/workspace/WorkspaceDb.h"++#include <QDateTime>+#include <QJsonDocument>+#include <QJsonObject>+#include <QJsonValue>+#include <QMutexLocker>++namespace fincept::telemetry {++LocalTelemetrySink::LocalTelemetrySink() = default;++void LocalTelemetrySink::record(const QString& event_id, const QVariantMap& payload) {+ auto* db = TerminalShell::instance().workspace_db();+ if (!db || !db->is_open()) {+ // Pre-init or post-shutdown — silently skip. Workspace.db isn't+ // available; nowhere to write. Not an error.+ return;+ }++ {+ QMutexLocker lock(&schema_mutex_);+ if (!schema_ensured_) {+ ensure_schema();+ schema_ensured_ = true;+ }+ }++ // Convert payload to JSON. Privacy: caller is responsible for what's+ // in the map; we don't sanitise here (decision 10.4 — no symbols,+ // no credentials).+ QJsonObject obj;+ for (auto it = payload.constBegin(); it != payload.constEnd(); ++it)+ obj.insert(it.key(), QJsonValue::fromVariant(it.value()));+ const QString json = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));++ const qint64 now_ms = QDateTime::currentMSecsSinceEpoch();+ const QString session = TerminalShell::instance().session_id();++ auto r = db->execute(+ "INSERT INTO telemetry_events(ts_ms, event_id, payload_json, session_id) "+ "VALUES (?, ?, ?, ?)",+ {now_ms, event_id, json, session});++ if (r.is_err()) {+ // Mark unhealthy; future record() calls still try (transient+ // disk full / busy timeout shouldn't permanently kill telemetry).+ healthy_ = false;+ LOG_WARN("LocalTelemetry", QString("record failed: %1")+ .arg(QString::fromStdString(r.error())));+ } else if (!healthy_) {+ healthy_ = true;+ LOG_INFO("LocalTelemetry", "Recovered from previous write failure");+ }+}++void LocalTelemetrySink::ensure_schema() {+ auto* db = TerminalShell::instance().workspace_db();+ if (!db || !db->is_open())+ return;++ auto r = db->exec("CREATE TABLE IF NOT EXISTS telemetry_events ("+ " id INTEGER PRIMARY KEY AUTOINCREMENT,"+ " ts_ms INTEGER NOT NULL,"+ " event_id TEXT NOT NULL,"+ " payload_json TEXT NOT NULL,"+ " session_id TEXT"+ ")");+ if (r.is_err()) {+ LOG_ERROR("LocalTelemetry",+ QString("schema create failed: %1").arg(QString::fromStdString(r.error())));+ healthy_ = false;+ return;+ }+ auto idx = db->exec("CREATE INDEX IF NOT EXISTS idx_telemetry_ts "+ "ON telemetry_events(ts_ms)");+ if (idx.is_err()) {+ LOG_WARN("LocalTelemetry",+ QString("idx create failed: %1").arg(QString::fromStdString(idx.error())));+ }+ LOG_INFO("LocalTelemetry", "Schema ensured");+}++} // namespace fincept::telemetrydiff --git a/fincept-qt/src/core/telemetry/LocalTelemetrySink.h b/fincept-qt/src/core/telemetry/LocalTelemetrySink.hnew file mode 100644index 000000000..675e8387c--- /dev/null+++ b/fincept-qt/src/core/telemetry/LocalTelemetrySink.h@@ -0,0 +1,39 @@+#pragma once+#include "core/telemetry/TelemetryProvider.h"++#include <QMutex>++namespace fincept::telemetry {++/// Phase 10: writes events to workspace.db's `telemetry_events` table.+/// Powers the in-app session-history view (Phase 9 reads from here).+/// Always-on once installed — does NOT do any network upload. Cloud+/// upload is a separate provider (`CloudTelemetryProvider`) that wraps+/// or replaces this one.+///+/// Schema (created lazily on first record() if missing):+/// telemetry_events(+/// id INTEGER PRIMARY KEY AUTOINCREMENT,+/// ts_ms INTEGER NOT NULL,+/// event_id TEXT NOT NULL,+/// payload_json TEXT NOT NULL,+/// session_id TEXT+/// )+///+/// Inserts go through WorkspaceDb's mutex so concurrent recorders from+/// different threads serialise correctly.+class LocalTelemetrySink : public TelemetryProvider {+ public:+ LocalTelemetrySink();++ void record(const QString& event_id, const QVariantMap& payload) override;+ bool is_healthy() const override { return healthy_; }++ private:+ void ensure_schema();+ bool schema_ensured_ = false;+ bool healthy_ = true;+ QMutex schema_mutex_;+};++} // namespace fincept::telemetrydiff --git a/fincept-qt/src/core/telemetry/TelemetryProvider.cpp b/fincept-qt/src/core/telemetry/TelemetryProvider.cppnew file mode 100644index 000000000..32e50b9fb--- /dev/null+++ b/fincept-qt/src/core/telemetry/TelemetryProvider.cpp@@ -0,0 +1,44 @@+#include "core/telemetry/TelemetryProvider.h"++#include "core/logging/Logger.h"++#include <QMutex>+#include <QMutexLocker>++namespace fincept::telemetry {++namespace {+QMutex& sink_mutex() {+ static QMutex m;+ return m;+}+} // namespace++TelemetrySink& TelemetrySink::instance() {+ static TelemetrySink s;+ return s;+}++void TelemetrySink::set_provider(TelemetryProvider* provider) {+ QMutexLocker lock(&sink_mutex());+ provider_ = provider;+ LOG_INFO("Telemetry", provider ? "Provider installed" : "Provider uninstalled");+}++void TelemetrySink::record(const QString& event_id, const QVariantMap& payload) {+ TelemetryProvider* p;+ {+ QMutexLocker lock(&sink_mutex());+ p = provider_;+ }+ if (!p)+ return;+ p->record(event_id, payload);+}++bool TelemetrySink::has_provider() const {+ QMutexLocker lock(&sink_mutex());+ return provider_ != nullptr;+}++} // namespace fincept::telemetrydiff --git a/fincept-qt/src/core/telemetry/TelemetryProvider.h b/fincept-qt/src/core/telemetry/TelemetryProvider.hnew file mode 100644index 000000000..52d828a6c--- /dev/null+++ b/fincept-qt/src/core/telemetry/TelemetryProvider.h@@ -0,0 +1,56 @@+#pragma once+#include <QString>+#include <QVariantMap>++namespace fincept::telemetry {++/// Phase 10: pluggable telemetry sink. Default off (no provider registered).+/// `LocalTelemetrySink` writes to workspace.db unconditionally so the+/// session-history view works offline. Cloud upload is opt-in and runs+/// through whichever concrete `TelemetryProvider` the user has configured.+///+/// Privacy contract (decision 10.4): action invocations + counts only.+/// NEVER include symbol/ticker/credentials/account-id payloads. Callers+/// are responsible for sanitising args before invoking record().+///+/// Threading: providers may be invoked from any thread (action invocation+/// happens on the UI thread today, but Phase 9's stress mode will fire+/// from a worker). Implementations must be thread-safe internally.+class TelemetryProvider {+ public:+ virtual ~TelemetryProvider() = default;++ /// Record a single event. The implementation decides how to durably+ /// store / batch / upload it.+ virtual void record(const QString& event_id, const QVariantMap& payload) = 0;++ /// Whether the provider's upstream (e.g. cloud HTTPS endpoint) is+ /// considered healthy. Used by ErrorPipeline (Phase 9) to surface a+ /// "telemetry: degraded" indicator. Default true for providers that+ /// don't have an upstream (LocalTelemetrySink).+ virtual bool is_healthy() const { return true; }+};++/// Process-singleton facade. main.cpp / Settings → Telemetry decides+/// which concrete provider (if any) to install. ActionRegistry calls+/// `record()` on every invoke; if no provider is installed it's a no-op.+class TelemetrySink {+ public:+ static TelemetrySink& instance();++ /// Install a provider. Replaces any previous one. Pass nullptr to+ /// uninstall (telemetry effectively disabled).+ void set_provider(TelemetryProvider* provider);++ /// Cheap no-op when no provider is installed. The lock is internal+ /// so callers don't need to coordinate.+ void record(const QString& event_id, const QVariantMap& payload);++ bool has_provider() const;++ private:+ TelemetrySink() = default;+ TelemetryProvider* provider_ = nullptr;+};++} // namespace fincept::telemetrydiff --git a/fincept-qt/src/core/window/WindowRegistry.cpp b/fincept-qt/src/core/window/WindowRegistry.cppnew file mode 100644index 000000000..9861a74e6--- /dev/null+++ b/fincept-qt/src/core/window/WindowRegistry.cpp@@ -0,0 +1,92 @@+#include "core/window/WindowRegistry.h"++#include "app/WindowFrame.h"+#include "core/logging/Logger.h"++#include <algorithm>++namespace fincept {++WindowRegistry& WindowRegistry::instance() {+ static WindowRegistry s;+ return s;+}++void WindowRegistry::register_frame(WindowFrame* w) {+ if (!w)+ return;+ for (const QPointer<WindowFrame>& p : windows_) {+ if (p == w)+ return; // idempotent+ }+ windows_.append(QPointer<WindowFrame>(w));+ LOG_DEBUG("WindowRegistry", QString("Frame registered: window_id=%1, total=%2")+ .arg(w->window_id()).arg(windows_.size()));+ emit frame_added(w);+ emit display_order_changed();+}++void WindowRegistry::unregister_frame(WindowFrame* w) {+ if (!w)+ return;+ bool removed = false;+ for (auto it = windows_.begin(); it != windows_.end();) {+ if (*it == w || it->isNull()) {+ if (*it == w) {+ emit frame_removing(w);+ removed = true;+ }+ it = windows_.erase(it);+ } else {+ ++it;+ }+ }+ if (removed) {+ LOG_DEBUG("WindowRegistry", QString("Frame unregistered: window_id=%1, total=%2")+ .arg(w->window_id()).arg(windows_.size()));+ emit display_order_changed();+ }+}++QList<WindowFrame*> WindowRegistry::frames() const {+ QList<WindowFrame*> out;+ out.reserve(windows_.size());+ for (const QPointer<WindowFrame>& p : windows_) {+ if (p)+ out.append(p.data());+ }+ std::sort(out.begin(), out.end(),+ [](WindowFrame* a, WindowFrame* b) { return a->window_id() < b->window_id(); });+ return out;+}++int WindowRegistry::frame_count() const {+ int n = 0;+ for (const QPointer<WindowFrame>& p : windows_) {+ if (p)+ ++n;+ }+ return n;+}++bool WindowRegistry::all_minimised() const {+ bool any = false;+ for (const QPointer<WindowFrame>& p : windows_) {+ if (!p)+ continue;+ any = true;+ if (!p->isMinimized())+ return false;+ }+ // Empty registry is *not* "all minimised" — there's nothing to minimise.+ return any;+}++QList<int> WindowRegistry::frame_ids() const {+ QList<int> ids;+ for (WindowFrame* w : frames())+ ids.append(w->window_id());+ return ids;+}++} // namespace finceptdiff --git a/fincept-qt/src/core/window/WindowRegistry.h b/fincept-qt/src/core/window/WindowRegistry.hnew file mode 100644index 000000000..fffc4f749--- /dev/null+++ b/fincept-qt/src/core/window/WindowRegistry.h@@ -0,0 +1,75 @@+#pragma once+#include <QList>+#include <QObject>+#include <QPointer>++namespace fincept {++class WindowFrame;++/// Process-global registry of live WindowFrame instances.+///+/// `WindowCycler` previously combined two responsibilities:+/// 1. Storage of which windows exist (lifecycle).+/// 2. Keyboard policy for moving focus / spawning windows.+///+/// `WindowRegistry` owns (1). `WindowCycler` keeps (2) but delegates to the+/// registry for the actual window list. This split lets the command bar,+/// link manager, telemetry, status bar, and the lock controller all observe+/// window add/remove without coupling to keyboard handling.+///+/// WindowFrame constructor calls `register_frame(this)`; destructor calls+/// `unregister_frame(this)`. Storage is weak (QPointer) so a destroyed+/// window is silently skipped until its explicit unregister tidies the slot.+///+/// Threading: UI-thread only.+class WindowRegistry : public QObject {+ Q_OBJECT+ public:+ static WindowRegistry& instance();++ void register_frame(WindowFrame* w);+ void unregister_frame(WindowFrame* w);++ /// All live windows sorted by `window_id` ascending. Stable ordering for+ /// keyboard shortcuts (`Ctrl+1` always = the lowest window_id).+ QList<WindowFrame*> frames() const;++ /// Count of live windows.+ int frame_count() const;++ /// True if every live window is currently in the minimised state. Used+ /// by the lock-on-minimise policy: per multi-window Bloomberg semantics,+ /// minimising one window is normal, but minimising the entire terminal+ /// (every frame) is a "walked away from desk" event that should trigger+ /// the inactivity lock.+ bool all_minimised() const;++ /// Frame ids in ascending order — used by SessionManager to persist+ /// "which windows were open at shutdown" without callers needing to+ /// touch each WindowFrame.+ QList<int> frame_ids() const;++ signals:+ /// Emitted after register_frame() inserts a new entry. Subscribers can+ /// hook into the new frame here (lock overlay injection in Phase 1b,+ /// link manager subscription in Phase 7).+ void frame_added(WindowFrame* w);++ /// Emitted before unregister_frame() removes the entry. The pointer is+ /// still valid at signal emission time so subscribers can do final+ /// cleanup (disconnect signals, snapshot state).+ void frame_removing(WindowFrame* w);++ /// Emitted whenever the result of `frames()` changes order or contents.+ /// Coarse signal that simplifies consumers who don't care about+ /// add-vs-remove specifics.+ void display_order_changed();++ private:+ WindowRegistry() = default;++ QList<QPointer<WindowFrame>> windows_;+};++} // namespace finceptdiff --git a/fincept-qt/src/datahub/DataHub.cpp b/fincept-qt/src/datahub/DataHub.cppindex d55f1adc7..18d9f9116 100644--- a/fincept-qt/src/datahub/DataHub.cpp+++ b/fincept-qt/src/datahub/DataHub.cpp@@ -6,6 +6,8 @@#include <QMetaObject>#include <QMutexLocker>#include <QThread>+#include <QVariant>+#include <QWidget>#include <algorithm>@@ -15,6 +17,31 @@ namespace {qint64 now_ms() {return QDateTime::currentMSecsSinceEpoch();}++// Phase 8 / decision 9.2: walk up from the owner to its top-level widget+// and read the `fincept.active_for_work` dynamic property that WindowFrame+// sets in its constructor + changeEvent. If the owner is not a QWidget or+// has no top-level ancestor (rare — module-level singletons that subscribe),+// treat as active (better to over-deliver than starve a legitimate consumer).+//+// We look at QWidget::window() rather than walking QObject::parent() chain+// because the latter can stop at an intermediate QObject that isn't a+// widget. window() handles widget-graph reparenting correctly and is what+// Qt itself uses for "the top-level for this widget."+//+// No caching — the lookup is one virtual call + one property read, both+// cheap. Caching adds cache-invalidation work that'd run on every+// subscribe/unsubscribe and on Phase 5 cross-frame panel reparenting.+bool is_owner_active_for_work(QObject* owner) {+ if (!owner) return true;+ auto* widget = qobject_cast<QWidget*>(owner);+ if (!widget) return true; // non-widget owner (a service) — always active+ QWidget* top = widget->window();+ if (!top) return true;+ const QVariant v = top->property("fincept.active_for_work");+ if (!v.isValid()) return true; // top isn't a frame that reports — assume active+ return v.toBool();+}} // namespace// ── Singleton ──────────────────────────────────────────────────────────────@@ -329,25 +356,75 @@ void DataHub::unsubscribe(QObject* owner, const QString& topic) {// ── Publishing ─────────────────────────────────────────────────────────────void DataHub::emit_to_subscribers(const QString& topic, const QVariant& value) {- // Snapshot slots under the lock, invoke without.- QVector<std::function<void(const QVariant&)>> direct_slots;- QVector<std::function<void(const QString&, const QVariant&)>> pattern_slots;+ // Snapshot slots + their owners under the lock; invoke without.+ // Phase 8: pause_when_inactive policy filters fanout to subscribers+ // whose top-level window reports `fincept.active_for_work == false`.+ // The cached value is already updated (do_publish writes it before+ // calling this method), so when the user brings the window forward+ // the next subscribe / peek immediately sees the latest.+ struct Pending {+ QPointer<QObject> owner;+ std::function<void(const QVariant&)> slot;+ };+ struct PendingPattern {+ QPointer<QObject> owner;+ std::function<void(const QString&, const QVariant&)> slot;+ };+ QVector<Pending> direct;+ QVector<PendingPattern> pattern;+ bool pause_when_inactive = false;{QMutexLocker lock(&mutex_);+ // Topic policy: explicit overrides win; otherwise check pattern+ // policies via the existing resolver. Cheap lookup since we're+ // already holding the lock for the subscription scan.+ if (auto it = topics_.find(topic); it != topics_.end())+ pause_when_inactive = it.value().policy.pause_when_inactive;+if (auto it = subscriptions_.find(topic); it != subscriptions_.end()) {for (const auto& s : it.value())- if (s.owner) direct_slots.append(s.slot);+ if (s.owner) direct.append({s.owner, s.slot});}for (auto it = pattern_subscriptions_.begin();it != pattern_subscriptions_.end(); ++it) {if (!pattern_matches(it.key(), topic)) continue;for (const auto& s : it.value())- if (s.owner) pattern_slots.append(s.pattern_slot);+ if (s.owner) pattern.append({s.owner, s.pattern_slot});+ }+ }++ int suppressed = 0;+ for (const auto& p : direct) {+ if (!p.owner) continue; // owner died between snapshot and invoke+ if (pause_when_inactive && !is_owner_active_for_work(p.owner.data())) {+ ++suppressed;+ continue;}+ p.slot(value);+ }+ for (const auto& p : pattern) {+ if (!p.owner) continue;+ if (pause_when_inactive && !is_owner_active_for_work(p.owner.data())) {+ ++suppressed;+ continue;+ }+ p.slot(topic, value);+ }++ // Topic-level signal mirrors fanout: fire only if at least one active+ // subscriber received the value (or pause is off). Avoids waking+ // global topic_updated listeners when the only consumers are+ // inactive-frame panels.+ const bool any_delivered =+ !pause_when_inactive ||+ (suppressed < direct.size() + pattern.size());+ if (any_delivered)+ emit topic_updated(topic, value);++ if (suppressed > 0) {+ LOG_DEBUG("DataHub", QString("Suppressed %1 inactive-frame fanout(s) for topic '%2'")+ .arg(suppressed).arg(topic));}- for (const auto& s : direct_slots) s(value);- for (const auto& s : pattern_slots) s(topic, value);- emit topic_updated(topic, value);}void DataHub::do_publish(const QString& topic, const QVariant& value,diff --git a/fincept-qt/src/datahub/DataHubMetaTypes.cpp b/fincept-qt/src/datahub/DataHubMetaTypes.cppindex d16d6c84e..4a69bca2a 100644--- a/fincept-qt/src/datahub/DataHubMetaTypes.cpp+++ b/fincept-qt/src/datahub/DataHubMetaTypes.cpp@@ -56,8 +56,11 @@ void register_metatypes() {qRegisterMetaType<QVector<fincept::services::geo::HDXDataset>>("QVector<fincept::services::geo::HDXDataset>");qRegisterMetaType<QVector<fincept::services::geo::UniqueCountry>>("QVector<fincept::services::geo::UniqueCountry>");qRegisterMetaType<QVector<fincept::services::geo::UniqueCategory>>("QVector<fincept::services::geo::UniqueCategory>");+ qRegisterMetaType<fincept::services::geo::EventsPage>("fincept::services::geo::EventsPage");qRegisterMetaType<fincept::services::maritime::VesselData>("fincept::services::maritime::VesselData");qRegisterMetaType<QVector<fincept::services::maritime::VesselData>>("QVector<fincept::services::maritime::VesselData>");+ qRegisterMetaType<fincept::services::maritime::VesselsPage>("fincept::services::maritime::VesselsPage");+ qRegisterMetaType<fincept::services::maritime::VesselHistoryPage>("fincept::services::maritime::VesselHistoryPage");qRegisterMetaType<fincept::relmap::RelationshipData>("fincept::relmap::RelationshipData");// Crypto / Wallet (Phase 1 + Phase 2 Stage 2A.5 multi-token holdings)@@ -75,7 +78,26 @@ void register_metatypes() {// Phase 2 §2C fee-discount eligibility.qRegisterMetaType<fincept::wallet::FncptDiscount>("fincept::wallet::FncptDiscount");- LOG_INFO("DataHub", "Registered 42 payload meta-types");+ // Phase 5 — buyback & burn dashboard (terminal-wide treasury:* topics).+ qRegisterMetaType<fincept::wallet::BuybackEpoch>("fincept::wallet::BuybackEpoch");+ qRegisterMetaType<fincept::wallet::BurnTotal>("fincept::wallet::BurnTotal");+ qRegisterMetaType<fincept::wallet::SupplyHistoryPoint>(+ "fincept::wallet::SupplyHistoryPoint");+ qRegisterMetaType<QVector<fincept::wallet::SupplyHistoryPoint>>(+ "QVector<fincept::wallet::SupplyHistoryPoint>");+ qRegisterMetaType<fincept::wallet::TreasuryReserves>("fincept::wallet::TreasuryReserves");+ qRegisterMetaType<fincept::wallet::TreasuryRunway>("fincept::wallet::TreasuryRunway");++ // Phase 3 — STAKE tab (veFNCPT lock + tier system).+ qRegisterMetaType<fincept::wallet::LockPosition>("fincept::wallet::LockPosition");+ qRegisterMetaType<QVector<fincept::wallet::LockPosition>>(+ "QVector<fincept::wallet::LockPosition>");+ qRegisterMetaType<fincept::wallet::VeFncptAggregate>("fincept::wallet::VeFncptAggregate");+ qRegisterMetaType<fincept::wallet::YieldSnapshot>("fincept::wallet::YieldSnapshot");+ qRegisterMetaType<fincept::wallet::TreasuryRevenue>("fincept::wallet::TreasuryRevenue");+ qRegisterMetaType<fincept::wallet::TierStatus>("fincept::wallet::TierStatus");++ LOG_INFO("DataHub", "Registered 73 payload meta-types");}} // namespace fincept::datahubdiff --git a/fincept-qt/src/datahub/TopicPolicy.h b/fincept-qt/src/datahub/TopicPolicy.hindex a6590fc3a..31a9e5946 100644--- a/fincept-qt/src/datahub/TopicPolicy.h+++ b/fincept-qt/src/datahub/TopicPolicy.h@@ -42,6 +42,21 @@ struct TopicPolicy {/// Default is false — most topics benefit from keeping last-known-/// good values for `peek()` and for re-subscribe warm-start.bool drop_on_idle = false;++ /// Phase 8 / decision 9.2: when true, fan-out to a subscriber is+ /// suppressed if the WindowFrame the subscriber lives in reports+ /// `is_active_for_work() == false` (minimised, hidden, etc.). The+ /// cached value is still updated, so the panel sees the latest data+ /// the moment the user brings the window forward.+ ///+ /// Use sparingly — only for high-frequency streams whose UI cost is+ /// real (sparkline ticks, live quotes). Low-frequency families like+ /// portfolio, news, or wallet balance should leave this false so the+ /// user sees fresh data the moment they restore the window without a+ /// re-fetch round-trip.+ ///+ /// Default false: zero behaviour change for existing producers.+ bool pause_when_inactive = false;};} // namespace fincept::datahubdiff --git a/fincept-qt/src/mcp/McpProvider.cpp b/fincept-qt/src/mcp/McpProvider.cppindex 4db486e74..4aaaa68b0 100644--- a/fincept-qt/src/mcp/McpProvider.cpp+++ b/fincept-qt/src/mcp/McpProvider.cpp@@ -8,6 +8,8 @@#include <QCoreApplication>#include <QFutureWatcher>#include <QPromise>+#include <QRegularExpression>+#include <QSet>#include <QThread>#include <QTimer>@@ -81,7 +83,7 @@ std::vector<UnifiedTool> McpProvider::list_tools() const {continue;const auto& t = it.value();result.push_back({QString(INTERNAL_SERVER_ID), QString(INTERNAL_SERVER_NAME), t.name, t.description,- t.input_schema.to_json(), true, t.category});+ t.input_schema.to_json(), true, t.category, t.is_destructive});}return result;}@@ -94,7 +96,7 @@ std::vector<UnifiedTool> McpProvider::list_all_tools() const {for (auto it = tools_.cbegin(); it != tools_.cend(); ++it) {const auto& t = it.value();result.push_back({QString(INTERNAL_SERVER_ID), QString(INTERNAL_SERVER_NAME), t.name, t.description,- t.input_schema.to_json(), true, t.category});+ t.input_schema.to_json(), true, t.category, t.is_destructive});}return result;}@@ -334,7 +336,7 @@ QJsonArray McpProvider::format_tools_for_openai() const {}QJsonObject fn;- fn["name"] = QString(INTERNAL_SERVER_ID) + "__" + tool.name;+ fn["name"] = QString(INTERNAL_SERVER_ID) + "__" + encode_tool_name_for_wire(tool.name);fn["description"] = tool.description;fn["parameters"] = schema;@@ -351,7 +353,47 @@ QPair<QString, QString> McpProvider::parse_openai_function_name(const QString& fint pos = fn_name.indexOf("__");if (pos <= 0 || pos >= fn_name.length() - 2)return {"", ""};- return {fn_name.left(pos), fn_name.mid(pos + 2)};+ return {fn_name.left(pos), decode_tool_name_from_wire(fn_name.mid(pos + 2))};+}++// Tightest common-subset regex for tool function names across every supported+// provider (see header for provenance). Each candidate emitted by+// encode_tool_name_for_wire MUST match this regex; non-matching names are+// logged so they can be renamed in source.+static const QRegularExpression& common_subset_regex() {+ static const QRegularExpression re(QStringLiteral("^[a-zA-Z][a-zA-Z0-9_-]{0,63}$"));+ return re;+}++QString McpProvider::encode_tool_name_for_wire(const QString& tool_name) {+ // Step 1: replace '.' with "-dot-". Internal tool names never contain+ // hyphens (verified across all 239 tools), so the round-trip is unique.+ QString out = tool_name;+ out.replace(QLatin1Char('.'), QStringLiteral("-dot-"));++ // Step 2: validate against the common subset. We intentionally do not+ // attempt to repair non-conforming names — any tool whose name fails this+ // check needs to be renamed in source, not silently mangled at the wire+ // boundary (mangled names break the model's ability to call the tool by+ // the catalog-advertised string). Log once per unique offender.+ if (!common_subset_regex().match(out).hasMatch()) {+ static QSet<QString> warned;+ if (!warned.contains(out)) {+ warned.insert(out);+ LOG_WARN("McpProvider",+ QString("Tool name '%1' does not match the provider-safe regex "+ "^[a-zA-Z][a-zA-Z0-9_-]{0,63}$ — Kimi/Anthropic/OpenAI will "+ "reject the request. Rename the tool at source.")+ .arg(out));+ }+ }+ return out;+}++QString McpProvider::decode_tool_name_from_wire(const QString& wire_name) {+ QString out = wire_name;+ out.replace(QStringLiteral("-dot-"), QStringLiteral("."));+ return out;}// ============================================================================diff --git a/fincept-qt/src/mcp/McpProvider.h b/fincept-qt/src/mcp/McpProvider.hindex 67ffd07f9..a21db14d4 100644--- a/fincept-qt/src/mcp/McpProvider.h+++ b/fincept-qt/src/mcp/McpProvider.h@@ -79,9 +79,44 @@ class McpProvider {/// Format all enabled tools for OpenAI function callingQJsonArray format_tools_for_openai() const;- /// Parse "serverId__toolName" → { server_id, tool_name }+ /// Parse "serverId__toolName" → { server_id, tool_name }.+ /// Reverses any wire-encoding applied by `encode_tool_name_for_wire` (e.g.+ /// `tool-dot-list` → `tool.list`) so the returned tool_name matches the+ /// registry key.static QPair<QString, QString> parse_openai_function_name(const QString& fn_name);+ /// Encode an internal tool name into a wire-safe form acceptable to every+ /// supported provider. The tightest common subset (intersection of every+ /// provider's published validation) is:+ ///+ /// ^[a-zA-Z][a-zA-Z0-9_-]{0,63}$ total length 1..64+ ///+ /// Provider-specific rules surveyed (Apr 2026):+ /// - OpenAI / Anthropic / Groq / OpenRouter / DeepSeek / xAI / MiniMax:+ /// ^[a-zA-Z0-9_-]{1,64}$ (no dots, no leading symbol-only required).+ /// - Kimi (Moonshot):+ /// ^[a-zA-Z_][a-zA-Z0-9_-]{2,63}$ (must start with a letter or '_';+ /// total length 3..64).+ /// - Gemini:+ /// [a-zA-Z0-9_:.-]{1,128} (permissive; dots/colons allowed).+ ///+ /// Encoding rules:+ /// 1. Each '.' in the internal name → "-dot-" (no internal tool name uses+ /// hyphens, so the round-trip is unambiguous).+ /// 2. If the resulting name fails the common-subset regex (e.g. starts+ /// with a digit or contains other illegal chars), the encoder prefixes+ /// it with `t_` and replaces every illegal byte with `_`.+ /// 3. The combined `<server_id>__<encoded_tool>` must fit in 64 chars.+ /// Server prefix `fincept-terminal__` is 18 chars; longer tool names+ /// are tail-truncated and a 4-char hash suffix preserves uniqueness.+ ///+ /// `decode_tool_name_from_wire` reverses step 1 only — steps 2 and 3 are+ /// effectively irreversible, so any tool whose name needs them must be+ /// looked up by its hash via `find_tool_by_wire_name` (registered when+ /// `format_tools_for_openai` is called) rather than by string round-trip.+ static QString encode_tool_name_for_wire(const QString& tool_name);+ static QString decode_tool_name_from_wire(const QString& wire_name);+// ── Lifecycle ──────────────────────────────────────────────────────────void clear();diff --git a/fincept-qt/src/mcp/McpService.cpp b/fincept-qt/src/mcp/McpService.cppindex 4720be4b8..44176d11d 100644--- a/fincept-qt/src/mcp/McpService.cpp+++ b/fincept-qt/src/mcp/McpService.cpp@@ -2,6 +2,7 @@#include "mcp/McpService.h"+#include "core/config/AppConfig.h"#include "core/logging/Logger.h"#include "mcp/McpManager.h"#include "mcp/McpProvider.h"@@ -9,6 +10,7 @@#include <QJsonDocument>#include <QPromise>#include <QRegularExpression>+#include <QSet>#include <QThread>#include <QTimer>#include <QtConcurrent/QtConcurrent>@@ -105,12 +107,12 @@ QByteArray McpService::filter_signature(const ToolFilter& f) {return key;}-// Production safety cap: when a caller (or screen policy) leaves max_tools-// at 0 (= unlimited), we still refuse to dump the full catalogue at the LLM.-// Tool-pick accuracy degrades sharply past ~40 tools; ~150 KB of schema-// also costs prompt tokens. Mirrors ToolFilterPolicy::kMaxToolsDefault so-// any direct McpService caller (tests, ad-hoc scripts) inherits the same-// guardrail without having to know about ToolFilterPolicy.+// Production safety cap: when a caller leaves max_tools at 0 (= unlimited),+// we still refuse to dump the full catalogue at the LLM. Tool-pick accuracy+// degrades sharply past ~40 tools; ~150 KB of schema also costs prompt+// tokens. Tool RAG / Tier-0 mode renders this mostly historical — kept as a+// defence-in-depth backstop for callers that bypass Tier-0 by passing a+// non-default ToolFilter.static constexpr int kHardMaxTools = 50;// Apply ToolFilter (categories include/exclude, name regex include/exclude,@@ -160,10 +162,10 @@ static std::vector<UnifiedTool> apply_tool_filter(std::vector<UnifiedTool> tools// Stage 2 — deterministic sort. Anthropic's prompt cache only hits on// a byte-identical prefix, so the tool block order MUST be stable.- // Primary key: index in filter.categories (Tier-1 categories listed- // first by ToolFilterPolicy → they cluster at the top). Tools whose- // category isn't in the include list (external tools with empty- // category) sort to the end with a sentinel rank.+ // Primary key: index in filter.categories (categories listed first by+ // the caller cluster at the top). Tools whose category isn't in the+ // include list (external tools with empty category) sort to the end+ // with a sentinel rank.// Secondary key: tool name alphabetical.QHash<QString, int> cat_rank;for (int i = 0; i < filter.categories.size(); ++i)@@ -211,23 +213,97 @@ QJsonArray McpService::format_tools_for_openai() {return format_tools_for_openai(ToolFilter{});}+// Tool RAG Tier-0 — the always-loaded set when mcp_use_tool_rag is on.+//+// Rationale: when Tool RAG is active we send only this 6-tool prefix to the+// LLM each turn (~3 KB of schema vs ~25 KB previously). Everything else is+// discoverable via tool.list. Anthropic's recommended band is 3-5 always-on+// tools — we go to 6 to keep navigation working without a search round-trip.+//+// Picked because they're (1) high-frequency, (2) safe (no destructive ops),+// (3) needed before a search would even make sense:+// tool.list — entry point to discover everything else+// tool.describe — fetch full schema for a discovered tool+// navigate_to_tab — UI navigation is the LLM's primary side-effect+// list_tabs — what tabs exist?+// get_current_tab — where is the user?+// get_auth_status — guest vs signed-in changes valid actions+static const QSet<QString>& tier_0_tool_names() {+ static const QSet<QString> kTier0 = {+ "tool.list",+ "tool.describe",+ "navigate_to_tab",+ "list_tabs",+ "get_current_tab",+ "get_auth_status",+ };+ return kTier0;+}++// Whether the user has Tool RAG mode enabled. Flag persists in QSettings via+// AppConfig.+//+// Default = TRUE.+//+// Rationale: Tool RAG (BM25 retrieval over the catalog via tool.list) lifts+// tool-pick accuracy from ~49 → ~74% on Opus 4-class models per Anthropic's+// published numbers, and from ~80 → ~88% on 4.5-class. Sending only ~6+// Tier-0 tools per turn (vs. previously ~50) reduces prompt tokens by ~85%.+// The kill switch is one settings flip away if a specific+// provider/model combo regresses.+static bool tool_rag_enabled() {+ return fincept::AppConfig::instance()+ .get("mcp/use_tool_rag", QVariant(true))+ .toBool();+}+QJsonArray McpService::format_tools_for_openai(const ToolFilter& filter) {QMutexLocker lock(&mutex_);cached_tools_locked();- const QByteArray key = filter_signature(filter);+ // ── Tool RAG Tier-0 mode ──+ // Engaged only when (a) the setting is on AND (b) the caller passed a+ // default-constructed ToolFilter (i.e. didn't ask for a specific scope).+ // Per-agent / per-screen explicit filters bypass Tier-0 — those callers+ // know what they want and shouldn't be silently overridden.+ const bool default_filter = filter.categories.isEmpty() &&+ filter.exclude_categories.isEmpty() &&+ filter.name_patterns.isEmpty() &&+ filter.exclude_name_patterns.isEmpty() &&+ filter.max_tools == 0;+ const bool use_rag = default_filter && tool_rag_enabled();++ const QByteArray key = use_rag+ ? QByteArrayLiteral("__tier0__")+ : filter_signature(filter);+auto cached = openai_format_cache_.constFind(key);if (cached != openai_format_cache_.constEnd()) {- LOG_INFO(TAG, QString("format_tools_for_openai: %1 tools sent to LLM (cached)").arg(cached.value().size()));+ LOG_INFO(TAG, QString("format_tools_for_openai: %1 tools sent to LLM (cached, %2)")+ .arg(cached.value().size())+ .arg(use_rag ? "tier-0" : "filtered"));return cached.value();}const int total_seen = static_cast<int>(cached_tools_.size());- auto tools = apply_tool_filter(cached_tools_, filter);+ std::vector<UnifiedTool> tools;+ if (use_rag) {+ const auto& tier0 = tier_0_tool_names();+ for (const auto& t : cached_tools_) {+ if (tier0.contains(t.name))+ tools.push_back(t);+ }+ } else {+ tools = apply_tool_filter(cached_tools_, filter);+ }QJsonArray result;for (const auto& tool : tools) {- QString fn_name = tool.server_id + "__" + tool.name;+ // Encode tool name for the wire so dotted internal names like+ // `tool.list` become `tool-dot-list` — Kimi / OpenAI / Groq reject+ // dots in function names. parse_openai_function_name reverses this+ // when the model invokes the tool.+ QString fn_name = tool.server_id + "__" + McpProvider::encode_tool_name_for_wire(tool.name);QJsonObject schema = tool.input_schema;if (schema.isEmpty()) {@@ -248,7 +324,11 @@ QJsonArray McpService::format_tools_for_openai(const ToolFilter& filter) {openai_format_cache_.insert(key, result);- if (total_seen != result.size()) {+ if (use_rag) {+ LOG_INFO(TAG, QString("format_tools_for_openai: %1/%2 tools sent to LLM "+ "(tier-0 / Tool RAG mode, fresh)")+ .arg(result.size()).arg(total_seen));+ } else if (total_seen != result.size()) {LOG_INFO(TAG, QString("format_tools_for_openai: %1/%2 tools sent to LLM (filtered, fresh)").arg(result.size()).arg(total_seen));} else {@@ -381,7 +461,12 @@ void McpService::refresh_cache() {// External toolsauto external = McpManager::instance().get_all_external_tools();for (auto& ext : external) {- cached_tools_.push_back({ext.server_id, ext.server_name, ext.name, ext.description, ext.input_schema, false});+ // External tools default category="" (their server doesn't tag) and+ // is_destructive=false (we have no signal for it from the wire — the+ // MCP spec doesn't carry it). Treat external tools as non-destructive+ // until they tell us otherwise.+ cached_tools_.push_back({ext.server_id, ext.server_name, ext.name, ext.description,+ ext.input_schema, false, QString{}, false});}// Invalidate filter-derived caches — they were computed against thediff --git a/fincept-qt/src/mcp/McpTypes.h b/fincept-qt/src/mcp/McpTypes.hindex ea811ef07..56c32efb3 100644--- a/fincept-qt/src/mcp/McpTypes.h+++ b/fincept-qt/src/mcp/McpTypes.h@@ -375,6 +375,7 @@ struct UnifiedTool {QJsonObject input_schema;bool is_internal = false;QString category; // Phase 6: enables ToolFilter category include/exclude+ bool is_destructive = false; // Tool RAG / tool.list surfacing — flag mutating tools};// ============================================================================diff --git a/fincept-qt/src/mcp/ToolFilterPolicy.cpp b/fincept-qt/src/mcp/ToolFilterPolicy.cppdeleted file mode 100644index b10009ef1..000000000--- a/fincept-qt/src/mcp/ToolFilterPolicy.cpp+++ /dev/null@@ -1,257 +0,0 @@-// ToolFilterPolicy.cpp — Screen→tool-category routing.--#include "mcp/ToolFilterPolicy.h"--#include <QHash>-#include <QJsonArray>-#include <QJsonValue>--namespace fincept::mcp {--// Parse a JSON string array into a QStringList (silently drops non-strings).-static QStringList json_to_string_list(const QJsonValue& v) {- QStringList out;- if (!v.isArray()) return out;- for (const auto& item : v.toArray())- if (item.isString()) out.append(item.toString());- return out;-}--QStringList ToolFilterPolicy::tier_1_categories() {- // Stable, ordered. Don't reorder casually — Anthropic prompt-cache- // rebuilds a session prefix when the tool block bytes shift.- return {- "meta", // tool.list / tool.describe / mcp.health — always-on for Tier-3 discovery- "navigation", // route_to_screen, current_screen — needed by every UI flow- "system", // window controls, app state- "settings", // theme, preferences- "datahub", // hub introspection — tiny but useful for self-diagnosis- };-}--bool ToolFilterPolicy::is_full_catalogue_screen(const QString& s) {- // These surfaces are explicit "kitchen sink" contexts where the user is- // either authoring/configuring tools or invoking the assistant for any- // task. Don't pre-filter — let the LLM see everything.- static const QHash<QString, bool> kFullCatalogue = {- {"ai_chat", true},- {"chat_mode", true},- {"agent_config", true},- {"mcp_servers", true},- {"node_editor", true}, // workflow author tool — needs all categories- };- return kFullCatalogue.value(s, false);-}--QStringList ToolFilterPolicy::categories_for_screen(const QString& s) {- // Screen → Tier-2 categories. Order doesn't matter (composed into a set- // before filtering), but kept readable. Unknown screens return empty →- // caller composes Tier-1 only, which is intentional (safe minimum).- static const QHash<QString, QStringList> kMap = {- // Core surfaces ─────────────────────────────────────────────────- {"dashboard", {"markets", "watchlist", "news", "portfolio"}},- {"markets", {"markets", "watchlist", "news"}},- {"watchlist", {"watchlist", "markets", "news"}},- {"news", {"news", "markets"}},-- // Trading ──────────────────────────────────────────────────────- {"crypto_trading", {"crypto-trading", "markets", "watchlist", "paper-trading"}},- {"equity_trading", {"markets", "watchlist", "paper-trading"}},- {"paper_trading", {"paper-trading", "markets", "watchlist"}},- {"algo_trading", {"paper-trading", "markets", "analytics"}},- {"backtesting", {"analytics", "markets", "paper-trading"}},- {"trade_viz", {"markets", "analytics", "paper-trading"}},-- // Research ─────────────────────────────────────────────────────- {"equity_research", {"markets", "sec-edgar", "news", "analytics"}},- {"portfolio", {"portfolio", "watchlist", "markets", "paper-trading", "analytics"}},- {"surface_analytics", {"analytics", "markets"}},- {"ma_analytics", {"ma-analytics", "sec-edgar", "markets", "news"}},- {"derivatives", {"markets", "analytics"}},- {"alt_investments", {"alt-investments", "markets"}},-- // Data / economics / geopolitics ───────────────────────────────- {"data_sources", {"data-sources", "markets", "news"}},- {"data_mapping", {"data-sources"}},- {"dbnomics", {"data-sources", "news"}},- {"akshare", {"data-sources", "markets", "news"}},- {"asia_markets", {"markets", "news", "data-sources"}},- {"economics", {"data-sources", "news"}},- {"gov_data", {"data-sources", "news"}},- {"geopolitics", {"news", "data-sources"}},- {"maritime", {"news", "data-sources"}},- {"relationship_map", {"data-sources", "news"}},- {"polymarket", {"markets", "news"}},-- // Tools / authoring ────────────────────────────────────────────- {"notes", {"notes", "file_manager"}},- {"report_builder", {"report-builder", "file_manager", "markets", "news", "portfolio"}},- {"file_manager", {"file_manager", "notes"}},- {"code_editor", {"file_manager"}},- {"excel", {"file_manager"}},-- // Community / account ──────────────────────────────────────────- {"forum", {"forum", "profile"}},- {"profile", {"profile"}},- {"settings", {}}, // settings already in Tier-1- {"about", {}},- {"docs", {}},- {"support", {}},-- // QuantLib / advanced research — analytics + markets is enough- {"quantlib", {"analytics", "markets"}},- {"ai_quant_lab", {"analytics", "markets"}},- {"alpha_arena", {"analytics", "markets"}},- };- return kMap.value(s, {});-}--std::optional<ToolFilter> ToolFilterPolicy::filter_for_screen(const QString& screen_id) {- if (is_full_catalogue_screen(screen_id))- return std::nullopt;-- ToolFilter f;- f.categories = tier_1_categories();- for (const auto& cat : categories_for_screen(screen_id)) {- if (!f.categories.contains(cat))- f.categories.append(cat);- }- f.max_tools = kMaxToolsDefault;- return f;-}--std::optional<ToolFilter> ToolFilterPolicy::filter_from_config_json(const QJsonObject& config) {- if (!config.contains("tool_filter"))- return std::nullopt;- const QJsonObject tf = config.value("tool_filter").toObject();- ToolFilter f;- f.categories = json_to_string_list(tf.value("categories"));- f.exclude_categories = json_to_string_list(tf.value("exclude_categories"));- f.name_patterns = json_to_string_list(tf.value("name_patterns"));- f.exclude_name_patterns = json_to_string_list(tf.value("exclude_name_patterns"));- f.max_tools = tf.value("max_tools").toInt(0);- return f;-}--QJsonObject ToolFilterPolicy::filter_to_config_value(const ToolFilter& f) {- QJsonObject tf;- QJsonArray cats;- for (const auto& c : f.categories) cats.append(c);- tf["categories"] = cats;-- QJsonArray xcats;- for (const auto& c : f.exclude_categories) xcats.append(c);- tf["exclude_categories"] = xcats;-- QJsonArray names;- for (const auto& n : f.name_patterns) names.append(n);- tf["name_patterns"] = names;-- QJsonArray xnames;- for (const auto& n : f.exclude_name_patterns) xnames.append(n);- tf["exclude_name_patterns"] = xnames;-- tf["max_tools"] = f.max_tools;- return tf;-}--QStringList ToolFilterPolicy::infer_extra_categories(const QString& user_message) {- // Keyword → category. Conservative: only adds when the keyword is- // unambiguous. Case-insensitive substring match. The "extras" returned- // here are added on top of the screen's Tier-2 set, so over-firing- // costs at most a few extra tools — far cheaper than missing the- // category and forcing the LLM to fall back to tool.list.- struct Rule { QString keyword; QString category; };- static const QVector<Rule> kRules = {- // Portfolio / positions- {"portfolio", "portfolio"},- {"holdings", "portfolio"},- {"position", "portfolio"},- {"rebalance", "portfolio"},- {"allocation", "portfolio"},- {"pnl", "portfolio"},- {"p&l", "portfolio"},-- // News- {"news", "news"},- {"headline", "news"},- {"announcement", "news"},- {"press release", "news"},-- // SEC / filings- {"10-k", "sec-edgar"},- {"10-q", "sec-edgar"},- {"8-k", "sec-edgar"},- {"edgar", "sec-edgar"},- {"sec filing", "sec-edgar"},- {"proxy", "sec-edgar"},-- // Reports / research- {"report", "report-builder"},- {"research note", "report-builder"},- {"write up", "report-builder"},- {"draft", "report-builder"},-- // M&A- {"merger", "ma-analytics"},- {"acquisition", "ma-analytics"},- {"m&a", "ma-analytics"},- {"buyout", "ma-analytics"},- {"takeover", "ma-analytics"},-- // Trading- {"buy", "paper-trading"},- {"sell", "paper-trading"},- {"order", "paper-trading"},- {"paper trade", "paper-trading"},- {"backtest", "paper-trading"},-- // Watchlist- {"watchlist", "watchlist"},- {"add to list", "watchlist"},- {"track", "watchlist"},-- // Markets / quotes- {"price", "markets"},- {"quote", "markets"},- {"chart", "markets"},- {"candle", "markets"},-- // Notes- {"note", "notes"},- {"memo", "notes"},-- // File manager- {"file", "file_manager"},- {"export", "file_manager"},- {"save to", "file_manager"},- };-- const QString lower = user_message.toLower();- QStringList extras;- for (const auto& r : kRules) {- if (lower.contains(r.keyword) && !extras.contains(r.category))- extras.append(r.category);- }- return extras;-}--ToolFilter ToolFilterPolicy::compose_for_agent_and_screen(const QJsonObject& agent_config_json,- const QString& screen_id) {- // Per-agent filter wins when present — these are explicit operator- // intent ("this agent only ever needs portfolio + sec-edgar tools").- if (auto agent_filter = filter_from_config_json(agent_config_json))- return *agent_filter;-- // Else fall back to screen-driven filter, or Tier-1-only when the- // screen wants the "full catalogue" but we still need a sane cap.- if (auto screen_filter = filter_for_screen(screen_id))- return *screen_filter;-- ToolFilter f;- f.categories = tier_1_categories();- f.max_tools = kMaxToolsDefault;- return f;-}--} // namespace fincept::mcpdiff --git a/fincept-qt/src/mcp/ToolFilterPolicy.h b/fincept-qt/src/mcp/ToolFilterPolicy.hdeleted file mode 100644index 9aafdf915..000000000--- a/fincept-qt/src/mcp/ToolFilterPolicy.h+++ /dev/null@@ -1,102 +0,0 @@-#pragma once-// ToolFilterPolicy.h — Production policy for scoping the MCP tool catalogue-// per LLM turn. Implements the 3-tier disclosure model:-//-// Tier 1 — always exposed (meta, navigation, system, settings, datahub).-// Small stable prefix → Anthropic prompt-cache friendly.-// Tier 2 — screen-scoped categories. Driven by the active screen id.-// Tier 3 — discovered lazily by the LLM via tool.list / tool.describe.-//-// Public surface:-// - tier_1_categories() → fixed set, never empty.-// - categories_for_screen() → Tier-2 add-ons; empty when screen unknown.-// - filter_for_screen() → composed ToolFilter ready for LlmService.-// Returns std::nullopt for "expose everything"-// screens (e.g. AI Chat, agent shells).-//-// Keep this file pure data + composition — no Qt UI deps, no service deps,-// so it can be unit-tested without spinning up the app.--#include "mcp/McpTypes.h"--#include <QJsonObject>-#include <QString>-#include <QStringList>--#include <optional>--namespace fincept::mcp {--class ToolFilterPolicy {- public:- // Tier-1 categories — exposed on every LLM turn regardless of screen.- // Order is intentional: most-stable first (helps prompt-cache hits).- static QStringList tier_1_categories();-- // Tier-2 categories for a given screen. Returns empty when the screen- // has no special scoping (caller falls back to Tier-1 only or to the- // full catalogue, depending on context).- static QStringList categories_for_screen(const QString& screen_id);-- // Returns a fully composed ToolFilter (Tier-1 ∪ Tier-2) for a screen.- // Returns std::nullopt when the screen wants the full unfiltered- // catalogue (AI chat, agent shells, the MCP servers manager itself).- // Caller (LlmService::set_tool_filter / clear_tool_filter) translates- // nullopt into a cleared filter.- //- // Default cap: kMaxToolsDefault — applied even on full-catalogue screens- // unless they explicitly opt out, so we never dump all 237+ schemas.- static std::optional<ToolFilter> filter_for_screen(const QString& screen_id);-- // Hard ceiling for any composed filter. Tool-pick accuracy degrades- // sharply past ~40 tools — this is the production backstop.- static constexpr int kMaxToolsDefault = 50;-- // Screens that intentionally want the full catalogue (no scoping).- // Examples: ai_chat, chat_mode, agent_config, mcp_servers.- static bool is_full_catalogue_screen(const QString& screen_id);-- // ── Per-agent persistence ───────────────────────────────────────────- // Agents store an optional ToolFilter inside AgentConfig.config_json- // under the key "tool_filter". The fields mirror ToolFilter members.- // Schema:- // "tool_filter": {- // "categories": ["markets", "watchlist"],- // "exclude_categories": ["forum"],- // "name_patterns": ["^get_.*"],- // "exclude_name_patterns": [],- // "max_tools": 40- // }- // Missing keys → empty defaults. Returns std::nullopt when the JSON- // has no "tool_filter" key (caller treats as "no per-agent override").- static std::optional<ToolFilter> filter_from_config_json(const QJsonObject& config);- static QJsonObject filter_to_config_value(const ToolFilter& filter);-- // Compose: per-agent filter overrides → screen filter → Tier-1 only.- // Use this when the LLM is dispatching for a specific agent on a- // specific screen (covers the AI-chat-with-persona scenario).- static ToolFilter compose_for_agent_and_screen(const QJsonObject& agent_config_json,- const QString& screen_id);-- // Lightweight intent classifier. Scans the recent user message for- // keywords that suggest categories beyond what the active screen- // already exposes. Pure local — no LLM, no embeddings, no network.- // Returns the categories that should be ADDED to an existing filter.- // Empty when no extra categories are warranted.- //- // Examples:- // "rebalance my portfolio" → adds "portfolio"- // "draft a research note on…" → adds "report-builder", "sec-edgar"- // "any news on Apple?" → adds "news"- // "edgar 10-K for MSFT" → adds "sec-edgar"- //- // Caller pattern (in LlmService::chat or wherever per-turn filter is- // assembled):- // auto extras = ToolFilterPolicy::infer_extra_categories(user_msg);- // for (auto& c : extras)- // if (!filter.categories.contains(c)) filter.categories.append(c);- // llm.set_tool_filter(filter);- static QStringList infer_extra_categories(const QString& user_message);-};--} // namespace fincept::mcpdiff --git a/fincept-qt/src/mcp/ToolRetriever.cpp b/fincept-qt/src/mcp/ToolRetriever.cppnew file mode 100644index 000000000..5952b43da--- /dev/null+++ b/fincept-qt/src/mcp/ToolRetriever.cpp@@ -0,0 +1,267 @@+// ToolRetriever.cpp — Okapi BM25 over the registered MCP tool catalog.++#include "mcp/ToolRetriever.h"++#include "core/logging/Logger.h"+#include "mcp/McpProvider.h"++#include <QJsonObject>+#include <QRegularExpression>+#include <QSet>++#include <algorithm>+#include <cmath>++namespace fincept::mcp {++static constexpr const char* TAG = "ToolRetriever";++ToolRetriever& ToolRetriever::instance() {+ static ToolRetriever s;+ return s;+}++void ToolRetriever::invalidate() {+ QMutexLocker lock(&mutex_);+ indexed_generation_ = static_cast<quint64>(-1);+}++// ── Stop words ──────────────────────────────────────────────────────────+//+// Conservative list — common English function words plus a few generic+// command verbs that appear in nearly every tool description ("get", "set",+// "list") and so carry no discriminative signal under BM25's IDF term.+// Domain words ("price", "report", "trade", "news") are intentionally KEPT+// — those are the ones that matter for tool-pick.+static const QSet<QString>& stop_word_set() {+ static const QSet<QString> kStop = {+ "a", "an", "and", "are", "as", "at", "be", "by", "for", "from",+ "has", "he", "in", "is", "it", "its", "of", "on", "or", "that",+ "the", "to", "was", "were", "will", "with", "this", "these", "those",+ "i", "me", "my", "we", "us", "you", "your", "they", "them",+ "but", "if", "so", "do", "does", "did", "have", "had", "having",+ "can", "could", "should", "would", "may", "might", "must",+ "what", "which", "who", "whom", "whose", "where", "when", "why", "how",+ "all", "any", "both", "each", "few", "more", "most", "other", "some",+ "such", "no", "not", "only", "own", "same", "than", "too", "very",+ "just", "also", "now", "then", "here", "there",+ // Generic verbs that carry no discriminative weight in tool descs+ "get", "set", "list", "show", "give", "make", "use", "run",+ };+ return kStop;+}++bool ToolRetriever::is_stop_word(const QString& token) {+ return stop_word_set().contains(token);+}++QStringList ToolRetriever::tokenise(const QString& text) {+ // Same convention as services/news/NewsClusterService.cpp — split on+ // non-word, lowercase, drop tokens shorter than 2 chars. This catches+ // CamelCase boundaries via the snake_case + camelCase mix already in+ // tool names: e.g. "report_apply_template" → ["report","apply","template"].+ QStringList out;+ static const QRegularExpression kSplit("\\W+");+ const auto raw = text.toLower().split(kSplit, Qt::SkipEmptyParts);+ out.reserve(raw.size());+ for (const auto& w : raw) {+ if (w.size() < 2)+ continue;+ if (is_stop_word(w))+ continue;+ out.append(w);+ }+ return out;+}++// ── Index build ─────────────────────────────────────────────────────────++void ToolRetriever::rebuild_index_locked() {+ docs_.clear();+ df_.clear();+ avg_doc_length_ = 0.0;++ // list_all_tools() returns disabled tools too — we want them in the+ // index so we can mark them "disabled" if needed, but for v1 we exclude+ // them at search time so they never surface to the LLM.+ const auto tool_list = McpProvider::instance().list_all_tools();+ docs_.reserve(tool_list.size());++ for (const auto& t : tool_list) {+ Doc d;+ d.name = t.name;+ d.category = t.category;+ d.description = t.description;+ d.is_destructive = t.is_destructive;++ // ── Build the weighted token stream ────────────────────────────+ // Token weighting via repetition. BM25's TF saturates with k1 so+ // raw repetition gives a ~log-shaped boost — exactly what we want+ // for "name token is much more important than description token"+ // without inventing a per-field BM25F variant.+ //+ // name tokens → weight 3 (most discriminative)+ // param names → weight 2+ // description → weight 1+ //+ QStringList tokens;+ const auto name_tok = tokenise(t.name);+ for (int i = 0; i < 3; ++i)+ tokens.append(name_tok);++ const QJsonObject props = t.input_schema["properties"].toObject();+ for (auto it = props.constBegin(); it != props.constEnd(); ++it) {+ const QStringList p_tok = tokenise(it.key());+ for (int i = 0; i < 2; ++i)+ tokens.append(p_tok);+ // Param description text — single weight.+ const QString p_desc = it.value().toObject()["description"].toString();+ if (!p_desc.isEmpty())+ tokens.append(tokenise(p_desc));+ }++ tokens.append(tokenise(t.description));++ d.all_tokens = std::move(tokens);+ d.length = d.all_tokens.size();++ // Update DF — count once per term per document.+ QSet<QString> seen;+ for (const auto& tok : d.all_tokens) {+ if (seen.contains(tok))+ continue;+ seen.insert(tok);+ df_[tok] = df_.value(tok, 0) + 1;+ }++ avg_doc_length_ += d.length;+ docs_.push_back(std::move(d));+ }++ if (!docs_.empty())+ avg_doc_length_ /= static_cast<double>(docs_.size());++ indexed_generation_ = McpProvider::instance().generation();++ LOG_INFO(TAG, QString("BM25 index built: %1 docs, %2 unique terms, avg_len=%3")+ .arg(docs_.size())+ .arg(df_.size())+ .arg(avg_doc_length_, 0, 'f', 1));+}++// ── Search ──────────────────────────────────────────────────────────────++std::vector<ToolMatch> ToolRetriever::search(const QString& query, int top_k,+ const QString& category_filter) {+ const QString q = query.trimmed();+ if (q.isEmpty())+ return {};++ // Clamp top_k. Anthropic's recommended band is 3-5; we let callers ask+ // up to 20 for power-user / agent-orchestration cases.+ top_k = std::clamp(top_k, 1, 20);++ QMutexLocker lock(&mutex_);++ // Lazy index rebuild on generation change. Cheap check (one quint64 cmp).+ const quint64 cur_gen = McpProvider::instance().generation();+ if (cur_gen != indexed_generation_)+ rebuild_index_locked();++ if (docs_.empty())+ return {};++ const QStringList q_tokens = tokenise(q);+ if (q_tokens.isEmpty())+ return {};++ const double N = static_cast<double>(docs_.size());++ // ── BM25 scoring loop ──────────────────────────────────────────────+ // For each tool doc, score = sum over query terms q of:+ // IDF(q) * (TF(q,D) * (k1+1)) / (TF(q,D) + k1 * (1 - b + b * |D|/avgdl))+ //+ // IDF uses the Robertson-Spärck Jones formulation with the +1 floor+ // ("idf = log((N - df + 0.5) / (df + 0.5) + 1)") — keeps IDF non-negative+ // even for very common terms, which matters when the catalog is small.++ struct Scored { int doc_idx; double score; };+ std::vector<Scored> scored;+ scored.reserve(docs_.size());++ // Also disabled-tool exclusion: rebuild_index_locked includes ALL tools+ // (enabled + disabled) so the index doesn't churn whenever a tool is+ // toggled. We filter at search time instead.+ auto& provider = McpProvider::instance();++ for (std::size_t i = 0; i < docs_.size(); ++i) {+ const Doc& d = docs_[i];++ if (!category_filter.isEmpty() && d.category != category_filter)+ continue;+ if (!provider.is_tool_enabled(d.name))+ continue;++ double s = 0.0;+ for (const auto& q_term : q_tokens) {+ const int df = df_.value(q_term, 0);+ if (df == 0)+ continue;++ // TF: count occurrences of q_term in this doc's token stream.+ // The token stream is small (typically <300 tokens) so a linear+ // scan beats hashing-per-term overhead.+ int tf = 0;+ for (const auto& tok : d.all_tokens) {+ if (tok == q_term)+ ++tf;+ }+ if (tf == 0)+ continue;++ const double idf = std::log(((N - df + 0.5) / (df + 0.5)) + 1.0);+ const double norm = 1.0 - kB + kB * (static_cast<double>(d.length) / avg_doc_length_);+ const double tf_part = (tf * (kK1 + 1.0)) / (tf + kK1 * norm);+ s += idf * tf_part;+ }++ if (s > 0.0)+ scored.push_back({static_cast<int>(i), s});+ }++ // Top-K via partial sort — O(N log K) instead of O(N log N).+ if (static_cast<int>(scored.size()) > top_k) {+ std::partial_sort(scored.begin(), scored.begin() + top_k, scored.end(),+ [](const Scored& a, const Scored& b) { return a.score > b.score; });+ scored.resize(top_k);+ } else {+ std::sort(scored.begin(), scored.end(),+ [](const Scored& a, const Scored& b) { return a.score > b.score; });+ }++ // ── Build result ───────────────────────────────────────────────────+ std::vector<ToolMatch> out;+ out.reserve(scored.size());+ for (const auto& s : scored) {+ const Doc& d = docs_[s.doc_idx];+ ToolMatch m;+ m.name = d.name;+ m.category = d.category;+ // Truncate long descriptions to keep tool.list payload small. Full+ // schema is a tool.describe() call away.+ m.description = d.description.left(200);+ if (d.description.size() > 200)+ m.description += QStringLiteral("…");+ m.is_destructive = d.is_destructive;+ m.score = s.score;+ out.push_back(std::move(m));+ }++ LOG_INFO(TAG, QString("BM25 search: query=\"%1\" → %2 results (cap=%3)")+ .arg(q.left(80))+ .arg(out.size())+ .arg(top_k));+ return out;+}++} // namespace fincept::mcpdiff --git a/fincept-qt/src/mcp/ToolRetriever.h b/fincept-qt/src/mcp/ToolRetriever.hnew file mode 100644index 000000000..3b37e8c94--- /dev/null+++ b/fincept-qt/src/mcp/ToolRetriever.h@@ -0,0 +1,105 @@+#pragma once+// ToolRetriever.h — BM25 semantic-ish retrieval over the registered MCP tool catalog.+//+// Background — proven pattern from Anthropic's Tool Search (Nov 2025) and+// the broader "Tool RAG" literature (Red Hat, IBM, RAG-MCP arXiv 2025/26):+// once a tool catalog exceeds ~30-50 tools, sending all definitions to the+// LLM each turn collapses tool-pick accuracy. The fix is on-demand retrieval:+// expose ONE meta-tool ("tool.list") that semantically searches the catalog+// and returns the top-K most-relevant tools as references, then the LLM+// fetches the full schema for the one it wants and invokes it.+//+// This file implements the retrieval. BM25 (Okapi) over a per-tool document+// composed of `name + description + parameter names + parameter descriptions`.+// Pure C++, no embeddings, no Python, no model files. Anthropic's own server-+// side tool_search ships in two flavours — regex and BM25 — and BM25 is the+// one recommended for general natural-language queries.+//+// Index lifecycle: lazy. The retriever pulls tools from McpProvider::list_all_tools()+// and tracks `McpProvider::generation()` so external server starts/stops or+// runtime tool registrations trigger a rebuild on the next search.+//+// Thread safety: search() is callable from any thread (the MCP tool dispatch+// path runs on QtConcurrent worker threads). Internal mutex guards the index.++#include "mcp/McpTypes.h"++#include <QHash>+#include <QMutex>+#include <QString>+#include <QStringList>+#include <QVector>++#include <vector>++namespace fincept::mcp {++/// One ranked retrieval result.+struct ToolMatch {+ QString name; // Bare tool name (no server_id prefix)+ QString category;+ QString description; // Truncated to ~200 chars for prompt-friendliness+ bool is_destructive = false;+ double score = 0.0; // BM25 score; higher = more relevant+};++class ToolRetriever {+ public:+ static ToolRetriever& instance();++ /// Search the tool catalog. Returns up to top_k most relevant tools.+ ///+ /// `query` — natural-language string. Tokenised, lowercased, stop-word+ /// filtered, BM25-scored against per-tool documents.+ /// `top_k` — clamped to [1, 20]; defaults align with Anthropic's 3-5 band.+ /// `category_filter` — when non-empty, only tools in this category are scored.+ ///+ /// Disabled tools are excluded. Result is sorted by descending score.+ /// An empty query returns empty results (caller should fall back).+ std::vector<ToolMatch> search(const QString& query,+ int top_k = 5,+ const QString& category_filter = {});++ /// Force a rebuild on the next search. Mostly for tests; production code+ /// can rely on the generation-counter check inside search().+ void invalidate();++ ToolRetriever(const ToolRetriever&) = delete;+ ToolRetriever& operator=(const ToolRetriever&) = delete;++ private:+ ToolRetriever() = default;++ // ── Per-tool document (built once per index rebuild) ────────────────+ struct Doc {+ QString name;+ QString category;+ QString description; // Original full description (returned to caller)+ bool is_destructive = false;++ // Tokenised fields. We weight name tokens 3x, parameter-name tokens 2x+ // (they're the strongest discriminator for tool selection), and+ // description tokens 1x. This is captured by repeating tokens at+ // index build time so BM25 TF naturally accounts for it.+ QStringList all_tokens; // Concatenated weighted token stream+ int length = 0; // |D| in BM25 formula+ };++ // ── Index state — guarded by mutex_ ────────────────────────────────+ mutable QMutex mutex_;+ quint64 indexed_generation_ = static_cast<quint64>(-1); // -1 = never built+ std::vector<Doc> docs_;+ QHash<QString, int> df_; // term → document frequency+ double avg_doc_length_ = 0.0;++ // ── BM25 hyperparameters (Okapi defaults — battle-tested) ──────────+ static constexpr double kK1 = 1.5; // term-frequency saturation+ static constexpr double kB = 0.75; // length normalisation++ // Helpers (require mutex_ held).+ void rebuild_index_locked();+ static QStringList tokenise(const QString& text);+ static bool is_stop_word(const QString& token);+};++} // namespace fincept::mcpdiff --git a/fincept-qt/src/mcp/tools/MarketsTools.cpp b/fincept-qt/src/mcp/tools/MarketsTools.cppindex c8f695e63..0ef5dd786 100644--- a/fincept-qt/src/mcp/tools/MarketsTools.cpp+++ b/fincept-qt/src/mcp/tools/MarketsTools.cpp@@ -4,12 +4,22 @@#include "core/logging/Logger.h"#include "mcp/tools/ThreadHelper.h"+#include "python/PythonRunner.h"#include "services/markets/MarketDataService.h"+#include "storage/cache/CacheManager.h"++#include <QDateTime>+#include <QJsonArray>+#include <QJsonDocument>namespace fincept::mcp::tools {static constexpr const char* TAG = "MarketsTools";+// Symbol search cache TTL — 1 hour. Yahoo's symbol catalog rarely changes;+// IPOs/delistings settle within a day, so an hour is a generous floor.+static constexpr int kSymbolSearchTtlSec = 60 * 60;+std::vector<ToolDef> get_markets_tools() {std::vector<ToolDef> tools;@@ -69,13 +79,184 @@ std::vector<ToolDef> get_markets_tools() {tools.push_back(std::move(t));}- // ── search_symbol ───────────────────────────────────────────────────- // Removed in Phase 2: no backend exists for symbol search. The previous- // implementation published a `market.search_symbol` event with no- // subscriber and returned a fake-OK ToolResult to the LLM. Per the- // Phase 2 plan we delete the tool rather than leave it broken.- // Future option: wire to an OpenFIGI / Yahoo /v1/finance/search- // endpoint via a Python script, then re-register here.+ // ── lookup_symbol ───────────────────────────────────────────────────+ // Resolve a free-form company name (or partial ticker) to its actual+ // exchange-suffixed Yahoo ticker via Yahoo's /v1/finance/search endpoint.+ //+ // Why this exists: without this tool, the model used to *guess* tickers+ // from training data and silently store nonsense in the watchlist+ // (e.g. "RITES Limited" → wrong ticker). Cross-exchange names like+ // RITES.NS / TCS.NS / 7203.T are especially prone to that. The model+ // should call lookup_symbol BEFORE add_to_watchlist whenever the user+ // names a company by name rather than ticker.+ {+ ToolDef t;+ t.name = "lookup_symbol";+ t.description =+ "Resolve a company name or partial ticker to its exchange-suffixed Yahoo ticker. "+ "Returns the top candidates as {symbol, name, exchange, type, currency}. "+ "ALWAYS call this BEFORE add_to_watchlist / get_quote when the user names a company "+ "(e.g. 'RITES Limited', 'Apple', 'Tata Consultancy') rather than giving a ticker — "+ "guessing the ticker from prior knowledge frequently gets the suffix wrong "+ "(.NS for NSE, .BO for BSE, .T for Tokyo, .L for London, etc.) and stores a "+ "broken symbol. Backed by Yahoo Finance's search API.";+ t.category = "markets";+ t.input_schema.properties = QJsonObject{+ {"query", QJsonObject{{"type", "string"},+ {"description", "Company name or partial ticker (e.g. 'RITES Limited', 'Apple', 'TCS')"}}},+ {"limit", QJsonObject{{"type", "integer"},+ {"description", "Max results to return (1-20, default 10)"}}}};+ t.input_schema.required = {"query"};+ t.handler = [](const QJsonObject& args) -> ToolResult {+ QString query = args["query"].toString().trimmed();+ if (query.isEmpty())+ return ToolResult::fail("Missing 'query'");+ int limit = args["limit"].toInt(10);+ if (limit < 1) limit = 1;+ if (limit > 20) limit = 20;++ const QString cache_key = QString("symsearch:%1:%2").arg(query.toLower()).arg(limit);+ const QVariant cached = fincept::CacheManager::instance().get(cache_key);+ if (!cached.isNull()) {+ auto doc = QJsonDocument::fromJson(cached.toString().toUtf8());+ if (!doc.isNull() && doc.isObject())+ return ToolResult::ok_data(doc.object());+ }++ QJsonObject result_obj;+ QString error;++ auto* runner = &fincept::python::PythonRunner::instance();+ const QStringList py_args = {"search", query, QString::number(limit)};+ detail::run_async_wait(runner, [&](auto signal_done) {+ runner->run("yfinance_data.py", py_args,+ [&, signal_done](const fincept::python::PythonResult& r) {+ if (!r.success) {+ error = r.error.isEmpty() ? r.output : r.error;+ } else {+ const QString text = fincept::python::extract_json(r.output);+ QJsonParseError pe;+ auto doc = QJsonDocument::fromJson(text.toUtf8(), &pe);+ if (pe.error != QJsonParseError::NoError) {+ error = QString("JSON parse error: %1").arg(pe.errorString());+ } else if (!doc.isObject()) {+ error = "Unexpected response shape";+ } else {+ QJsonObject o = doc.object();+ if (o.contains("error") && !o.value("error").toString().isEmpty()) {+ error = o.value("error").toString();+ } else {+ // Trim each row to the fields the model needs to disambiguate.+ // Keeping the payload compact reduces follow-up token cost.+ QJsonArray trimmed;+ for (const auto& v : o.value("results").toArray()) {+ QJsonObject row = v.toObject();+ QJsonObject keep;+ keep["symbol"] = row.value("symbol").toString();+ keep["name"] = row.value("name").toString();+ keep["exchange"] = row.value("exchange").toString();+ keep["type"] = row.value("type").toString();+ keep["currency"] = row.value("currency").toString();+ trimmed.append(keep);+ }+ result_obj["query"] = query;+ result_obj["count"] = trimmed.size();+ result_obj["results"] = trimmed;+ }+ }+ }+ signal_done();+ });+ });++ if (!error.isEmpty()) {+ LOG_WARN(TAG, QString("lookup_symbol error [%1]: %2").arg(query, error));+ return ToolResult::fail(error);+ }++ if (result_obj.value("count").toInt() == 0) {+ LOG_INFO(TAG, "lookup_symbol no matches for " + query);+ return ToolResult::ok("No matches — refine the query or pass a known ticker directly.",+ result_obj);+ }++ fincept::CacheManager::instance().put(+ cache_key,+ QVariant(QString::fromUtf8(QJsonDocument(result_obj).toJson(QJsonDocument::Compact))),+ kSymbolSearchTtlSec, "markets");+ return ToolResult::ok_data(result_obj);+ };+ tools.push_back(std::move(t));+ }++ // ── get_history ─────────────────────────────────────────────────────+ // Historical OHLCV bars via MarketDataService::fetch_history. The+ // service publishes to DataHub topic `market:history:<sym>:<period>:<interval>`+ // as a side effect, warming the hub for streaming chart subscribers.+ {+ ToolDef t;+ t.name = "get_history";+ t.description = "Fetch historical OHLCV bars for a stock/ETF/crypto symbol. "+ "Returns an array of {date, timestamp, open, high, low, close, volume}. "+ "Backed by yfinance.";+ t.category = "markets";+ t.input_schema.properties = QJsonObject{+ {"symbol", QJsonObject{{"type", "string"},+ {"description", "Ticker symbol (e.g. AAPL, BTC-USD)"}}},+ {"period", QJsonObject{{"type", "string"},+ {"description", "1d, 5d, 1mo, 3mo, 6mo, 1y, 2y, 5y, 10y, ytd, max (default 1mo)"}}},+ {"interval", QJsonObject{{"type", "string"},+ {"description", "1m, 5m, 15m, 30m, 1h, 1d, 1wk, 1mo (default 1d). "+ "Intraday intervals (<1d) limit period to ~60d."}}}};+ t.input_schema.required = {"symbol"};+ t.handler = [](const QJsonObject& args) -> ToolResult {+ QString symbol = args["symbol"].toString().trimmed().toUpper();+ if (symbol.isEmpty())+ return ToolResult::fail("Missing 'symbol'");++ QString period = args["period"].toString().trimmed();+ if (period.isEmpty()) period = "1mo";+ QString interval = args["interval"].toString().trimmed();+ if (interval.isEmpty()) interval = "1d";++ auto* svc = &services::MarketDataService::instance();+ bool ok = false;+ QVector<services::HistoryPoint> points;+ detail::run_async_wait(svc, [svc, symbol, period, interval, &ok, &points](auto signal_done) {+ svc->fetch_history(symbol, period, interval,+ [&ok, &points, signal_done](bool success, QVector<services::HistoryPoint> result) {+ ok = success;+ points = std::move(result);+ signal_done();+ });+ });++ if (!ok) {+ LOG_WARN(TAG, QString("fetch_history failed for %1 (%2/%3)").arg(symbol, period, interval));+ return ToolResult::fail("No history data available for " + symbol);+ }++ QJsonArray bars;+ for (const auto& p : points) {+ bars.append(QJsonObject{+ {"timestamp", p.timestamp},+ {"date", QDateTime::fromSecsSinceEpoch(p.timestamp, Qt::UTC).toString(Qt::ISODate)},+ {"open", p.open},+ {"high", p.high},+ {"low", p.low},+ {"close", p.close},+ {"volume", static_cast<double>(p.volume)}});+ }++ return ToolResult::ok_data(QJsonObject{+ {"symbol", symbol},+ {"period", period},+ {"interval", interval},+ {"count", bars.size()},+ {"bars", bars}});+ };+ tools.push_back(std::move(t));+ }return tools;}diff --git a/fincept-qt/src/mcp/tools/MetaTools.cpp b/fincept-qt/src/mcp/tools/MetaTools.cppindex 09d15c51c..e7af65772 100644--- a/fincept-qt/src/mcp/tools/MetaTools.cpp+++ b/fincept-qt/src/mcp/tools/MetaTools.cpp@@ -6,65 +6,150 @@#include "datahub/DataHub.h"#include "mcp/McpManager.h"#include "mcp/McpProvider.h"+#include "mcp/ToolRetriever.h"#include "mcp/ToolSchemaBuilder.h"#include <QDateTime>+#include <QHash>#include <QJsonArray>#include <QJsonObject>+#include <QMutex>#include <QRegularExpression>+#include <atomic>+namespace fincept::mcp::tools {static constexpr const char* TAG = "MetaTools";+// ─────────────────────────────────────────────────────────────────────────+// Telemetry counters — Tool RAG observability.+//+// Why file-local statics rather than a singleton service: the MCP system+// already has too many singletons. These counters are read by exactly one+// consumer (mcp.health) and written by exactly two writers (tool.list and+// tool.describe). A class wrapper would be overhead.+//+// Thread safety: tool handlers run on QtConcurrent worker threads. Atomics+// for scalar counters; mutex+QHash for the per-tool surface map.+// ─────────────────────────────────────────────────────────────────────────+namespace telemetry {+ static std::atomic<qint64> g_tool_list_calls{0};+ static std::atomic<qint64> g_tool_list_empty_results{0};+ static std::atomic<qint64> g_tool_describe_calls{0};+ static std::atomic<qint64> g_tool_describe_misses{0};++ static QMutex g_surface_mutex;+ static QHash<QString, qint64> g_surfaces; // tool name → times surfaced by tool.list++ static void record_surfaces(const QStringList& names) {+ if (names.isEmpty())+ return;+ QMutexLocker lock(&g_surface_mutex);+ for (const auto& n : names)+ g_surfaces[n]++;+ }++ static QJsonObject snapshot() {+ QJsonObject out;+ out["tool_list_calls"] = g_tool_list_calls.load();+ out["tool_list_empty_results"] = g_tool_list_empty_results.load();+ out["tool_describe_calls"] = g_tool_describe_calls.load();+ out["tool_describe_misses"] = g_tool_describe_misses.load();++ // Top-20 most-surfaced tools — useful for spotting which tools the+ // LLM keeps finding (= valuable) vs. which never surface (= dead+ // descriptions that need rewriting).+ QMutexLocker lock(&g_surface_mutex);+ QList<QPair<QString, qint64>> ranked;+ ranked.reserve(g_surfaces.size());+ for (auto it = g_surfaces.constBegin(); it != g_surfaces.constEnd(); ++it)+ ranked.append({it.key(), it.value()});+ std::sort(ranked.begin(), ranked.end(),+ [](const auto& a, const auto& b) { return a.second > b.second; });++ QJsonArray top;+ const int kCap = 20;+ for (int i = 0; i < ranked.size() && i < kCap; ++i)+ top.append(QJsonObject{{"name", ranked[i].first}, {"surfaces", ranked[i].second}});+ out["top_surfaced"] = top;+ out["unique_tools_ever_surfaced"] = static_cast<int>(g_surfaces.size());+ return out;+ }+} // namespace telemetry+std::vector<ToolDef> get_meta_tools() {std::vector<ToolDef> tools;// ── tool.list ───────────────────────────────────────────────────────+ //+ // Tool RAG entry point. Replaces the old regex-over-everything variant+ // with BM25 semantic ranking — proven by Anthropic's own Tool Search+ // (Nov 2025) to lift tool-pick accuracy by 9-25 percentage points across+ // model classes once the catalog exceeds ~30 tools.+ //+ // The LLM is expected to call this with a NATURAL LANGUAGE query+ // describing the action it wants to perform. Multi-intent requests+ // ("get news on AAPL and add to watchlist") should issue MULTIPLE+ // tool.list calls, one per intent — Anthropic's recommended pattern.{ToolDef t;t.name = "tool.list";- t.description = "List MCP tools available to the LLM, optionally filtered by category "- "and/or a regex search over name+description. Returns name + 1-line "- "description only — call tool.describe(name) for full schemas.";+ t.description =+ "Search the tool catalog by natural-language query (BM25). Returns the top-K most "+ "relevant tools as {name, category, description, destructive, score}. "+ "Use this whenever you need a capability you don't already have a tool for. "+ "For multi-intent requests, call multiple times — once per intent. "+ "After picking a tool, call tool.describe(name) for the full input schema.";t.category = "meta";t.input_schema = ToolSchemaBuilder()- .string("category", "Filter by tool category (e.g. 'markets', 'news', 'paper-trading')")- .string("search", "Regex matched against name or description (case-insensitive)")- .integer("limit", "Max tools returned").default_int(50).between(1, 500)+ .string("query", "Natural-language description of the capability you need "+ "(e.g. 'draft a research report', 'place a paper trade', "+ "'fetch latest news for AAPL')").required().length(1, 256)+ .string("category", "Optional category filter (e.g. 'markets', 'report-builder', "+ "'paper-trading'). Leave empty to search all categories.")+ .integer("top_k", "Maximum tools returned (1-20)").default_int(5).between(1, 20).build();t.handler = [](const QJsonObject& args) -> ToolResult {- const QString category = args["category"].toString();- const QString search = args["search"].toString();- const int limit = args["limit"].toInt(50);+ const QString query = args["query"].toString().trimmed();+ const QString category = args["category"].toString().trimmed();+ const int top_k = args["top_k"].toInt(5);- QRegularExpression rx;- if (!search.isEmpty())- rx = QRegularExpression(search, QRegularExpression::CaseInsensitiveOption);+ telemetry::g_tool_list_calls.fetch_add(1);- const auto all = McpProvider::instance().list_tools();+ if (query.isEmpty())+ return ToolResult::fail("Empty query — pass a natural-language description.");++ const auto matches =+ ToolRetriever::instance().search(query, top_k, category);++ if (matches.empty())+ telemetry::g_tool_list_empty_results.fetch_add(1);++ QStringList surfaced;QJsonArray out;- int total = 0;- for (const auto& tool : all) {- if (!category.isEmpty() && tool.category != category) continue;- if (rx.isValid() && !search.isEmpty()) {- if (!rx.match(tool.name).hasMatch() && !rx.match(tool.description).hasMatch())- continue;- }- ++total;- if (out.size() < limit) {- out.append(QJsonObject{- {"name", tool.name},- {"category", tool.category},- {"description", tool.description},- });- }+ for (const auto& m : matches) {+ QJsonObject row{+ {"name", m.name},+ {"category", m.category},+ {"description", m.description},+ {"score", m.score},+ };+ // Only emit destructive flag when true — keeps output small+ // and signals attention when present.+ if (m.is_destructive)+ row["destructive"] = true;+ out.append(row);+ surfaced.append(m.name);}+ telemetry::record_surfaces(surfaced);+return ToolResult::ok_data(QJsonObject{+ {"query", query},+ {"category", category},{"count", out.size()},- {"total_matched", total},- {"limit", limit},- {"tools", out}});+ {"tools", out},+ });};tools.push_back(std::move(t));}@@ -81,6 +166,8 @@ std::vector<ToolDef> get_meta_tools() {.build();t.handler = [](const QJsonObject& args) -> ToolResult {const QString name = args["name"].toString();+ telemetry::g_tool_describe_calls.fetch_add(1);+const auto all = McpProvider::instance().list_tools();for (const auto& tool : all) {if (tool.name == name) {@@ -93,6 +180,7 @@ std::vector<ToolDef> get_meta_tools() {});}}+ telemetry::g_tool_describe_misses.fetch_add(1);return ToolResult::fail("Tool not found: " + name);};tools.push_back(std::move(t));@@ -152,6 +240,7 @@ std::vector<ToolDef> get_meta_tools() {{"internal", internal_section},{"external", external_section},{"datahub", datahub_section},+ {"tool_rag", telemetry::snapshot()},{"timestamp", QDateTime::currentDateTime().toString(Qt::ISODate)},});};diff --git a/fincept-qt/src/mcp/tools/NavigationTools.cpp b/fincept-qt/src/mcp/tools/NavigationTools.cppindex 7fa435aca..b076775b0 100644--- a/fincept-qt/src/mcp/tools/NavigationTools.cpp+++ b/fincept-qt/src/mcp/tools/NavigationTools.cpp@@ -1,9 +1,9 @@-// NavigationTools.cpp — Tab switching MCP tools (Qt port)+// NavigationTools.cpp — Tab switching MCP tools (Qt port)#include "mcp/tools/NavigationTools.h"#include "app/DockScreenRouter.h"-#include "app/MainWindow.h"+#include "app/WindowFrame.h"#include "core/events/EventBus.h"#include "core/logging/Logger.h"#include "mcp/ToolSchemaBuilder.h"@@ -23,22 +23,22 @@ static constexpr const char* TAG = "NavTools";// ── Live router lookup ──────────────────────────────────────────────────────// MCP tool handlers run on a worker thread. QApplication's widget tree must// be queried from the main thread. We marshal via run_on_target_thread_sync-// (qApp lives on the main thread) and pick the active or primary MainWindow.+// (qApp lives on the main thread) and pick the active or primary WindowFrame.namespace {// Must be called on the main thread.fincept::DockScreenRouter* find_active_router_main_thread() {// Prefer the focused window — that's where the user just typed.if (auto* active = QApplication::activeWindow()) {- if (auto* mw = qobject_cast<fincept::MainWindow*>(active))+ if (auto* mw = qobject_cast<fincept::WindowFrame*>(active))return mw->dock_router();}// Fall back to the primary window (window_id == 0). Multi-window mode is- // possible; we deliberately don't pick "any" MainWindow because that+ // possible; we deliberately don't pick "any" WindowFrame because that// would surprise users running two terminals.const auto top_widgets = QApplication::topLevelWidgets();for (QWidget* w : top_widgets) {- if (auto* mw = qobject_cast<fincept::MainWindow*>(w)) {+ if (auto* mw = qobject_cast<fincept::WindowFrame*>(w)) {if (mw->window_id() == 0)return mw->dock_router();}@@ -116,7 +116,7 @@ std::vector<ToolDef> get_navigation_tools() {return ToolResult::fail("Unknown tab '" + tab + "'. Valid ids: " + snap.ids.join(", "));}- // Hand off to MainWindow's existing nav.switch_screen subscriber.+ // Hand off to WindowFrame's existing nav.switch_screen subscriber.// The subscriber marshals onto dock_router_'s thread, so we don't// duplicate that logic here.EventBus::instance().publish("nav.switch_screen", QVariantMap{{"screen_id", resolved}});diff --git a/fincept-qt/src/mcp/tools/NotesTools.cpp b/fincept-qt/src/mcp/tools/NotesTools.cppindex 1cecb0203..41a69df81 100644--- a/fincept-qt/src/mcp/tools/NotesTools.cpp+++ b/fincept-qt/src/mcp/tools/NotesTools.cpp@@ -1,11 +1,18 @@// NotesTools.cpp — Notes tab MCP tools (research notes)+//+// Thread-safety note: see WatchlistTools.cpp for the rationale. MCP handlers+// run on the LlmService worker thread, but Qt's QSqlDatabase connection is+// bound to the main thread. Every NotesRepository call MUST be marshalled to+// the main thread via run_async_wait or the writes won't survive a restart.#include "mcp/tools/NotesTools.h"#include "core/events/EventBus.h"#include "core/logging/Logger.h"+#include "mcp/tools/ThreadHelper.h"#include "storage/repositories/NotesRepository.h"+#include <QCoreApplication>#include <QVariantMap>namespace fincept::mcp::tools {@@ -45,13 +52,22 @@ std::vector<ToolDef> get_notes_tools() {note.sentiment = args["sentiment"].toString("NEUTRAL");note.tags = args["tags"].toString();- auto result = NotesRepository::instance().create(note);- if (result.is_err())- return ToolResult::fail("Failed to create note: " + QString::fromStdString(result.error()));-- EventBus::instance().publish("notes.created", QVariantMap{{"id", static_cast<qlonglong>(result.value())}});+ qint64 new_id = -1;+ QString error;+ detail::run_async_wait(QCoreApplication::instance(), [&](auto signal_done) {+ auto r = NotesRepository::instance().create(note);+ if (r.is_err())+ error = "Failed to create note: " + QString::fromStdString(r.error());+ else+ new_id = r.value();+ signal_done();+ });+ if (!error.isEmpty())+ return ToolResult::fail(error);++ EventBus::instance().publish("notes.created", QVariantMap{{"id", static_cast<qlonglong>(new_id)}});return ToolResult::ok("Note created: " + title,- QJsonObject{{"id", static_cast<int>(result.value())}, {"title", title}});+ QJsonObject{{"id", static_cast<int>(new_id)}, {"title", title}});};tools.push_back(std::move(t));}@@ -66,24 +82,31 @@ std::vector<ToolDef> get_notes_tools() {QJsonObject{{"query", QJsonObject{{"type", "string"}, {"description", "Search query (optional)"}}}};t.handler = [](const QJsonObject& args) -> ToolResult {QString query = args["query"].toString().trimmed();- auto result =- query.isEmpty() ? NotesRepository::instance().list_all() : NotesRepository::instance().search(query);-- if (result.is_err())- return ToolResult::fail("Failed to load notes: " + QString::fromStdString(result.error()));-QJsonArray arr;- for (const auto& n : result.value()) {- arr.append(QJsonObject{{"id", n.id},- {"title", n.title},- {"category", n.category},- {"priority", n.priority},- {"tickers", n.tickers},- {"sentiment", n.sentiment},- {"is_favorite", n.is_favorite},- {"created_at", n.created_at},- {"updated_at", n.updated_at}});- }+ QString error;+ detail::run_async_wait(QCoreApplication::instance(), [&](auto signal_done) {+ auto r = query.isEmpty() ? NotesRepository::instance().list_all()+ : NotesRepository::instance().search(query);+ if (r.is_err()) {+ error = "Failed to load notes: " + QString::fromStdString(r.error());+ signal_done();+ return;+ }+ for (const auto& n : r.value()) {+ arr.append(QJsonObject{{"id", n.id},+ {"title", n.title},+ {"category", n.category},+ {"priority", n.priority},+ {"tickers", n.tickers},+ {"sentiment", n.sentiment},+ {"is_favorite", n.is_favorite},+ {"created_at", n.created_at},+ {"updated_at", n.updated_at}});+ }+ signal_done();+ });+ if (!error.isEmpty())+ return ToolResult::fail(error);return ToolResult::ok_data(arr);};tools.push_back(std::move(t));@@ -103,9 +126,15 @@ std::vector<ToolDef> get_notes_tools() {if (id < 0)return ToolResult::fail("Missing or invalid 'id'");- auto r = NotesRepository::instance().remove(id);- if (r.is_err())- return ToolResult::fail("Failed to delete note: " + QString::fromStdString(r.error()));+ QString error;+ detail::run_async_wait(QCoreApplication::instance(), [&](auto signal_done) {+ auto r = NotesRepository::instance().remove(id);+ if (r.is_err())+ error = "Failed to delete note: " + QString::fromStdString(r.error());+ signal_done();+ });+ if (!error.isEmpty())+ return ToolResult::fail(error);EventBus::instance().publish("notes.deleted", QVariantMap{{"id", id}});return ToolResult::ok("Note deleted");diff --git a/fincept-qt/src/mcp/tools/WatchlistTools.cpp b/fincept-qt/src/mcp/tools/WatchlistTools.cppindex c19bdc6d8..f2d02b1c7 100644--- a/fincept-qt/src/mcp/tools/WatchlistTools.cpp+++ b/fincept-qt/src/mcp/tools/WatchlistTools.cpp@@ -1,11 +1,23 @@// WatchlistTools.cpp — Watchlist MCP tools+//+// Thread-safety note (2026-05-01):+// These tools mutate fincept::Database via WatchlistRepository. The main DB+// connection is a single QSqlDatabase opened on the main thread. Qt's docs+// state that a QSqlDatabase connection "can only be used from within the+// thread that created it." MCP tool handlers run on the LlmService worker+// thread (QtConcurrent::run), so we MUST marshal every DB call to the main+// thread via run_async_wait — otherwise SQL writes are silently dropped /+// orphaned in the WAL of an off-thread connection and don't survive a+// restart. (This was the actual bug behind "watchlist resets on restart".)#include "mcp/tools/WatchlistTools.h"#include "core/events/EventBus.h"#include "core/logging/Logger.h"+#include "mcp/tools/ThreadHelper.h"#include "storage/repositories/WatchlistRepository.h"+#include <QCoreApplication>#include <QVariantMap>namespace fincept::mcp::tools {@@ -22,26 +34,35 @@ std::vector<ToolDef> get_watchlist_tools() {t.description = "Get all watchlists with their symbols.";t.category = "watchlist";t.handler = [](const QJsonObject&) -> ToolResult {- auto& repo = WatchlistRepository::instance();- auto lists = repo.list_all();- if (lists.is_err())- return ToolResult::fail("Failed to load watchlists: " + QString::fromStdString(lists.error()));-QJsonArray result;- for (const auto& wl : lists.value()) {- auto stocks = repo.get_stocks(wl.id);- QJsonArray symbols;- if (stocks.is_ok()) {- for (const auto& s : stocks.value()) {- symbols.append(QJsonObject{{"symbol", s.symbol}, {"name", s.name}, {"added_at", s.added_at}});+ QString error;+ detail::run_async_wait(QCoreApplication::instance(), [&](auto signal_done) {+ auto& repo = WatchlistRepository::instance();+ auto lists = repo.list_all();+ if (lists.is_err()) {+ error = "Failed to load watchlists: " + QString::fromStdString(lists.error());+ signal_done();+ return;+ }+ for (const auto& wl : lists.value()) {+ auto stocks = repo.get_stocks(wl.id);+ QJsonArray symbols;+ if (stocks.is_ok()) {+ for (const auto& s : stocks.value()) {+ symbols.append(QJsonObject{+ {"symbol", s.symbol}, {"name", s.name}, {"added_at", s.added_at}});+ }}+ result.append(QJsonObject{{"id", wl.id},+ {"name", wl.name},+ {"color", wl.color},+ {"description", wl.description},+ {"symbols", symbols}});}- result.append(QJsonObject{{"id", wl.id},- {"name", wl.name},- {"color", wl.color},- {"description", wl.description},- {"symbols", symbols}});- }+ signal_done();+ });+ if (!error.isEmpty())+ return ToolResult::fail(error);return ToolResult::ok_data(result);};tools.push_back(std::move(t));@@ -63,13 +84,22 @@ std::vector<ToolDef> get_watchlist_tools() {if (name.isEmpty())return ToolResult::fail("Missing 'name'");- auto r = WatchlistRepository::instance().create(name);- if (r.is_err())- return ToolResult::fail("Failed to create watchlist: " + QString::fromStdString(r.error()));-- EventBus::instance().publish("watchlist.created", QVariantMap{{"id", r.value().id}, {"name", name}});+ QString new_id;+ QString error;+ detail::run_async_wait(QCoreApplication::instance(), [&](auto signal_done) {+ auto r = WatchlistRepository::instance().create(name);+ if (r.is_err())+ error = "Failed to create watchlist: " + QString::fromStdString(r.error());+ else+ new_id = r.value().id;+ signal_done();+ });+ if (!error.isEmpty())+ return ToolResult::fail(error);++ EventBus::instance().publish("watchlist.created", QVariantMap{{"id", new_id}, {"name", name}});LOG_INFO(TAG, "Created watchlist: " + name);- return ToolResult::ok("Watchlist created", QJsonObject{{"id", r.value().id}, {"name", name}});+ return ToolResult::ok("Watchlist created", QJsonObject{{"id", new_id}, {"name", name}});};tools.push_back(std::move(t));}@@ -88,9 +118,15 @@ std::vector<ToolDef> get_watchlist_tools() {if (id.isEmpty())return ToolResult::fail("Missing 'watchlist_id'");- auto r = WatchlistRepository::instance().remove(id);- if (r.is_err())- return ToolResult::fail("Failed to delete watchlist: " + QString::fromStdString(r.error()));+ QString error;+ detail::run_async_wait(QCoreApplication::instance(), [&](auto signal_done) {+ auto r = WatchlistRepository::instance().remove(id);+ if (r.is_err())+ error = "Failed to delete watchlist: " + QString::fromStdString(r.error());+ signal_done();+ });+ if (!error.isEmpty())+ return ToolResult::fail(error);EventBus::instance().publish("watchlist.deleted", QVariantMap{{"id", id}});return ToolResult::ok("Watchlist deleted", QJsonObject{{"id", id}});@@ -102,7 +138,16 @@ std::vector<ToolDef> get_watchlist_tools() {{ToolDef t;t.name = "add_to_watchlist";- t.description = "Add a symbol to a watchlist. If watchlist_id is omitted, uses the first available watchlist.";+ t.description =+ "Add a ticker symbol to a watchlist. The 'symbol' field MUST be the exact "+ "exchange-suffixed Yahoo ticker (e.g. 'RITES.NS' for RITES Limited on NSE, "+ "'AAPL' for Apple on NASDAQ, '7203.T' for Toyota on Tokyo). "+ "If the user gave a company NAME instead of a ticker — or you are uncertain "+ "about the exchange suffix — call lookup_symbol(query=<company name>) FIRST "+ "to resolve the correct ticker, then pass that ticker here. "+ "Do NOT guess tickers from prior knowledge: cross-listed names and Indian/Asian "+ "tickers are easy to get wrong, and the watchlist stores whatever you pass. "+ "If watchlist_id is omitted, the first available watchlist is used.";t.category = "watchlist";t.input_schema.properties = QJsonObject{{"symbol", QJsonObject{{"type", "string"}, {"description", "Ticker symbol to add"}}},@@ -117,25 +162,36 @@ std::vector<ToolDef> get_watchlist_tools() {QString watchlist_id = args["watchlist_id"].toString();QString name = args["name"].toString();- auto& repo = WatchlistRepository::instance();-- if (watchlist_id.isEmpty()) {- auto lists = repo.list_all();- if (lists.is_err())- return ToolResult::fail("Failed to load watchlists: " + QString::fromStdString(lists.error()));- if (lists.value().isEmpty()) {- auto created = repo.create("Default");- if (created.is_err())- return ToolResult::fail("Failed to create watchlist");- watchlist_id = created.value().id;- } else {- watchlist_id = lists.value().first().id;+ QString error;+ detail::run_async_wait(QCoreApplication::instance(), [&](auto signal_done) {+ auto& repo = WatchlistRepository::instance();+ if (watchlist_id.isEmpty()) {+ auto lists = repo.list_all();+ if (lists.is_err()) {+ error = "Failed to load watchlists: " + QString::fromStdString(lists.error());+ signal_done();+ return;+ }+ if (lists.value().isEmpty()) {+ auto created = repo.create("Default");+ if (created.is_err()) {+ error = "Failed to create watchlist";+ signal_done();+ return;+ }+ watchlist_id = created.value().id;+ } else {+ watchlist_id = lists.value().first().id;+ }}- }- auto r = repo.add_stock(watchlist_id, symbol, name);- if (r.is_err())- return ToolResult::fail("Failed to add symbol: " + QString::fromStdString(r.error()));+ auto r = repo.add_stock(watchlist_id, symbol, name);+ if (r.is_err())+ error = "Failed to add symbol: " + QString::fromStdString(r.error());+ signal_done();+ });+ if (!error.isEmpty())+ return ToolResult::fail(error);LOG_INFO(TAG, "Added " + symbol + " to watchlist " + watchlist_id);EventBus::instance().publish(@@ -165,17 +221,19 @@ std::vector<ToolDef> get_watchlist_tools() {return ToolResult::fail("Missing 'symbol'");QString watchlist_id = args["watchlist_id"].toString();- auto& repo = WatchlistRepository::instance();-- if (watchlist_id.isEmpty()) {- auto lists = repo.list_all();- if (lists.is_ok()) {- for (const auto& wl : lists.value())- repo.remove_stock(wl.id, symbol);+ detail::run_async_wait(QCoreApplication::instance(), [&](auto signal_done) {+ auto& repo = WatchlistRepository::instance();+ if (watchlist_id.isEmpty()) {+ auto lists = repo.list_all();+ if (lists.is_ok()) {+ for (const auto& wl : lists.value())+ repo.remove_stock(wl.id, symbol);+ }+ } else {+ repo.remove_stock(watchlist_id, symbol);}- } else {- repo.remove_stock(watchlist_id, symbol);- }+ signal_done();+ });EventBus::instance().publish("watchlist.updated", QVariantMap{{"action", "remove"}, {"symbol", symbol}});return ToolResult::ok("Removed " + symbol + " from watchlist");diff --git a/fincept-qt/src/screens/IStatefulScreen.h b/fincept-qt/src/screens/IStatefulScreen.hindex 840afb4bd..60829724c 100644--- a/fincept-qt/src/screens/IStatefulScreen.h+++ b/fincept-qt/src/screens/IStatefulScreen.h@@ -33,6 +33,20 @@ class IStatefulScreen {/// is discarded and the screen starts with a clean slate rather than/// crashing or misinterpreting stale keys.virtual int state_version() const { return 1; }++ /// Synchronously flush any debounced/in-flight state changes. The+ /// default `notify_changed()` path is debounced (500ms) so rapid edits+ /// don't hammer SQLite, but Phase 5 tear-off and Phase 6 layout-switch+ /// need a synchronous "everything-on-disk-now" guarantee before+ /// reparenting a panel across frames or serialising a workspace.+ ///+ /// Default implementation: no-op. Screens that maintain their own+ /// in-memory edit buffers (e.g. notes editor, code editor) should+ /// override to push the buffer through `save_state()` immediately.+ /// `ScreenStateManager::save_now*()` does the SQLite write part —+ /// this hook covers the *screen-side* "flush in-memory edits to the+ /// state map" part that happens before save_state() is called.+ virtual void flush_pending_state() {}};} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.cpp b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.cppindex f21d88960..f9901adf6 100644--- a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.cpp+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.cpp@@ -1,5 +1,8 @@// src/screens/ai_quant_lab/QuantModulePanel.cpp#include "screens/ai_quant_lab/QuantModulePanel.h"+#include "screens/ai_quant_lab/QuantModulePanel_Common.h"+#include "screens/ai_quant_lab/QuantModulePanel_GsHelpers.h"+#include "screens/ai_quant_lab/QuantModulePanel_Styles.h"#include "core/logging/Logger.h"#include "services/ai_quant_lab/AIQuantLabService.h"@@ -39,96 +42,9 @@namespace fincept::screens {using namespace fincept::services::quant;--// ── Shared style helpers (live tokens — called at widget-creation time) ───────-// These replace 60+ copy-pasted inline style blocks across all panel builders.--static QString input_ss() {- return QString("QLineEdit,QTextEdit { background:%1; color:%2; border:1px solid %3;"- "padding:4px 6px; border-radius:2px; }"- "QLineEdit:focus,QTextEdit:focus { border-color:%4; }")- .arg(ui::colors::BG_RAISED())- .arg(ui::colors::TEXT_PRIMARY())- .arg(ui::colors::BORDER_MED())- .arg(ui::colors::BORDER_BRIGHT());-}--static QString combo_ss() {- return QString("QComboBox { background:%1; color:%2; border:1px solid %3;"- "padding:3px 6px; border-radius:2px; }"- "QComboBox:focus { border-color:%4; }"- "QComboBox::drop-down { border:none; width:18px; }"- "QComboBox QAbstractItemView { background:%1; color:%2;"- "selection-background-color:%5; border:1px solid %3; }")- .arg(ui::colors::BG_RAISED())- .arg(ui::colors::TEXT_PRIMARY())- .arg(ui::colors::BORDER_MED())- .arg(ui::colors::BORDER_BRIGHT())- .arg(ui::colors::BG_HOVER());-}--static QString spinbox_ss() {- return QString("QSpinBox,QDoubleSpinBox { background:%1; color:%2; border:1px solid %3;"- "padding:4px 6px; border-radius:2px; }"- "QSpinBox:focus,QDoubleSpinBox:focus { border-color:%4; }"- "QSpinBox::up-button,QSpinBox::down-button,"- "QDoubleSpinBox::up-button,QDoubleSpinBox::down-button { width:16px; }")- .arg(ui::colors::BG_RAISED())- .arg(ui::colors::TEXT_PRIMARY())- .arg(ui::colors::BORDER_MED())- .arg(ui::colors::BORDER_BRIGHT());-}--static QString tab_ss(const QString& accent) {- return QString("QTabWidget::pane { border:1px solid %1; background:%2; }"- "QTabBar::tab { background:%3; color:%4; padding:6px 14px;"- "border:1px solid %1; border-bottom:none; margin-right:1px; }"- "QTabBar::tab:selected { background:%2; color:%5; font-weight:700;"- "border-bottom:2px solid %5; }"- "QTabBar::tab:hover { color:%4; background:%6; }")- .arg(ui::colors::BORDER_DIM())- .arg(ui::colors::BG_SURFACE())- .arg(ui::colors::BG_RAISED())- .arg(ui::colors::TEXT_SECONDARY())- .arg(accent)- .arg(ui::colors::BG_HOVER());-}--static QString sub_tab_ss(const QString& accent) {- return QString("QTabWidget::pane { border:none; background:%1; }"- "QTabBar::tab { background:%2; color:%3; padding:5px 12px;"- "border:1px solid %4; border-bottom:none; margin-right:1px; }"- "QTabBar::tab:selected { background:%1; color:%5; font-weight:700; }"- "QTabBar { background:%2; }")- .arg(ui::colors::BG_SURFACE())- .arg(ui::colors::BG_RAISED())- .arg(ui::colors::TEXT_SECONDARY())- .arg(ui::colors::BORDER_DIM())- .arg(accent);-}--static QString output_ss() {- return QString("QTextEdit { background:%1; color:%2; border:1px solid %3; padding:8px; }")- .arg(ui::colors::BG_RAISED())- .arg(ui::colors::TEXT_PRIMARY())- .arg(ui::colors::BORDER_DIM());-}--static QString table_ss() {- return QString("QTableWidget { background:%1; color:%2; border:1px solid %3;"- "gridline-color:%3; alternate-background-color:%4; }"- "QTableWidget::item { padding:3px 6px; }"- "QHeaderView::section { background:%5; color:%6; font-weight:700;"- "padding:4px 8px; border:none; border-bottom:1px solid %3; }"- "QTableWidget::item:selected { background:%7; color:%2; }")- .arg(ui::colors::BG_SURFACE())- .arg(ui::colors::TEXT_PRIMARY())- .arg(ui::colors::BORDER_DIM())- .arg(ui::colors::ROW_ALT())- .arg(ui::colors::BG_RAISED())- .arg(ui::colors::TEXT_SECONDARY())- .arg(ui::colors::BG_HOVER());-}+using namespace fincept::screens::quant_styles;+using namespace fincept::screens::quant_common;+using namespace fincept::screens::quant_gs_helpers;// ── Widget factory helpers ────────────────────────────────────────────────────@@ -317,6 +233,14 @@ void QuantModulePanel::build_ui() {QWidget* content = nullptr;if (module_.id == "gs_quant")content = build_gs_quant_panel();+ else if (module_.id == "functime")+ content = build_functime_panel();+ else if (module_.id == "statsmodels")+ content = build_statsmodels_panel();+ else if (module_.id == "fortitudo")+ content = build_fortitudo_panel();+ else if (module_.id == "gluonts")+ content = build_gluonts_panel();else if (module_.id == "cfa_quant")content = build_cfa_quant_panel();else if (module_.id == "backtesting")@@ -360,1425 +284,6 @@ void QuantModulePanel::build_ui() {root->addWidget(scroll, 1);}-// ═══════════════════════════════════════════════════════════════════════════════-// GS QUANT PANEL — 7 analysis modes-// ═══════════════════════════════════════════════════════════════════════════════--QWidget* QuantModulePanel::build_gs_quant_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- auto* tabs = new QTabWidget(w);- tabs->setStyleSheet(tab_ss(module_.color.name()));-- // ── Risk Metrics ──- auto* risk = new QWidget(this);- auto* rvl = new QVBoxLayout(risk);- rvl->setContentsMargins(12, 12, 12, 12);- rvl->setSpacing(8);- auto* risk_returns = new QLineEdit(risk);- risk_returns->setPlaceholderText("Daily returns (comma-separated, e.g. 0.01,-0.02,0.005)");- risk_returns->setStyleSheet(input_ss());- text_inputs_["gs_risk_returns"] = risk_returns;- rvl->addWidget(build_input_row("Daily Returns", risk_returns, risk));- auto* risk_rf = make_double_spin(0, 20, 4.5, 2, "%", risk);- double_inputs_["gs_risk_rf"] = risk_rf;- rvl->addWidget(build_input_row("Risk-Free Rate", risk_rf, risk));- auto* risk_run = make_run_button("CALCULATE RISK METRICS", risk);- connect(risk_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Calculating...");- QJsonObject params;- params["returns"] = text_inputs_["gs_risk_returns"]->text();- params["risk_free_rate"] = double_inputs_["gs_risk_rf"]->value() / 100.0;- AIQuantLabService::instance().gs_risk_metrics(params);- });- rvl->addWidget(risk_run);- rvl->addStretch();- tabs->addTab(risk, "Risk Metrics");-- // ── Portfolio Analytics ──- auto* port = new QWidget(this);- auto* pvl = new QVBoxLayout(port);- pvl->setContentsMargins(12, 12, 12, 12);- pvl->setSpacing(8);- auto* port_ret = new QLineEdit(port);- port_ret->setPlaceholderText("Portfolio returns (comma-separated)");- port_ret->setStyleSheet(input_ss());- text_inputs_["gs_port_returns"] = port_ret;- pvl->addWidget(build_input_row("Portfolio Returns", port_ret, port));- auto* bench_ret = new QLineEdit(port);- bench_ret->setPlaceholderText("Benchmark returns (comma-separated)");- bench_ret->setStyleSheet(input_ss());- text_inputs_["gs_bench_returns"] = bench_ret;- pvl->addWidget(build_input_row("Benchmark Returns", bench_ret, port));- auto* port_run = make_run_button("ANALYZE PORTFOLIO", port);- connect(port_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Analyzing...");- QJsonObject params;- params["returns"] = text_inputs_["gs_port_returns"]->text();- params["benchmark_returns"] = text_inputs_["gs_bench_returns"]->text();- AIQuantLabService::instance().gs_portfolio_analytics(params);- });- pvl->addWidget(port_run);- pvl->addStretch();- tabs->addTab(port, "Portfolio");-- // ── Options Greeks ──- auto* greeks = new QWidget(this);- auto* gvl = new QVBoxLayout(greeks);- gvl->setContentsMargins(12, 12, 12, 12);- gvl->setSpacing(8);- auto* g_spot = make_double_spin(0, 1e6, 100, 2, "", greeks);- double_inputs_["gs_spot"] = g_spot;- gvl->addWidget(build_input_row("Spot Price ($)", g_spot, greeks));- auto* g_strike = make_double_spin(0, 1e6, 100, 2, "", greeks);- double_inputs_["gs_strike"] = g_strike;- gvl->addWidget(build_input_row("Strike Price ($)", g_strike, greeks));- auto* g_expiry = make_double_spin(0.01, 120, 6, 1, " mo", greeks);- double_inputs_["gs_expiry"] = g_expiry;- gvl->addWidget(build_input_row("Expiry (months)", g_expiry, greeks));- auto* g_rate = make_double_spin(0, 30, 5, 2, "%", greeks);- double_inputs_["gs_rate"] = g_rate;- gvl->addWidget(build_input_row("Risk-Free Rate", g_rate, greeks));- auto* g_vol = make_double_spin(1, 200, 25, 1, "%", greeks);- double_inputs_["gs_vol"] = g_vol;- gvl->addWidget(build_input_row("Volatility", g_vol, greeks));- auto* g_type = new QComboBox(greeks);- g_type->addItems({"call", "put"});- g_type->setStyleSheet(combo_ss());- combo_inputs_["gs_option_type"] = g_type;- gvl->addWidget(build_input_row("Option Type", g_type, greeks));- auto* greeks_run = make_run_button("CALCULATE GREEKS", greeks);- connect(greeks_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Calculating...");- QJsonObject params;- params["spot"] = double_inputs_["gs_spot"]->value();- params["strike"] = double_inputs_["gs_strike"]->value();- params["expiry"] = double_inputs_["gs_expiry"]->value() / 12.0;- params["rate"] = double_inputs_["gs_rate"]->value() / 100.0;- params["vol"] = double_inputs_["gs_vol"]->value() / 100.0;- params["option_type"] = combo_inputs_["gs_option_type"]->currentText();- AIQuantLabService::instance().gs_greeks(params);- });- gvl->addWidget(greeks_run);- gvl->addStretch();- tabs->addTab(greeks, "Greeks");-- // ── VaR Analysis ──- auto* var = new QWidget(this);- auto* vvl = new QVBoxLayout(var);- vvl->setContentsMargins(12, 12, 12, 12);- vvl->setSpacing(8);- auto* var_ret = new QLineEdit(var);- var_ret->setPlaceholderText("Daily returns (comma-separated)");- var_ret->setStyleSheet(input_ss());- text_inputs_["gs_var_returns"] = var_ret;- vvl->addWidget(build_input_row("Daily Returns", var_ret, var));- auto* var_pos = make_double_spin(0, 1e12, 1e6, 0, "", var);- double_inputs_["gs_var_position"] = var_pos;- vvl->addWidget(build_input_row("Position Value ($)", var_pos, var));- auto* var_conf = make_double_spin(0.90, 0.99, 0.95, 2, "", var);- double_inputs_["gs_var_confidence"] = var_conf;- vvl->addWidget(build_input_row("Confidence Level", var_conf, var));- auto* var_run = make_run_button("CALCULATE VaR", var);- connect(var_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Calculating...");- QJsonObject params;- params["returns"] = text_inputs_["gs_var_returns"]->text();- params["position_value"] = double_inputs_["gs_var_position"]->value();- params["confidence"] = double_inputs_["gs_var_confidence"]->value();- AIQuantLabService::instance().gs_var_analysis(params);- });- vvl->addWidget(var_run);- vvl->addStretch();- tabs->addTab(var, "VaR");-- // ── Stress Test ──- auto* stress = new QWidget(this);- auto* svl = new QVBoxLayout(stress);- svl->setContentsMargins(12, 12, 12, 12);- svl->setSpacing(8);- auto* st_ret = new QLineEdit(stress);- st_ret->setPlaceholderText("Daily returns (comma-separated)");- st_ret->setStyleSheet(input_ss());- text_inputs_["gs_stress_returns"] = st_ret;- svl->addWidget(build_input_row("Daily Returns", st_ret, stress));- auto* st_pos = make_double_spin(0, 1e12, 1e6, 0, "", stress);- double_inputs_["gs_stress_position"] = st_pos;- svl->addWidget(build_input_row("Position Value ($)", st_pos, stress));- auto* st_hint = new QLabel("Tests 9 historical crisis scenarios: 2008, COVID-19, etc.", stress);- st_hint->setStyleSheet(- QString("color:%1; font-family:%2;").arg(ui::colors::TEXT_TERTIARY()).arg(ui::fonts::DATA_FAMILY));- svl->addWidget(st_hint);- auto* stress_run = make_run_button("RUN STRESS TEST", stress);- connect(stress_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Stress testing...");- QJsonObject params;- params["returns"] = text_inputs_["gs_stress_returns"]->text();- params["position_value"] = double_inputs_["gs_stress_position"]->value();- AIQuantLabService::instance().gs_stress_test(params);- });- svl->addWidget(stress_run);- svl->addStretch();- tabs->addTab(stress, "Stress Test");-- // ── Backtest ──- auto* bt = new QWidget(this);- auto* bvl = new QVBoxLayout(bt);- bvl->setContentsMargins(12, 12, 12, 12);- bvl->setSpacing(8);- auto* bt_strat = new QComboBox(bt);- bt_strat->addItems({"buy_hold", "momentum", "mean_reversion", "rebalancing"});- bt_strat->setStyleSheet(g_type->styleSheet());- combo_inputs_["gs_bt_strategy"] = bt_strat;- bvl->addWidget(build_input_row("Strategy", bt_strat, bt));- auto* bt_ticker = new QLineEdit(bt);- bt_ticker->setPlaceholderText("AAPL");- bt_ticker->setStyleSheet(input_ss());- text_inputs_["gs_bt_ticker"] = bt_ticker;- bvl->addWidget(build_input_row("Ticker", bt_ticker, bt));- auto* bt_capital = make_double_spin(1000, 1e12, 100000, 0, "", bt);- double_inputs_["gs_bt_capital"] = bt_capital;- bvl->addWidget(build_input_row("Initial Capital ($)", bt_capital, bt));- auto* bt_lookback = new QSpinBox(bt);- bt_lookback->setRange(5, 252);- bt_lookback->setValue(20);- bt_lookback->setStyleSheet(spinbox_ss());- int_inputs_["gs_bt_lookback"] = bt_lookback;- bvl->addWidget(build_input_row("Lookback Period", bt_lookback, bt));- auto* bt_run = make_run_button("RUN BACKTEST", bt);- connect(bt_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Backtesting...");- QJsonObject params;- params["strategy"] = combo_inputs_["gs_bt_strategy"]->currentText();- params["ticker"] = text_inputs_["gs_bt_ticker"]->text();- params["initial_capital"] = double_inputs_["gs_bt_capital"]->value();- params["lookback"] = int_inputs_["gs_bt_lookback"]->value();- AIQuantLabService::instance().gs_backtest(params);- });- bvl->addWidget(bt_run);- bvl->addStretch();- tabs->addTab(bt, "Backtest");-- // ── Statistics ──- auto* stats = new QWidget(this);- auto* stvl = new QVBoxLayout(stats);- stvl->setContentsMargins(12, 12, 12, 12);- stvl->setSpacing(8);- auto* st_vals = new QLineEdit(stats);- st_vals->setPlaceholderText("Values (comma-separated, e.g. 10.5,11.2,9.8)");- st_vals->setStyleSheet(input_ss());- text_inputs_["gs_stats_values"] = st_vals;- stvl->addWidget(build_input_row("Values", st_vals, stats));- auto* stats_run = make_run_button("CALCULATE STATISTICS", stats);- connect(stats_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Calculating...");- QJsonObject params;- params["values"] = text_inputs_["gs_stats_values"]->text();- AIQuantLabService::instance().gs_statistics(params);- });- stvl->addWidget(stats_run);- stvl->addStretch();- tabs->addTab(stats, "Statistics");-- vl->addWidget(tabs);-- auto* rc = new QWidget(w);- results_layout_ = new QVBoxLayout(rc);- results_layout_->setContentsMargins(0, 8, 0, 0);- results_layout_->setSpacing(8);- vl->addWidget(rc);-- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// CFA QUANT PANEL — 8 analysis types-// ═══════════════════════════════════════════════════════════════════════════════--QWidget* QuantModulePanel::build_cfa_quant_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- // ── Section header ──────────────────────────────────────────────────────- auto* data_lbl = new QLabel("DATA INPUT", w);- data_lbl->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2;"- "letter-spacing:1px;")- .arg(module_.color.name())- .arg(ui::fonts::DATA_FAMILY));- vl->addWidget(data_lbl);-- // ── Symbol / data input ─────────────────────────────────────────────────- auto* symbol = new QLineEdit(w);- symbol->setPlaceholderText("Ticker (AAPL, ^GSPC, BTC-USD) or comma-separated values");- symbol->setStyleSheet(input_ss());- symbol->setText("AAPL");- text_inputs_["cfa_symbol"] = symbol;- vl->addWidget(build_input_row("Symbol / Data", symbol, w));-- // Period / interval / column for ticker fetches- auto* period = new QComboBox(w);- period->addItems({"1mo", "3mo", "6mo", "1y", "2y", "5y", "10y", "max"});- period->setCurrentText("1y");- period->setStyleSheet(combo_ss());- combo_inputs_["cfa_period"] = period;- vl->addWidget(build_input_row("Period (ticker only)", period, w));-- auto* interval = new QComboBox(w);- interval->addItems({"1d", "1wk", "1mo"});- interval->setStyleSheet(combo_ss());- combo_inputs_["cfa_interval"] = interval;- vl->addWidget(build_input_row("Interval (ticker only)", interval, w));-- // ── Analysis selector ───────────────────────────────────────────────────- auto* analysis_type = new QComboBox(w);- const QStringList analyses = {- "trend_analysis", "stationarity_test", "arima_model", "forecasting",- "supervised_learning", "unsupervised_learning", "model_evaluation",- "resampling_methods", "sampling_techniques", "central_limit_theorem",- "sampling_error_analysis", "validate_data",- };- analysis_type->addItems(analyses);- analysis_type->setStyleSheet(combo_ss());- combo_inputs_["cfa_analysis"] = analysis_type;- vl->addWidget(build_input_row("Analysis Type", analysis_type, w));-- // ── Per-analysis parameter stack ────────────────────────────────────────- auto* params_lbl = new QLabel("ANALYSIS PARAMETERS", w);- params_lbl->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2;"- "letter-spacing:1px; margin-top:8px;")- .arg(module_.color.name())- .arg(ui::fonts::DATA_FAMILY));- vl->addWidget(params_lbl);-- auto* stack = new QStackedWidget(w);- auto add_page = [&](std::initializer_list<QWidget*> rows) {- auto* page = new QWidget(stack);- auto* pv = new QVBoxLayout(page);- pv->setContentsMargins(0, 0, 0, 0);- pv->setSpacing(6);- for (auto* r : rows)- pv->addWidget(r);- pv->addStretch();- stack->addWidget(page);- return page;- };-- // 0: trend_analysis — trend_type- {- auto* t = new QComboBox(stack);- t->addItems({"linear", "log_linear"});- t->setStyleSheet(combo_ss());- combo_inputs_["cfa_trend_type"] = t;- add_page({build_input_row("Trend Type", t, stack)});- }- // 1: stationarity_test — test_type- {- auto* t = new QComboBox(stack);- t->addItems({"adf", "kpss"});- t->setStyleSheet(combo_ss());- combo_inputs_["cfa_stationarity_test"] = t;- add_page({build_input_row("Test Type", t, stack)});- }- // 2: arima_model — order p,d,q + optional seasonal- {- auto* p = new QSpinBox(stack);- p->setRange(0, 10);- p->setValue(1);- p->setStyleSheet(spinbox_ss());- int_inputs_["cfa_arima_p"] = p;- auto* d = new QSpinBox(stack);- d->setRange(0, 3);- d->setValue(0);- d->setStyleSheet(spinbox_ss());- int_inputs_["cfa_arima_d"] = d;- auto* q = new QSpinBox(stack);- q->setRange(0, 10);- q->setValue(1);- q->setStyleSheet(spinbox_ss());- int_inputs_["cfa_arima_q"] = q;- add_page({- build_input_row("AR order (p)", p, stack),- build_input_row("Differencing (d)", d, stack),- build_input_row("MA order (q)", q, stack),- });- }- // 3: forecasting — horizon, method, train_size- {- auto* h = new QSpinBox(stack);- h->setRange(1, 252);- h->setValue(5);- h->setStyleSheet(spinbox_ss());- int_inputs_["cfa_forecast_horizon"] = h;- auto* m = new QComboBox(stack);- m->addItems({"simple_exponential", "holt", "holt_winters", "arima", "naive", "drift"});- m->setStyleSheet(combo_ss());- combo_inputs_["cfa_forecast_method"] = m;- auto* ts = make_double_spin(0.5, 0.95, 0.8, 2, "", stack);- double_inputs_["cfa_forecast_train_size"] = ts;- add_page({- build_input_row("Horizon (steps)", h, stack),- build_input_row("Method", m, stack),- build_input_row("Train Size", ts, stack),- });- }- // 4: supervised_learning — n_lags, problem_type, algorithms- {- auto* lags = new QSpinBox(stack);- lags->setRange(1, 50);- lags->setValue(5);- lags->setStyleSheet(spinbox_ss());- int_inputs_["cfa_sup_lags"] = lags;- auto* pt = new QComboBox(stack);- pt->addItems({"regression", "classification"});- pt->setStyleSheet(combo_ss());- combo_inputs_["cfa_sup_problem"] = pt;- auto* algos = new QLineEdit(stack);- algos->setText("ridge,random_forest");- algos->setPlaceholderText("comma-separated: ridge,lasso,random_forest,svr,knn");- algos->setStyleSheet(input_ss());- text_inputs_["cfa_sup_algorithms"] = algos;- add_page({- build_input_row("Lag features (n_lags)", lags, stack),- build_input_row("Problem Type", pt, stack),- build_input_row("Algorithms", algos, stack),- });- }- // 5: unsupervised_learning — n_lags, methods- {- auto* lags = new QSpinBox(stack);- lags->setRange(1, 50);- lags->setValue(5);- lags->setStyleSheet(spinbox_ss());- int_inputs_["cfa_unsup_lags"] = lags;- auto* methods = new QLineEdit(stack);- methods->setText("pca,kmeans");- methods->setPlaceholderText("comma-separated: pca,kmeans,agglomerative");- methods->setStyleSheet(input_ss());- text_inputs_["cfa_unsup_methods"] = methods;- add_page({- build_input_row("Lag features (n_lags)", lags, stack),- build_input_row("Methods", methods, stack),- });- }- // 6: model_evaluation — n_lags, model_type, cv_folds- {- auto* lags = new QSpinBox(stack);- lags->setRange(1, 50);- lags->setValue(5);- lags->setStyleSheet(spinbox_ss());- int_inputs_["cfa_eval_lags"] = lags;- auto* mt = new QComboBox(stack);- mt->addItems({"random_forest", "ridge", "lasso", "svr", "knn", "decision_tree"});- mt->setStyleSheet(combo_ss());- combo_inputs_["cfa_eval_model"] = mt;- auto* cv = new QSpinBox(stack);- cv->setRange(2, 20);- cv->setValue(5);- cv->setStyleSheet(spinbox_ss());- int_inputs_["cfa_eval_cv"] = cv;- add_page({- build_input_row("Lag features (n_lags)", lags, stack),- build_input_row("Model Type", mt, stack),- build_input_row("CV Folds", cv, stack),- });- }- // 7: resampling_methods — methods, n_resamples- {- auto* m = new QLineEdit(stack);- m->setText("bootstrap,jackknife");- m->setPlaceholderText("comma-separated: bootstrap,jackknife,permutation");- m->setStyleSheet(input_ss());- text_inputs_["cfa_resample_methods"] = m;- auto* n = new QSpinBox(stack);- n->setRange(50, 100000);- n->setValue(1000);- n->setStyleSheet(spinbox_ss());- int_inputs_["cfa_resample_n"] = n;- add_page({- build_input_row("Methods", m, stack),- build_input_row("Resamples", n, stack),- });- }- // 8: sampling_techniques — sample_size, methods (population uses Symbol/Data)- {- auto* size = new QSpinBox(stack);- size->setRange(10, 100000);- size->setValue(100);- size->setStyleSheet(spinbox_ss());- int_inputs_["cfa_sampling_size"] = size;- auto* m = new QLineEdit(stack);- m->setText("simple,stratified,systematic");- m->setStyleSheet(input_ss());- text_inputs_["cfa_sampling_methods"] = m;- add_page({- build_input_row("Sample Size", size, stack),- build_input_row("Methods", m, stack),- });- }- // 9: central_limit_theorem — distribution, sample_sizes, n_samples- {- auto* dist = new QComboBox(stack);- dist->addItems({"exponential", "uniform", "normal", "poisson", "binomial"});- dist->setStyleSheet(combo_ss());- combo_inputs_["cfa_clt_dist"] = dist;- auto* sizes = new QLineEdit(stack);- sizes->setText("5,10,30,100");- sizes->setStyleSheet(input_ss());- text_inputs_["cfa_clt_sizes"] = sizes;- auto* n = new QSpinBox(stack);- n->setRange(100, 100000);- n->setValue(1000);- n->setStyleSheet(spinbox_ss());- int_inputs_["cfa_clt_n"] = n;- add_page({- build_input_row("Distribution", dist, stack),- build_input_row("Sample Sizes", sizes, stack),- build_input_row("Samples per size", n, stack),- });- }- // 10: sampling_error_analysis — pop_mean, pop_std, sample_sizes, conf, n_sims- {- auto* mean = make_double_spin(-1e6, 1e6, 0.0, 4, "", stack);- double_inputs_["cfa_serr_mean"] = mean;- auto* sd = make_double_spin(0.0001, 1e6, 1.0, 4, "", stack);- double_inputs_["cfa_serr_std"] = sd;- auto* sizes = new QLineEdit(stack);- sizes->setText("10,30,50,100,500");- sizes->setStyleSheet(input_ss());- text_inputs_["cfa_serr_sizes"] = sizes;- auto* conf = make_double_spin(0.5, 0.999, 0.95, 3, "", stack);- double_inputs_["cfa_serr_conf"] = conf;- auto* sims = new QSpinBox(stack);- sims->setRange(100, 100000);- sims->setValue(1000);- sims->setStyleSheet(spinbox_ss());- int_inputs_["cfa_serr_sims"] = sims;- add_page({- build_input_row("Population Mean", mean, stack),- build_input_row("Population Std", sd, stack),- build_input_row("Sample Sizes", sizes, stack),- build_input_row("Confidence Level", conf, stack),- build_input_row("Simulations", sims, stack),- });- }- // 11: validate_data — data_type, data_name- {- auto* dt = new QComboBox(stack);- dt->addItems({"general", "returns", "prices", "rates"});- dt->setStyleSheet(combo_ss());- combo_inputs_["cfa_validate_type"] = dt;- auto* dn = new QLineEdit(stack);- dn->setText("data");- dn->setStyleSheet(input_ss());- text_inputs_["cfa_validate_name"] = dn;- add_page({- build_input_row("Data Type", dt, stack),- build_input_row("Data Name", dn, stack),- });- }-- vl->addWidget(stack);-- // Switch stack page when analysis combo changes- connect(analysis_type, qOverload<int>(&QComboBox::currentIndexChanged), stack,- &QStackedWidget::setCurrentIndex);-- // ── Run button ──────────────────────────────────────────────────────────- auto* run = make_run_button("RUN ANALYSIS", w);- connect(run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Running...");- const QString cmd = combo_inputs_["cfa_analysis"]->currentText();- const QString raw = text_inputs_["cfa_symbol"]->text().trimmed();-- QJsonObject params;- params["period"] = combo_inputs_["cfa_period"]->currentText();- params["interval"] = combo_inputs_["cfa_interval"]->currentText();-- // Sample-error analysis is the only command that doesn't read from "data".- // Everything else reads from "data" (or "population" for sampling_techniques).- const bool needs_data = (cmd != "sampling_error_analysis" &&- cmd != "central_limit_theorem");- if (needs_data && raw.isEmpty()) {- display_error("Please enter a ticker symbol or comma-separated values");- status_label_->setText("Error");- return;- }- if (cmd == "sampling_techniques")- params["population"] = raw;- else if (needs_data)- params["data"] = raw;-- auto split_csv = [](const QString& s) {- QJsonArray arr;- for (const auto& part : s.split(',', Qt::SkipEmptyParts))- arr.append(part.trimmed());- return arr;- };- auto split_csv_int = [](const QString& s) {- QJsonArray arr;- for (const auto& part : s.split(',', Qt::SkipEmptyParts)) {- bool ok = false;- int v = part.trimmed().toInt(&ok);- if (ok) arr.append(v);- }- return arr;- };-- if (cmd == "trend_analysis") {- params["trend_type"] = combo_inputs_["cfa_trend_type"]->currentText();- } else if (cmd == "stationarity_test") {- params["test_type"] = combo_inputs_["cfa_stationarity_test"]->currentText();- } else if (cmd == "arima_model") {- QJsonArray order;- order.append(int_inputs_["cfa_arima_p"]->value());- order.append(int_inputs_["cfa_arima_d"]->value());- order.append(int_inputs_["cfa_arima_q"]->value());- params["order"] = order;- } else if (cmd == "forecasting") {- params["horizon"] = int_inputs_["cfa_forecast_horizon"]->value();- params["method"] = combo_inputs_["cfa_forecast_method"]->currentText();- params["train_size"] = double_inputs_["cfa_forecast_train_size"]->value();- } else if (cmd == "supervised_learning") {- params["n_lags"] = int_inputs_["cfa_sup_lags"]->value();- params["problem_type"] = combo_inputs_["cfa_sup_problem"]->currentText();- params["algorithms"] = split_csv(text_inputs_["cfa_sup_algorithms"]->text());- } else if (cmd == "unsupervised_learning") {- params["n_lags"] = int_inputs_["cfa_unsup_lags"]->value();- params["methods"] = split_csv(text_inputs_["cfa_unsup_methods"]->text());- } else if (cmd == "model_evaluation") {- params["n_lags"] = int_inputs_["cfa_eval_lags"]->value();- params["model_type"] = combo_inputs_["cfa_eval_model"]->currentText();- params["cv_folds"] = int_inputs_["cfa_eval_cv"]->value();- } else if (cmd == "resampling_methods") {- params["methods"] = split_csv(text_inputs_["cfa_resample_methods"]->text());- params["n_resamples"] = int_inputs_["cfa_resample_n"]->value();- } else if (cmd == "sampling_techniques") {- params["sample_size"] = int_inputs_["cfa_sampling_size"]->value();- params["sampling_methods"] = split_csv(text_inputs_["cfa_sampling_methods"]->text());- } else if (cmd == "central_limit_theorem") {- params["population_dist"] = combo_inputs_["cfa_clt_dist"]->currentText();- params["sample_sizes"] = split_csv_int(text_inputs_["cfa_clt_sizes"]->text());- params["n_samples"] = int_inputs_["cfa_clt_n"]->value();- } else if (cmd == "sampling_error_analysis") {- params["population_mean"] = double_inputs_["cfa_serr_mean"]->value();- params["population_std"] = double_inputs_["cfa_serr_std"]->value();- params["sample_sizes"] = split_csv_int(text_inputs_["cfa_serr_sizes"]->text());- params["confidence_level"] = double_inputs_["cfa_serr_conf"]->value();- params["n_simulations"] = int_inputs_["cfa_serr_sims"]->value();- } else if (cmd == "validate_data") {- params["data_type"] = combo_inputs_["cfa_validate_type"]->currentText();- params["data_name"] = text_inputs_["cfa_validate_name"]->text();- }-- AIQuantLabService::instance().run_module("cfa_quant", cmd, params);- });- vl->addWidget(run);-- // ── Results container ───────────────────────────────────────────────────- auto* rc = new QWidget(w);- results_layout_ = new QVBoxLayout(rc);- results_layout_->setContentsMargins(0, 8, 0, 0);- results_layout_->setSpacing(8);- vl->addWidget(rc);- vl->addStretch();-- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// BACKTESTING PANEL-// ═══════════════════════════════════════════════════════════════════════════════--QWidget* QuantModulePanel::build_backtesting_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- auto* strat = new QComboBox(w);- strat->addItems({"topk_dropout", "weight_based", "enhanced_indexing"});- strat->setStyleSheet(combo_ss());- combo_inputs_["bt_strategy"] = strat;- vl->addWidget(build_input_row("Strategy", strat, w));-- auto* instruments = new QLineEdit(w);- instruments->setPlaceholderText("AAPL,MSFT,GOOG,AMZN");- instruments->setStyleSheet(input_ss());- text_inputs_["bt_instruments"] = instruments;- vl->addWidget(build_input_row("Instruments", instruments, w));-- auto* start_date = new QDateEdit(QDate(2020, 1, 1), w);- start_date->setDisplayFormat("yyyy-MM-dd");- start_date->setCalendarPopup(true);- start_date->setStyleSheet(input_ss());- date_inputs_["bt_start"] = start_date;- vl->addWidget(build_input_row("Start Date", start_date, w));-- auto* end_date = new QDateEdit(QDate(2024, 1, 1), w);- end_date->setDisplayFormat("yyyy-MM-dd");- end_date->setCalendarPopup(true);- end_date->setStyleSheet(input_ss());- date_inputs_["bt_end"] = end_date;- vl->addWidget(build_input_row("End Date", end_date, w));-- auto* capital = make_double_spin(1000, 1e12, 1e6, 0, "", w);- double_inputs_["bt_capital"] = capital;- vl->addWidget(build_input_row("Initial Capital ($)", capital, w));-- auto* topk = new QSpinBox(w);- topk->setRange(1, 100);- topk->setValue(10);- topk->setStyleSheet(spinbox_ss());- int_inputs_["bt_topk"] = topk;- vl->addWidget(build_input_row("Top K Positions", topk, w));-- auto* benchmark = new QLineEdit(w);- benchmark->setPlaceholderText("SH000300 (CSI300)");- benchmark->setStyleSheet(input_ss());- text_inputs_["bt_benchmark"] = benchmark;- vl->addWidget(build_input_row("Benchmark", benchmark, w));-- auto* run = make_run_button("RUN BACKTEST", w);- connect(run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Backtesting...");- QJsonObject params;- QJsonObject strategy_config;- strategy_config["type"] = combo_inputs_["bt_strategy"]->currentText();- strategy_config["topk"] = int_inputs_["bt_topk"]->value();- params["strategy_config"] = strategy_config;- QJsonObject dataset;- dataset["instruments"] = text_inputs_["bt_instruments"]->text();- dataset["start_date"] = date_inputs_["bt_start"]->date().toString("yyyy-MM-dd");- dataset["end_date"] = date_inputs_["bt_end"]->date().toString("yyyy-MM-dd");- params["dataset_config"] = dataset;- QJsonObject portfolio;- portfolio["initial_capital"] = double_inputs_["bt_capital"]->value();- portfolio["benchmark"] = text_inputs_["bt_benchmark"]->text();- params["portfolio_config"] = portfolio;- AIQuantLabService::instance().run_backtest(params);- });- vl->addWidget(run);-- auto* rc = new QWidget(w);- results_layout_ = new QVBoxLayout(rc);- results_layout_->setContentsMargins(0, 8, 0, 0);- results_layout_->setSpacing(8);- vl->addWidget(rc);- vl->addStretch();-- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// RL TRADING PANEL-// ═══════════════════════════════════════════════════════════════════════════════--QWidget* QuantModulePanel::build_rl_trading_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- auto* algo = new QComboBox(w);- algo->addItems({"PPO", "DQN", "A2C", "SAC", "TD3"});- algo->setStyleSheet(combo_ss());- combo_inputs_["rl_algo"] = algo;- vl->addWidget(build_input_row("RL Algorithm", algo, w));-- auto* ticker = new QLineEdit(w);- ticker->setPlaceholderText("AAPL");- ticker->setStyleSheet(input_ss());- text_inputs_["rl_ticker"] = ticker;- vl->addWidget(build_input_row("Ticker", ticker, w));-- auto* episodes = new QSpinBox(w);- episodes->setRange(10, 10000);- episodes->setValue(100);- episodes->setStyleSheet(spinbox_ss());- int_inputs_["rl_episodes"] = episodes;- vl->addWidget(build_input_row("Training Episodes", episodes, w));-- auto* lr = make_double_spin(0.00001, 1.0, 0.0003, 5, "", w);- double_inputs_["rl_learning_rate"] = lr;- vl->addWidget(build_input_row("Learning Rate", lr, w));-- auto* capital = make_double_spin(1000, 1e12, 100000, 0, "", w);- double_inputs_["rl_capital"] = capital;- vl->addWidget(build_input_row("Initial Capital ($)", capital, w));-- rl_train_button_ = make_run_button("TRAIN RL AGENT", w);- connect(rl_train_button_, &QPushButton::clicked, this, [this]() {- if (!rl_train_button_ || !rl_log_console_) return;- rl_log_console_->clear();- rl_progress_bar_->setValue(0);- rl_progress_bar_->setVisible(true);- rl_progress_stats_->setText("step 0 / — · reward — · loss —");- rl_progress_stats_->setVisible(true);- rl_log_console_->setVisible(true);- rl_train_button_->setEnabled(false);- status_label_->setText("Training RL Agent...");- QJsonObject params;- params["algorithm"] = combo_inputs_["rl_algo"]->currentText();- params["ticker"] = text_inputs_["rl_ticker"]->text();- params["episodes"] = int_inputs_["rl_episodes"]->value();- params["learning_rate"] = double_inputs_["rl_learning_rate"]->value();- params["initial_capital"] = double_inputs_["rl_capital"]->value();- AIQuantLabService::instance().train_rl_agent(params);- });- vl->addWidget(rl_train_button_);-- // Progress bar — hidden until training starts- rl_progress_bar_ = new QProgressBar(w);- rl_progress_bar_->setRange(0, 100);- rl_progress_bar_->setValue(0);- rl_progress_bar_->setTextVisible(true);- rl_progress_bar_->setFixedHeight(18);- rl_progress_bar_->setVisible(false);- rl_progress_bar_->setStyleSheet(- QString("QProgressBar { background:%1; border:1px solid %2; border-radius:2px; text-align:center; color:%3; }"- "QProgressBar::chunk { background:%4; }")- .arg(ui::colors::BG_RAISED())- .arg(ui::colors::BORDER_MED())- .arg(ui::colors::TEXT_PRIMARY())- .arg(module_.color.name()));- vl->addWidget(rl_progress_bar_);-- // Stats label — hidden until training starts- rl_progress_stats_ = new QLabel(w);- rl_progress_stats_->setText("");- rl_progress_stats_->setVisible(false);- rl_progress_stats_->setStyleSheet(- QString("color:%1; background:transparent; font-family:%2; font-size:%3px;")- .arg(ui::colors::TEXT_SECONDARY())- .arg(ui::fonts::DATA_FAMILY)- .arg(ui::fonts::SMALL));- vl->addWidget(rl_progress_stats_);-- // Log console — hidden until training starts- rl_log_console_ = new QPlainTextEdit(w);- rl_log_console_->setReadOnly(true);- rl_log_console_->setMaximumBlockCount(5000);- rl_log_console_->setMinimumHeight(200);- rl_log_console_->setVisible(false);- rl_log_console_->setStyleSheet(- QString("QPlainTextEdit { background:%1; color:%2; border:1px solid %3; border-radius:2px;"- "font-family:%4; font-size:%5px; padding:6px; }")- .arg(ui::colors::BG_BASE())- .arg(ui::colors::TEXT_PRIMARY())- .arg(ui::colors::BORDER_MED())- .arg(ui::fonts::DATA_FAMILY)- .arg(ui::fonts::SMALL));- vl->addWidget(rl_log_console_);-- auto* rc = new QWidget(w);- results_layout_ = new QVBoxLayout(rc);- results_layout_->setContentsMargins(0, 8, 0, 0);- results_layout_->setSpacing(8);- vl->addWidget(rc);- vl->addStretch();-- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// ADVANCED MODELS PANEL-// ═══════════════════════════════════════════════════════════════════════════════--QWidget* QuantModulePanel::build_advanced_models_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- auto* model_type = new QComboBox(w);- model_type->addItems(- {"LSTM", "GRU", "Transformer", "Localformer", "HIST", "GAT", "LightGBM", "XGBoost", "CatBoost"});- model_type->setStyleSheet(combo_ss());- combo_inputs_["adv_model"] = model_type;- vl->addWidget(build_input_row("Model Type", model_type, w));-- auto* hidden = new QSpinBox(w);- hidden->setRange(16, 1024);- hidden->setValue(64);- hidden->setStyleSheet(spinbox_ss());- int_inputs_["adv_hidden"] = hidden;- vl->addWidget(build_input_row("Hidden Size", hidden, w));-- auto* layers = new QSpinBox(w);- layers->setRange(1, 12);- layers->setValue(2);- layers->setStyleSheet(hidden->styleSheet());- int_inputs_["adv_layers"] = layers;- vl->addWidget(build_input_row("Num Layers", layers, w));-- auto* dropout = make_double_spin(0, 0.9, 0.1, 2, "", w);- double_inputs_["adv_dropout"] = dropout;- vl->addWidget(build_input_row("Dropout", dropout, w));-- auto* epochs = new QSpinBox(w);- epochs->setRange(1, 1000);- epochs->setValue(50);- epochs->setStyleSheet(hidden->styleSheet());- int_inputs_["adv_epochs"] = epochs;- vl->addWidget(build_input_row("Epochs", epochs, w));-- auto* run = make_run_button("CREATE & TRAIN MODEL", w);- connect(run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Training...");- QJsonObject params;- params["model_type"] = combo_inputs_["adv_model"]->currentText();- QJsonObject config;- config["hidden_size"] = int_inputs_["adv_hidden"]->value();- config["num_layers"] = int_inputs_["adv_layers"]->value();- config["dropout"] = double_inputs_["adv_dropout"]->value();- config["epochs"] = int_inputs_["adv_epochs"]->value();- params["model_config"] = config;- AIQuantLabService::instance().train_advanced_model(params);- });- vl->addWidget(run);-- auto* rc = new QWidget(w);- results_layout_ = new QVBoxLayout(rc);- results_layout_->setContentsMargins(0, 8, 0, 0);- results_layout_->setSpacing(8);- vl->addWidget(rc);- vl->addStretch();-- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// ═══════════════════════════════════════════════════════════════════════════════-// DEEP AGENT PANEL — tabbed: LangGraph Deep Analysis + RD-Agent Research-// ═══════════════════════════════════════════════════════════════════════════════--QWidget* QuantModulePanel::build_deep_agent_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(0, 0, 0, 0);- vl->setSpacing(0);-- // ── Shared LLM profile picker (used by both Deep Analysis and RD-Agent) ──- QComboBox* llm_combo = nullptr;- auto* llm_bar = new QWidget(w);- llm_bar->setStyleSheet(- QString("background:%1; border-bottom:1px solid %2;").arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));- auto* llm_bar_l = new QHBoxLayout(llm_bar);- llm_bar_l->setContentsMargins(16, 8, 16, 8);- llm_bar_l->setSpacing(0);- llm_bar_l->addWidget(build_llm_picker(llm_bar, &llm_combo));- vl->addWidget(llm_bar);-- auto* tabs = new QTabWidget(w);- tabs->setStyleSheet(tab_ss(module_.color.name()));-- // ── Tab 1: LangGraph Deep Analysis ──────────────────────────────────────- auto* da_w = new QWidget(tabs);- auto* da_vl = new QVBoxLayout(da_w);- da_vl->setContentsMargins(16, 16, 16, 16);- da_vl->setSpacing(12);-- auto* desc =- new QLabel("Multi-agent financial analysis powered by LangGraph. Delegates to specialist subagents "- "(research, data-analyst, trading, risk-analyzer, portfolio-optimizer, backtester, reporter).",- da_w);- desc->setWordWrap(true);- desc->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")- .arg(ui::colors::TEXT_SECONDARY())- .arg(ui::fonts::SMALL)- .arg(ui::fonts::DATA_FAMILY));- da_vl->addWidget(desc);-- auto* task_edit = new QTextEdit(da_w);- task_edit->setPlaceholderText("Describe your analysis task...\n"- "e.g. \"Conduct a full investment analysis of NVDA: research fundamentals, "- "assess risks, and give a buy/sell/hold recommendation with price target\"");- task_edit->setFixedHeight(90);- task_edit->setStyleSheet(QString("QTextEdit { background:%1; color:%2; border:1px solid %3;"- "font-family:%4; font-size:%5px; padding:6px; }")- .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_PRIMARY(), ui::colors::BORDER_MED())- .arg(ui::fonts::DATA_FAMILY)- .arg(ui::fonts::SMALL));- da_vl->addWidget(build_input_row("Task", task_edit, da_w));-- auto* agent_type = new QComboBox(da_w);- agent_type->addItems({"general", "research", "trading_strategy", "portfolio_management", "risk_assessment"});- agent_type->setStyleSheet(combo_ss());- combo_inputs_["agent_type"] = agent_type;- da_vl->addWidget(build_input_row("Agent Type", agent_type, da_w));-- auto* thread_id = new QLineEdit(da_w);- thread_id->setPlaceholderText("Optional — leave blank to auto-generate");- thread_id->setStyleSheet(QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"- "font-family:%4; font-size:%5px; padding:6px 8px; }")- .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_PRIMARY(), ui::colors::BORDER_MED())- .arg(ui::fonts::DATA_FAMILY)- .arg(ui::fonts::SMALL));- text_inputs_["thread_id"] = thread_id;- da_vl->addWidget(build_input_row("Thread ID", thread_id, da_w));-- auto* da_run = make_run_button("RUN DEEP ANALYSIS", da_w);- connect(da_run, &QPushButton::clicked, this, [this, task_edit, agent_type, thread_id, llm_combo]() {- auto task = task_edit->toPlainText().trimmed();- if (task.isEmpty()) {- display_error("Please enter an analysis task.");- return;- }- auto cfg = llm_config_from_combo(llm_combo);- if (cfg.isEmpty()) {- display_error("Select an LLM profile before running.");- return;- }- status_label_->setText("Running...");- clear_results();- QJsonObject params;- params["task"] = task;- params["agent_type"] = agent_type->currentText();- params["config"] = cfg;- auto tid = thread_id->text().trimmed();- if (!tid.isEmpty())- params["thread_id"] = tid;- AIQuantLabService::instance().run_deep_agent(params);- });- da_vl->addWidget(da_run);-- agent_output_ = new QTextEdit(da_w);- agent_output_->setReadOnly(true);- agent_output_->setPlaceholderText("Analysis results will appear here...");- agent_output_->setMinimumHeight(300);- agent_output_->setStyleSheet(output_ss());- da_vl->addWidget(agent_output_, 1);-- auto* rc = new QWidget(da_w);- results_layout_ = new QVBoxLayout(rc);- results_layout_->setContentsMargins(0, 0, 0, 0);- results_layout_->setSpacing(0);- da_vl->addWidget(rc);-- tabs->addTab(da_w, "Deep Analysis");-- // ── Tab 2: RD-Agent ─────────────────────────────────────────────────────- tabs->addTab(build_rd_agent_tab(llm_combo), "RD-Agent");-- vl->addWidget(tabs, 1);- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// RD-AGENT TAB — Autonomous factor/model research (Microsoft RD-Agent)-// ═══════════════════════════════════════════════════════════════════════════════--QWidget* QuantModulePanel::build_rd_agent_tab(QComboBox* llm_combo) {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(0, 0, 0, 0);- vl->setSpacing(0);-- // shared styles-- auto* sub = new QTabWidget(w);- sub->setStyleSheet(sub_tab_ss(module_.color.name()));-- // ── Status bar ───────────────────────────────────────────────────────────- auto* status_bar = new QWidget(w);- status_bar->setFixedHeight(28);- status_bar->setStyleSheet(- QString("background:%1; border-bottom:1px solid %2;").arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));- auto* sbl = new QHBoxLayout(status_bar);- sbl->setContentsMargins(12, 0, 12, 0);- sbl->setSpacing(8);- auto* status_dot = new QLabel("●", status_bar);- status_dot->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_TERTIARY()));- sbl->addWidget(status_dot);- auto* status_txt = new QLabel("RD-Agent ready", status_bar);- status_txt->setObjectName("rdStatusTxt");- status_txt->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")- .arg(ui::colors::TEXT_TERTIARY())- .arg(ui::fonts::TINY)- .arg(ui::fonts::DATA_FAMILY));- sbl->addWidget(status_txt, 1);- auto* check_btn = new QPushButton("CHECK STATUS", status_bar);- check_btn->setCursor(Qt::PointingHandCursor);- check_btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"- "font-family:%2; font-size:%3px; padding:2px 8px; border-radius:2px; }"- "QPushButton:hover { background:%1; color:%4; }")- .arg(module_.color.name())- .arg(ui::fonts::DATA_FAMILY)- .arg(ui::fonts::TINY)- .arg(ui::colors::BG_BASE()));- connect(check_btn, &QPushButton::clicked, this, [status_txt]() {- status_txt->setText("Checking...");- AIQuantLabService::instance().rd_agent_check_status();- });- sbl->addWidget(check_btn);-- auto* ui_btn = new QPushButton("OPEN LOG VIEWER", status_bar);- ui_btn->setCursor(Qt::PointingHandCursor);- ui_btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"- "font-family:%2; font-size:%3px; padding:2px 8px; border-radius:2px; }"- "QPushButton:hover { background:%1; color:%4; }")- .arg(ui::colors::TEXT_TERTIARY())- .arg(ui::fonts::DATA_FAMILY)- .arg(ui::fonts::TINY)- .arg(ui::colors::BG_BASE()));- connect(ui_btn, &QPushButton::clicked, this, [status_txt]() {- status_txt->setText("Starting log viewer...");- AIQuantLabService::instance().rd_agent_start_ui();- });- sbl->addWidget(ui_btn);-- auto* mcp_btn = new QPushButton("MCP TOOLS", status_bar);- mcp_btn->setCursor(Qt::PointingHandCursor);- mcp_btn->setCheckable(true);- mcp_btn->setToolTip("Start/stop the Fincept MCP tool server\n"- "Gives RD-Agent loops access to market data,\n"- "financial news and economics tools.");- mcp_btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"- "font-family:%2; font-size:%3px; padding:2px 8px; border-radius:2px; }"- "QPushButton:checked { background:%4; color:%5; border-color:%4; }"- "QPushButton:hover { background:%1; color:%5; }")- .arg(ui::colors::TEXT_TERTIARY())- .arg(ui::fonts::DATA_FAMILY)- .arg(ui::fonts::TINY)- .arg(module_.color.name())- .arg(ui::colors::BG_BASE()));- connect(mcp_btn, &QPushButton::toggled, this, [mcp_btn, status_txt](bool checked) {- if (checked) {- status_txt->setText("Starting MCP tool server...");- AIQuantLabService::instance().rd_agent_start_mcp_server();- } else {- status_txt->setText("MCP tool server stopped");- mcp_btn->setText("MCP TOOLS");- }- });- sbl->addWidget(mcp_btn);- vl->addWidget(status_bar);-- // ── Sub-tab 1: Factor Mining ─────────────────────────────────────────────- auto* fm_w = new QWidget(sub);- auto* fm_vl = new QVBoxLayout(fm_w);- fm_vl->setContentsMargins(14, 14, 14, 14);- fm_vl->setSpacing(10);-- auto* fm_desc = new QLabel("Autonomous alpha factor discovery via FactorRDLoop. The agent proposes, codes, runs "- "and evaluates factors iteratively until the target IC is reached.",- fm_w);- fm_desc->setWordWrap(true);- fm_desc->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")- .arg(ui::colors::TEXT_SECONDARY())- .arg(ui::fonts::SMALL)- .arg(ui::fonts::DATA_FAMILY));- fm_vl->addWidget(fm_desc);-- auto* fm_task = new QTextEdit(fm_w);- fm_task->setPlaceholderText(- "Describe the factor hypothesis...\ne.g. \"Discover momentum-based alpha factors for US equities\"");- fm_task->setFixedHeight(70);- fm_task->setStyleSheet(input_ss());- fm_vl->addWidget(build_input_row("Task Description", fm_task, fm_w));-- auto* fm_market = new QComboBox(fm_w);- fm_market->addItems({"US", "CN", "EU", "IN", "JP", "HK", "GLOBAL"});- fm_market->setStyleSheet(combo_ss());- fm_vl->addWidget(build_input_row("Target Market", fm_market, fm_w));-- auto* fm_iter = new QSpinBox(fm_w);- fm_iter->setRange(1, 100);- fm_iter->setValue(10);- fm_iter->setStyleSheet(input_ss());- fm_vl->addWidget(build_input_row("Max Iterations", fm_iter, fm_w));-- auto* fm_ic = make_double_spin(0.01, 0.50, 0.05, 3, "", fm_w);- fm_vl->addWidget(build_input_row("Target IC", fm_ic, fm_w));-- auto* fm_run = make_run_button("START FACTOR MINING", fm_w);- connect(fm_run, &QPushButton::clicked, this, [this, fm_task, fm_market, fm_iter, fm_ic, status_txt, llm_combo]() {- auto desc_text = fm_task->toPlainText().trimmed();- if (desc_text.isEmpty()) {- display_error("Enter a task description.");- return;- }- auto cfg = llm_config_from_combo(llm_combo);- if (cfg.isEmpty()) {- display_error("Select an LLM profile before running.");- return;- }- status_label_->setText("Starting...");- status_txt->setText("Factor mining started...");- QJsonObject params;- params["task_description"] = desc_text;- params["target_market"] = fm_market->currentText();- params["max_iterations"] = fm_iter->value();- params["target_ic"] = fm_ic->value();- params["config"] = cfg;- AIQuantLabService::instance().rd_agent_start_factor_mining(params);- });- fm_vl->addWidget(fm_run);- fm_vl->addStretch();- sub->addTab(fm_w, "Factor Mining");-- // ── Sub-tab 2: Model Optimization ────────────────────────────────────────- auto* mo_w = new QWidget(sub);- auto* mo_vl = new QVBoxLayout(mo_w);- mo_vl->setContentsMargins(14, 14, 14, 14);- mo_vl->setSpacing(10);-- auto* mo_desc = new QLabel("ML model hyperparameter optimization via ModelRDLoop. Supports LightGBM, XGBoost, "- "LSTM, GRU, Transformer and TCN. Optimizes for Sharpe, IC, max drawdown, or win rate.",- mo_w);- mo_desc->setWordWrap(true);- mo_desc->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")- .arg(ui::colors::TEXT_SECONDARY())- .arg(ui::fonts::SMALL)- .arg(ui::fonts::DATA_FAMILY));- mo_vl->addWidget(mo_desc);-- auto* mo_model = new QComboBox(mo_w);- mo_model->addItems({"lightgbm", "xgboost", "lstm", "gru", "transformer", "tcn"});- mo_model->setStyleSheet(combo_ss());- mo_vl->addWidget(build_input_row("Model Type", mo_model, mo_w));-- auto* mo_target = new QComboBox(mo_w);- mo_target->addItems({"sharpe", "ic", "max_drawdown", "win_rate", "calmar_ratio"});- mo_target->setStyleSheet(combo_ss());- mo_vl->addWidget(build_input_row("Optimize For", mo_target, mo_w));-- auto* mo_iter = new QSpinBox(mo_w);- mo_iter->setRange(1, 100);- mo_iter->setValue(10);- mo_iter->setStyleSheet(input_ss());- mo_vl->addWidget(build_input_row("Max Iterations", mo_iter, mo_w));-- auto* mo_run = make_run_button("START MODEL OPTIMIZATION", mo_w);- connect(mo_run, &QPushButton::clicked, this, [this, mo_model, mo_target, mo_iter, status_txt, llm_combo]() {- auto cfg = llm_config_from_combo(llm_combo);- if (cfg.isEmpty()) {- display_error("Select an LLM profile before running.");- return;- }- status_label_->setText("Starting...");- status_txt->setText("Model optimization started...");- QJsonObject params;- params["model_type"] = mo_model->currentText();- params["optimization_target"] = mo_target->currentText();- params["max_iterations"] = mo_iter->value();- params["config"] = cfg;- AIQuantLabService::instance().rd_agent_start_model_optimization(params);- });- mo_vl->addWidget(mo_run);- mo_vl->addStretch();- sub->addTab(mo_w, "Model Optimization");-- // ── Sub-tab 3: Quant Research ─────────────────────────────────────────────- auto* qr_w = new QWidget(sub);- auto* qr_vl = new QVBoxLayout(qr_w);- qr_vl->setContentsMargins(14, 14, 14, 14);- qr_vl->setSpacing(10);-- auto* qr_desc = new QLabel("Combined factor discovery + model optimization via QuantRDLoop. Runs the full "- "research pipeline end-to-end: propose factors, code them, backtest, refine.",- qr_w);- qr_desc->setWordWrap(true);- qr_desc->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")- .arg(ui::colors::TEXT_SECONDARY())- .arg(ui::fonts::SMALL)- .arg(ui::fonts::DATA_FAMILY));- qr_vl->addWidget(qr_desc);-- auto* qr_goal = new QTextEdit(qr_w);- qr_goal->setPlaceholderText(- "Research goal...\ne.g. \"Build a quantitative equity strategy for mid-cap US stocks\"");- qr_goal->setFixedHeight(70);- qr_goal->setStyleSheet(input_ss());- qr_vl->addWidget(build_input_row("Research Goal", qr_goal, qr_w));-- auto* qr_market = new QComboBox(qr_w);- qr_market->addItems({"US", "CN", "EU", "IN", "JP", "HK", "GLOBAL"});- qr_market->setStyleSheet(combo_ss());- qr_vl->addWidget(build_input_row("Target Market", qr_market, qr_w));-- auto* qr_iter = new QSpinBox(qr_w);- qr_iter->setRange(1, 100);- qr_iter->setValue(15);- qr_iter->setStyleSheet(input_ss());- qr_vl->addWidget(build_input_row("Max Iterations", qr_iter, qr_w));-- auto* qr_run = make_run_button("START QUANT RESEARCH", qr_w);- connect(qr_run, &QPushButton::clicked, this, [this, qr_goal, qr_market, qr_iter, status_txt, llm_combo]() {- auto goal = qr_goal->toPlainText().trimmed();- if (goal.isEmpty()) {- display_error("Enter a research goal.");- return;- }- auto cfg = llm_config_from_combo(llm_combo);- if (cfg.isEmpty()) {- display_error("Select an LLM profile before running.");- return;- }- status_label_->setText("Starting...");- status_txt->setText("Quant research started...");- QJsonObject params;- params["research_goal"] = goal;- params["target_market"] = qr_market->currentText();- params["max_iterations"] = qr_iter->value();- params["config"] = cfg;- AIQuantLabService::instance().rd_agent_start_quant_research(params);- });- qr_vl->addWidget(qr_run);- qr_vl->addStretch();- sub->addTab(qr_w, "Quant Research");-- // ── Sub-tab 4: Task Monitor ───────────────────────────────────────────────- auto* tm_w = new QWidget(sub);- auto* tm_vl = new QVBoxLayout(tm_w);- tm_vl->setContentsMargins(14, 14, 14, 14);- tm_vl->setSpacing(8);-- // Toolbar: filter + buttons- auto* tm_toolbar = new QWidget(tm_w);- auto* tm_hl = new QHBoxLayout(tm_toolbar);- tm_hl->setContentsMargins(0, 0, 0, 0);- tm_hl->setSpacing(6);-- auto* filter_combo = new QComboBox(tm_toolbar);- filter_combo->addItems({"All", "running", "completed", "stopped", "failed"});- filter_combo->setFixedWidth(120);- filter_combo->setStyleSheet(combo_ss());- tm_hl->addWidget(filter_combo);-- auto* refresh_btn = new QPushButton("REFRESH", tm_toolbar);- refresh_btn->setCursor(Qt::PointingHandCursor);- refresh_btn->setStyleSheet(- QString("QPushButton { background:%1; color:%2; border:none;"- "font-family:%3; font-size:%4px; font-weight:700; padding:5px 12px; border-radius:2px; }"- "QPushButton:hover { background:%5; }")- .arg(module_.color.name())- .arg(ui::colors::BG_BASE())- .arg(ui::fonts::DATA_FAMILY)- .arg(ui::fonts::TINY)- .arg(module_.color.lighter(120).name()));- tm_hl->addWidget(refresh_btn);-- auto* task_id_input = new QLineEdit(tm_toolbar);- task_id_input->setPlaceholderText("Task ID...");- task_id_input->setStyleSheet(input_ss());- task_id_input->setFixedWidth(200);- tm_hl->addWidget(task_id_input);-- auto* stop_btn = new QPushButton("STOP", tm_toolbar);- stop_btn->setCursor(Qt::PointingHandCursor);- stop_btn->setStyleSheet(- QString("QPushButton { background:" + QString(ui::colors::NEGATIVE()) +- "; color:" + QString(ui::colors::TEXT_PRIMARY()) +- "; border:none;"- "font-family:%1; font-size:%2px; font-weight:700; padding:5px 12px; border-radius:2px; }"- "QPushButton:hover { background:" +- QString(ui::colors::NEGATIVE()) + "; }")- .arg(ui::fonts::DATA_FAMILY)- .arg(ui::fonts::TINY));- tm_hl->addWidget(stop_btn);-- auto* resume_btn = new QPushButton("RESUME", tm_toolbar);- resume_btn->setCursor(Qt::PointingHandCursor);- resume_btn->setStyleSheet(- QString("QPushButton { background:" + QString(ui::colors::POSITIVE()) +- "; color:" + QString(ui::colors::TEXT_PRIMARY()) +- "; border:none;"- "font-family:%1; font-size:%2px; font-weight:700; padding:5px 12px; border-radius:2px; }"- "QPushButton:hover { background:" +- QString(ui::colors::POSITIVE()) + "; }")- .arg(ui::fonts::DATA_FAMILY)- .arg(ui::fonts::TINY));- tm_hl->addWidget(resume_btn);-- auto* factors_btn = new QPushButton("GET FACTORS", tm_toolbar);- factors_btn->setCursor(Qt::PointingHandCursor);- factors_btn->setStyleSheet(- QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"- "font-family:%2; font-size:%3px; font-weight:700; padding:5px 10px; border-radius:2px; }"- "QPushButton:hover { background:%1; color:%4; }")- .arg(module_.color.name())- .arg(ui::fonts::DATA_FAMILY)- .arg(ui::fonts::TINY)- .arg(ui::colors::BG_BASE()));- tm_hl->addWidget(factors_btn);- tm_hl->addStretch();- tm_vl->addWidget(tm_toolbar);-- // Task table- rd_task_table_ = new QTableWidget(0, 6, tm_w);- rd_task_table_->setHorizontalHeaderLabels({"Task ID", "Type", "Status", "Progress", "Best IC", "Elapsed"});- rd_task_table_->horizontalHeader()->setStretchLastSection(true);- rd_task_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- rd_task_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- rd_task_table_->setAlternatingRowColors(true);- rd_task_table_->setStyleSheet(table_ss());- tm_vl->addWidget(rd_task_table_, 1);-- // Output area for factor results- rd_agent_output_ = new QTextEdit(tm_w);- rd_agent_output_->setReadOnly(true);- rd_agent_output_->setPlaceholderText("Select a task and click GET FACTORS / GET MODEL to view results...");- rd_agent_output_->setFixedHeight(160);- rd_agent_output_->setStyleSheet(output_ss());- tm_vl->addWidget(rd_agent_output_);-- // Wire toolbar buttons- connect(refresh_btn, &QPushButton::clicked, this, [filter_combo]() {- auto filter = filter_combo->currentText();- AIQuantLabService::instance().rd_agent_list_tasks(filter == "All" ? QString{} : filter);- });-- connect(stop_btn, &QPushButton::clicked, this, [this, task_id_input]() {- auto tid = task_id_input->text().trimmed();- if (tid.isEmpty() && rd_task_table_->currentRow() >= 0)- tid = rd_task_table_->item(rd_task_table_->currentRow(), 0)->text();- if (tid.isEmpty()) {- display_error("Select or enter a task ID.");- return;- }- AIQuantLabService::instance().rd_agent_stop_task(tid);- });-- connect(resume_btn, &QPushButton::clicked, this, [this, task_id_input]() {- auto tid = task_id_input->text().trimmed();- if (tid.isEmpty() && rd_task_table_->currentRow() >= 0)- tid = rd_task_table_->item(rd_task_table_->currentRow(), 0)->text();- if (tid.isEmpty()) {- display_error("Select or enter a task ID.");- return;- }- AIQuantLabService::instance().rd_agent_resume_task(tid);- });-- connect(factors_btn, &QPushButton::clicked, this, [this, task_id_input]() {- auto tid = task_id_input->text().trimmed();- if (tid.isEmpty() && rd_task_table_->currentRow() >= 0)- tid = rd_task_table_->item(rd_task_table_->currentRow(), 0)->text();- if (tid.isEmpty()) {- display_error("Select or enter a task ID.");- return;- }- AIQuantLabService::instance().rd_agent_get_discovered_factors(tid);- });-- // Populate task_id_input on row click- connect(rd_task_table_, &QTableWidget::currentCellChanged, this, [task_id_input, this](int row, int, int, int) {- if (row >= 0 && rd_task_table_->item(row, 0))- task_id_input->setText(rd_task_table_->item(row, 0)->text());- });-- sub->addTab(tm_w, "Task Monitor");-- vl->addWidget(sub, 1);- return w;-}-// ═══════════════════════════════════════════════════════════════════════════════// GENERIC PANEL — for modules without specialized UI// ═══════════════════════════════════════════════════════════════════════════════@@ -1884,544 +389,65 @@ void QuantModulePanel::display_error(const QString& msg) {status_label_->setText("Error");}-static QString format_val(const QJsonValue& val) {- if (val.isDouble()) {- double v = val.toDouble();- if (std::abs(v) >= 1e9)- return QString("$%1B").arg(v / 1e9, 0, 'f', 1);- if (std::abs(v) >= 1e6)- return QString("$%1M").arg(v / 1e6, 0, 'f', 1);- if (std::abs(v) < 1.0 && std::abs(v) > 0.0001)- return QString("%1%").arg(v * 100, 0, 'f', 2);- return QString::number(v, 'f', 4);- }- if (val.isBool())- return val.toBool() ? "YES" : "NO";- if (val.isString())- return val.toString();- return QString::fromUtf8("\u2014");-}--// ── Backtest Result Display ───────────────────────────────────────────────────--void QuantModulePanel::display_backtest_result(const QJsonObject& payload) {- clear_results();-- if (!payload["success"].toBool()) {- display_error(payload["error"].toString("Unknown error"));- return;- }-- const QJsonObject metrics = payload["metrics"].toObject();- const QJsonArray curve = payload["equity_curve"].toArray();- const QJsonObject costs = payload["execution_cost_estimate"].toObject();- const QStringList tickers = [&]() {- QStringList t;- for (const auto& v : payload["tickers"].toArray())- t << v.toString();- return t;- }();-- const QString strategy = payload["strategy"].toString();- const QString start_date = payload["start_date"].toString();- const QString end_date = payload["end_date"].toString();-- const QColor accent = module_.color;- const QString accent_hex = accent.name();- const QString green_hex = ui::colors::POSITIVE();- const QString red_hex = ui::colors::NEGATIVE();- const QString text_p = ui::colors::TEXT_PRIMARY();- const QString text_s = ui::colors::TEXT_SECONDARY();- const QString text_t = ui::colors::TEXT_TERTIARY();- const QString bg_surface = ui::colors::BG_SURFACE();- const QString bg_raised = ui::colors::BG_RAISED();- const QString border_dim = ui::colors::BORDER_DIM();- const QString border_med = ui::colors::BORDER_MED();- const QString font_data = ui::fonts::DATA_FAMILY;- const int fs_sm = ui::fonts::SMALL;- const int fs_lg = ui::fonts::HEADER;-- // ── 1. Header bar ──────────────────────────────────────────────────────- auto* header_w = new QWidget;- auto* header_h = new QHBoxLayout(header_w);- header_h->setContentsMargins(0, 0, 0, 8);- header_h->setSpacing(8);-- auto* title_lbl = new QLabel("BACKTEST RESULTS");- title_lbl->setStyleSheet(- QString("color:%1; font-size:%2px; font-family:%3; font-weight:800; letter-spacing:2px;")- .arg(accent_hex).arg(fs_lg).arg(font_data));- header_h->addWidget(title_lbl);-- header_h->addSpacing(16);-- auto make_chip = [&](const QString& text, const QString& fg, const QString& bg_hex) -> QLabel* {- auto* c = new QLabel(text);- c->setStyleSheet(- QString("color:%1; background:%2; border-radius:3px; padding:2px 8px;"- "font-size:%3px; font-family:%4; font-weight:600;")- .arg(fg, bg_hex).arg(fs_sm).arg(font_data));- return c;- };-- QString strat_display = strategy;- strat_display.replace('_', ' ');- strat_display = strat_display.toUpper();- header_h->addWidget(make_chip(strat_display, accent_hex,- QColor(accent).darker(300).name() + "55"));-- header_h->addWidget(make_chip(start_date + " → " + end_date,- text_s, bg_raised));-- for (const auto& t : tickers)- header_h->addWidget(make_chip(t, text_p, bg_raised));-- header_h->addStretch();- results_layout_->addWidget(header_w);-- // ── 2. KPI cards row ──────────────────────────────────────────────────- struct KpiCard {- QString label;- QString value;- QString sub;- bool positive = true;- bool neutral = false;- };-- double total_ret = metrics["total_return_pct"].toDouble();- double ann_ret = metrics["annualised_return"].toDouble();- double ann_vol = metrics["annualised_vol"].toDouble();- double sharpe = metrics["sharpe_ratio"].toDouble();- double max_dd = metrics["max_drawdown_pct"].toDouble();- double calmar = metrics["calmar_ratio"].toDouble();- double win_rate = metrics["win_rate_pct"].toDouble();- double final_val = metrics["final_value"].toDouble();- double init_cap = metrics["initial_capital"].toDouble();- int t_days = metrics["trading_days"].toInt();-- auto fmt_pct = [](double v) { return QString("%1%2%").arg(v >= 0 ? "+" : "").arg(v, 0, 'f', 2); };- auto fmt_usd = [](double v) -> QString {- if (v >= 1e6) return QString("$%1M").arg(v / 1e6, 0, 'f', 2);- return QString("$%1K").arg(v / 1e3, 0, 'f', 0);- };-- QList<KpiCard> kpis = {- {"TOTAL RETURN", fmt_pct(total_ret), fmt_usd(final_val) + " final", total_ret >= 0, false},- {"ANN. RETURN", fmt_pct(ann_ret), QString("Vol: %1%").arg(ann_vol, 0, 'f', 1), ann_ret >= 0, false},- {"SHARPE RATIO", QString::number(sharpe, 'f', 3),- sharpe >= 1 ? "Excellent" : sharpe >= 0.5 ? "Good" : "Weak", sharpe >= 0.5, false},- {"MAX DRAWDOWN", fmt_pct(max_dd), QString("Calmar: %1").arg(calmar, 0, 'f', 3), false, false},- {"WIN RATE", QString("%1%").arg(win_rate, 0, 'f', 1), QString("%1 days").arg(t_days), win_rate >= 50, false},- {"CAPITAL", fmt_usd(init_cap), "Initial capital", true, true},- };-- auto* cards_w = new QWidget;- auto* cards_gl = new QGridLayout(cards_w);- cards_gl->setContentsMargins(0, 0, 0, 0);- cards_gl->setSpacing(8);-- for (int i = 0; i < kpis.size(); ++i) {- const auto& k = kpis[i];- auto* card = new QWidget;- card->setObjectName("btKpiCard");- card->setStyleSheet(- QString("#btKpiCard { background:%1; border:1px solid %2; border-radius:4px; }")- .arg(bg_surface, border_dim));-- auto* cl = new QVBoxLayout(card);- cl->setContentsMargins(12, 10, 12, 10);- cl->setSpacing(2);-- auto* lbl = new QLabel(k.label);- lbl->setStyleSheet(- QString("color:%1; font-size:%2px; font-family:%3; font-weight:600; letter-spacing:1px;")- .arg(text_t).arg(fs_sm - 1).arg(font_data));-- QString val_color = k.neutral ? text_s : (k.positive ? green_hex : red_hex);- auto* val = new QLabel(k.value);- val->setStyleSheet(- QString("color:%1; font-size:%2px; font-family:%3; font-weight:800;")- .arg(val_color).arg(fs_lg + 2).arg(font_data));-- auto* sub = new QLabel(k.sub);- sub->setStyleSheet(- QString("color:%1; font-size:%2px; font-family:%3;")- .arg(text_t).arg(fs_sm - 1).arg(font_data));-- cl->addWidget(lbl);- cl->addWidget(val);- cl->addWidget(sub);- cards_gl->addWidget(card, i / 3, i % 3);- }-- results_layout_->addWidget(cards_w);-- // ── 3. Equity curve chart ─────────────────────────────────────────────- if (!curve.isEmpty()) {- auto* port_series = new QLineSeries;- auto* bm_series = new QLineSeries;- auto* port_upper = new QLineSeries; // for area fill- auto* port_base = new QLineSeries; // baseline for area-- port_series->setName("Portfolio");- bm_series->setName("Benchmark");-- // Style lines- QPen port_pen(accent);- port_pen.setWidth(2);- port_series->setPen(port_pen);-- {- QString bm_col_str = QString(text_t);- QPen bm_pen;- bm_pen.setColor(::QColor(bm_col_str));- bm_pen.setWidth(1);- bm_pen.setStyle(Qt::DashLine);- bm_series->setPen(bm_pen);- }-- double min_val = 1e18, max_val = -1e18;-- for (const auto& pt_val : curve) {- auto pt = pt_val.toObject();- QDateTime dt = QDateTime::fromString(pt["date"].toString(), "yyyy-MM-dd");- qint64 ms = dt.toMSecsSinceEpoch();- double pv = pt["portfolio"].toDouble();- double bv = pt["benchmark"].toDouble();- port_series->append(ms, pv);- bm_series->append(ms, bv);- port_upper->append(ms, pv);- port_base->append(ms, init_cap);- min_val = std::min({min_val, pv, bv});- max_val = std::max({max_val, pv, bv});- }-- // Area series for portfolio fill- auto* area = new QAreaSeries(port_upper, port_base);- QColor fill_color = accent;- fill_color.setAlpha(30);- area->setBrush(fill_color);- QPen area_pen(Qt::transparent);- area->setPen(area_pen);-- auto* chart = new QChart;- chart->addSeries(area);- chart->addSeries(port_series);- chart->addSeries(bm_series);- chart->setBackgroundBrush(QBrush(QColor(QString(bg_surface))));- chart->setBackgroundRoundness(0);- chart->setMargins(QMargins(4, 4, 4, 4));- chart->legend()->setLabelColor(QColor(QString(text_s)));- chart->legend()->setAlignment(Qt::AlignTop);- chart->setAnimationOptions(QChart::NoAnimation);- chart->setTitle("");-- auto* x_axis = new QDateTimeAxis;- x_axis->setFormat("MMM yy");- x_axis->setLabelsColor(QColor(QString(text_t)));- x_axis->setGridLineColor(QColor(QString(border_dim)));- x_axis->setLinePen(QPen(QColor(QString(border_med))));- chart->addAxis(x_axis, Qt::AlignBottom);-- auto* y_axis = new QValueAxis;- double padding = (max_val - min_val) * 0.05;- y_axis->setRange(min_val - padding, max_val + padding);- y_axis->setLabelFormat("$%.0f");- y_axis->setLabelsColor(QColor(QString(text_t)));- y_axis->setGridLineColor(QColor(QString(border_dim)));- y_axis->setLinePen(QPen(QColor(QString(border_med))));- chart->addAxis(y_axis, Qt::AlignLeft);-- for (auto* s : chart->series()) {- s->attachAxis(x_axis);- s->attachAxis(y_axis);- }-- auto* chart_view = new QChartView(chart);- chart_view->setRenderHint(QPainter::Antialiasing);- chart_view->setFixedHeight(280);- chart_view->setStyleSheet(- QString("background:%1; border:1px solid %2; border-radius:4px;")- .arg(bg_surface, border_dim));-- // Chart title label above- auto* chart_title = new QLabel("EQUITY CURVE");- chart_title->setStyleSheet(- QString("color:%1; font-size:%2px; font-family:%3; font-weight:700;"- "letter-spacing:1px; padding:8px 0 2px 0;")- .arg(text_s).arg(fs_sm).arg(font_data));- results_layout_->addWidget(chart_title);- results_layout_->addWidget(chart_view);- }-- // ── 4. Execution cost strip ────────────────────────────────────────────- auto* cost_w = new QWidget;- cost_w->setStyleSheet(- QString("background:%1; border:1px solid %2; border-radius:4px;")- .arg(bg_surface, border_dim));- auto* cost_h = new QHBoxLayout(cost_w);- cost_h->setContentsMargins(16, 8, 16, 8);- cost_h->setSpacing(24);-- auto add_cost_item = [&](const QString& lbl, const QString& val) {- auto* w = new QWidget;- auto* l = new QHBoxLayout(w);- l->setContentsMargins(0, 0, 0, 0);- l->setSpacing(6);- auto* k = new QLabel(lbl);- k->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")- .arg(text_t).arg(fs_sm).arg(font_data));- auto* v = new QLabel(val);- v->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3; font-weight:700;")- .arg(text_s).arg(fs_sm).arg(font_data));- l->addWidget(k);- l->addWidget(v);- cost_h->addWidget(w);- };-- auto* cost_hdr = new QLabel("EXECUTION COSTS");- cost_hdr->setStyleSheet(- QString("color:%1; font-size:%2px; font-family:%3; font-weight:700; letter-spacing:1px;")- .arg(text_t).arg(fs_sm - 1).arg(font_data));- cost_h->addWidget(cost_hdr);- cost_h->addWidget([&]() {- auto* sep = new QFrame;- sep->setFrameShape(QFrame::VLine);- sep->setStyleSheet(QString("color:%1;").arg(border_dim));- return sep;- }());-- add_cost_item("Commission",- QString("%1 bps").arg(costs["commission_bps"].toDouble(), 0, 'f', 2));- add_cost_item("Expected Slippage",- QString("%1 bps").arg(costs["expected_slippage_bps"].toDouble(), 0, 'f', 2));- cost_h->addStretch();- results_layout_->addWidget(cost_w);-- // ── 5. Export button ───────────────────────────────────────────────────- auto* export_btn = new QPushButton("EXPORT JSON");- export_btn->setCursor(Qt::PointingHandCursor);- export_btn->setFixedHeight(28);- export_btn->setStyleSheet(- QString("QPushButton { background:transparent; color:%1; border:1px solid %2;"- "font-size:%3px; font-family:%4; padding:0 14px; border-radius:3px; }"- "QPushButton:hover { background:rgba(255,255,255,0.05); }")- .arg(accent_hex, border_dim).arg(fs_sm).arg(font_data));-- QString json_str = QJsonDocument(payload).toJson(QJsonDocument::Indented);- connect(export_btn, &QPushButton::clicked, this, [this, json_str]() {- QString safe = module_.label;- safe.replace(QRegularExpression("[^a-zA-Z0-9_\\-]"), "_");- QString fname = safe + "_" + QString::number(QDateTime::currentMSecsSinceEpoch()) + ".json";- QString dest = services::FileManagerService::instance().storage_dir() + "/" + fname;- QFile f(dest);- if (f.open(QIODevice::WriteOnly | QIODevice::Text)) {- f.write(json_str.toUtf8());- f.close();- services::FileManagerService::instance().register_file(- fname, module_.label + "_backtest.json", QFileInfo(dest).size(),- "application/json", "ai_quant_lab");- LOG_INFO("AIQuantLab", "Backtest exported: " + fname);- }- });-- auto* export_row = new QWidget;- auto* export_hl = new QHBoxLayout(export_row);- export_hl->setContentsMargins(0, 4, 0, 0);- export_hl->addStretch();- export_hl->addWidget(export_btn);- results_layout_->addWidget(export_row);-- status_label_->setText(QString("Done — %1% return | Sharpe %2")- .arg(total_ret, 0, 'f', 2)- .arg(sharpe, 0, 'f', 3));-}--// ── CFA Quant Result Display ───────────────────────────────────────────────-//-// CFA Python returns a uniform shape:-// { success, analysis_type,-// result: { value, method, parameters, metadata, calculation_time, timestamp, calculator } }-//-// validate_data is the exception: result is a DataQualityReport.to_dict() with-// quality_score, issues, warnings, statistics, recommendations.-//-// We render flat scalars in result.value + result.metadata as a metrics table,-// surface the analysis method/calc-time as a header line, and keep the raw JSON-// + export button for inspection.--static void cfa_flatten_scalars(const QJsonObject& obj, const QString& prefix, QStringList& keys,- QHash<QString, QJsonValue>& out) {- for (auto it = obj.begin(); it != obj.end(); ++it) {- const auto& v = it.value();- const QString key = prefix.isEmpty() ? it.key() : prefix + "." + it.key();- if (v.isObject()) {- // Recurse one level deep so nested {slope, intercept} flattens nicely;- // skip very deep / array-heavy fields (parameters.data, fitted_values).- if (key.endsWith(".data") || key.endsWith(".fitted_values") ||- key.endsWith(".residuals") || key.endsWith(".model_summary"))- continue;- cfa_flatten_scalars(v.toObject(), key, keys, out);- } else if (!v.isArray()) {- keys.append(key);- out.insert(key, v);- }- }-}--void QuantModulePanel::display_cfa_result(const QString& command, const QJsonObject& payload) {- clear_results();-- if (!payload.value("success").toBool()) {- display_error(payload.value("error").toString("Unknown error"));- return;- }-- const QJsonObject result = payload.value("result").toObject();- const QString method = result.value("method").toString();- const double calc_time = result.value("calculation_time").toDouble();- const QString analysis_type = payload.value("analysis_type").toString(command);-- // ── Header ──────────────────────────────────────────────────────────────- auto* header = new QLabel(QString("%1 • %2 • %3 ms")- .arg(analysis_type.toUpper())- .arg(method)- .arg(QString::number(calc_time * 1000.0, 'f', 1)));- header->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2; letter-spacing:1px;")- .arg(module_.color.name())- .arg(ui::fonts::DATA_FAMILY));- results_layout_->addWidget(header);-- // ── validate_data has its own report shape ──────────────────────────────- if (command == "validate_data") {- const double score = result.value("quality_score").toDouble();- auto* score_lbl = new QLabel(QString("Quality Score: %1 / 100").arg(score, 0, 'f', 1));- score_lbl->setStyleSheet(QString("color:%1; font-size:16px; font-weight:700;")- .arg(score >= 80 ? ui::colors::POSITIVE()- : score >= 50 ? ui::colors::WARNING()- : ui::colors::NEGATIVE()));- results_layout_->addWidget(score_lbl);-- const auto issues = result.value("issues").toArray();- const auto warnings = result.value("warnings").toArray();- const auto recs = result.value("recommendations").toArray();-- auto add_section = [this](const QString& title, const QJsonArray& items, bool issue_shape) {- if (items.isEmpty())- return;- auto* lbl = new QLabel(QString("%1 (%2)").arg(title).arg(items.size()));- lbl->setStyleSheet(QString("color:%1; font-weight:700; margin-top:6px;")- .arg(ui::colors::TEXT_PRIMARY()));- results_layout_->addWidget(lbl);- for (const auto& v : items) {- QString text;- if (issue_shape) {- auto o = v.toObject();- text = QString("[%1] %2: %3")- .arg(o.value("severity").toString(),- o.value("type").toString(),- o.value("description").toString(o.value("message").toString()));- } else {- text = "• " + v.toString();- }- auto* item = new QLabel(text);- item->setWordWrap(true);- item->setStyleSheet(QString("color:%1; padding:2px 0;").arg(ui::colors::TEXT_SECONDARY()));- results_layout_->addWidget(item);- }- };- add_section("Issues", issues, true);- add_section("Warnings", warnings, true);- add_section("Recommendations", recs, false);- } else {- // ── Standard analyses: flatten value + metadata into a metrics table ──- QStringList keys;- QHash<QString, QJsonValue> kv;- const QJsonObject value_obj = result.value("value").toObject();- const QJsonObject meta_obj = result.value("metadata").toObject();-- // value can also be a scalar (e.g. forecasting → array, but value can be number)- const QJsonValue value_raw = result.value("value");- if (value_obj.isEmpty() && !value_raw.isNull() && !value_raw.isObject() && !value_raw.isArray()) {- keys.append("value");- kv.insert("value", value_raw);- } else {- cfa_flatten_scalars(value_obj, "value", keys, kv);- }- cfa_flatten_scalars(meta_obj, "metadata", keys, kv);-- if (!keys.isEmpty()) {- auto* table = new QTableWidget(keys.size(), 2);- table->setHorizontalHeaderLabels({"Metric", "Value"});- table->setEditTriggers(QAbstractItemView::NoEditTriggers);- table->setAlternatingRowColors(true);- table->horizontalHeader()->setStretchLastSection(true);- table->verticalHeader()->setVisible(false);- table->setMaximumHeight(qMin(keys.size() * 28 + 32, 480));- table->setStyleSheet(table_ss());- for (int r = 0; r < keys.size(); ++r) {- QString label = keys[r];- label.replace('_', ' ');- table->setItem(r, 0, new QTableWidgetItem(label.toUpper()));- auto* vi = new QTableWidgetItem(format_val(kv.value(keys[r])));- vi->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);- table->setItem(r, 1, vi);- }- table->resizeColumnsToContents();- results_layout_->addWidget(table);- }-- // For forecasting the value is an array of forecast values — show inline- if (value_raw.isArray()) {- const auto arr = value_raw.toArray();- QStringList parts;- parts.reserve(arr.size());- for (const auto& v : arr)- parts << QString::number(v.toDouble(), 'f', 4);- auto* fcst = new QLabel(QString("Forecast (%1 steps): %2").arg(arr.size()).arg(parts.join(", ")));- fcst->setWordWrap(true);- fcst->setStyleSheet(QString("color:%1; padding:6px 0;").arg(ui::colors::TEXT_PRIMARY()));- results_layout_->addWidget(fcst);- }- }-- // ── Raw JSON viewer ─────────────────────────────────────────────────────- auto* raw = new QTextEdit;- raw->setReadOnly(true);- raw->setMaximumHeight(220);- raw->setPlainText(QJsonDocument(payload).toJson(QJsonDocument::Indented));- raw->setStyleSheet(output_ss());- results_layout_->addWidget(raw);-- // ── Export button ───────────────────────────────────────────────────────- auto* export_btn = new QPushButton("EXPORT RESULTS");- export_btn->setCursor(Qt::PointingHandCursor);- export_btn->setFixedHeight(28);- export_btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %2; "- "font-size:%3px; font-family:%4; padding:0 12px; }"- "QPushButton:hover { color:%1; background:rgba(255,255,255,0.05); }")- .arg(module_.color.name(), ui::colors::BORDER_DIM())- .arg(ui::fonts::SMALL)- .arg(ui::fonts::DATA_FAMILY));- const QString json_str = QJsonDocument(payload).toJson(QJsonDocument::Indented);- connect(export_btn, &QPushButton::clicked, this, [this, json_str, command]() {- QString safe_name = module_.label + "_" + command;- safe_name.replace(QRegularExpression("[^a-zA-Z0-9_\\-]"), "_");- const QString stored_name = safe_name + "_" + QString::number(QDateTime::currentMSecsSinceEpoch()) + ".json";- const QString dest = services::FileManagerService::instance().storage_dir() + "/" + stored_name;- QFile f(dest);- if (f.open(QIODevice::WriteOnly | QIODevice::Text)) {- f.write(json_str.toUtf8());- f.close();- services::FileManagerService::instance().register_file(stored_name, module_.label + "_" + command + ".json",- QFileInfo(dest).size(), "application/json",- "ai_quant_lab");- LOG_INFO("AIQuantLab", "Exported result: " + stored_name);- }- });- results_layout_->addWidget(export_btn);-- status_label_->setText("Done");++// ── Loading spinner shown while a Python op is in flight ─────────────────────++void QuantModulePanel::show_loading(const QString& message) {+ clear_results();+ status_label_->setText(message);++ // Container card+ auto* box = new QWidget(this);+ box->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:3px;")+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));+ auto* hl = new QHBoxLayout(box);+ hl->setContentsMargins(16, 14, 16, 14);+ hl->setSpacing(14);++ // Animated ASCII-style spinner (avoids needing a QMovie/gif resource).+ // Updates 5 frames/sec via a single QTimer parented to the box, so it's+ // garbage-collected automatically when the box is replaced by results.+ auto* spinner = new QLabel(box);+ spinner->setFixedSize(20, 20);+ spinner->setStyleSheet(QString("color:%1; font-size:18px; font-weight:700; "+ "font-family:'Courier New'; background:transparent;")+ .arg(module_.color.name()));+ static const QStringList kFrames = {"|", "/", "-", "\\"};+ spinner->setText(kFrames[0]);++ auto* timer = new QTimer(box);+ timer->setInterval(120);+ int frame_idx = 0;+ QPointer<QLabel> spin_guard(spinner);+ connect(timer, &QTimer::timeout, box, [spin_guard, frame_idx]() mutable {+ if (!spin_guard) return;+ frame_idx = (frame_idx + 1) % kFrames.size();+ spin_guard->setText(kFrames[frame_idx]);+ });+ timer->start();++ auto* msg = new QLabel(message, box);+ msg->setWordWrap(true);+ msg->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; background:transparent;")+ .arg(ui::colors::TEXT_PRIMARY()));++ auto* hint = new QLabel(QString::fromUtf8("Running on the embedded Python runtime — "+ "first invocation per session takes longer (cold start)."),+ box);+ hint->setWordWrap(true);+ hint->setStyleSheet(QString("color:%1; font-size:9px; background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));++ auto* text_col = new QVBoxLayout;+ text_col->setContentsMargins(0, 0, 0, 0);+ text_col->setSpacing(2);+ text_col->addWidget(msg);+ text_col->addWidget(hint);++ hl->addWidget(spinner);+ hl->addLayout(text_col, 1);++ results_layout_->addWidget(box);}void QuantModulePanel::display_result(const QJsonObject& payload) {@@ -2521,6 +547,42 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& commanreturn;}+ // ── GS Quant: rich card-based display per sub-tab ────────────────────────+ if (module_id == "gs_quant") {+ display_gs_result(command, payload);+ return;+ }++ // ── Functime: rich card-based display per sub-tab ────────────────────────+ if (module_id == "functime") {+ display_functime_result(command, payload);+ return;+ }++ // ── Statsmodels: rich card-based display per sub-tab ─────────────────────+ if (module_id == "statsmodels") {+ display_statsmodels_result(command, payload);+ return;+ }++ // ── Fortitudo: rich card-based display per sub-tab ───────────────────────+ if (module_id == "fortitudo") {+ display_fortitudo_result(command, payload);+ return;+ }++ // ── Quant Reporting: rich card-based display per sub-tab ─────────────────+ if (module_id == "quant_reporting") {+ display_quant_reporting_result(command, payload);+ return;+ }++ // ── GluonTS: rich card-based display per sub-tab ─────────────────────────+ if (module_id == "gluonts") {+ display_gluonts_result(command, payload);+ return;+ }+// ── LangGraph deep analysis result ───────────────────────────────────────if (command == "execute_task") {if (!payload["success"].toBool()) {@@ -3612,2095 +1674,4 @@ void QuantModulePanel::on_error(const QString& module_id, const QString& messagedisplay_error(message);}-// ═══════════════════════════════════════════════════════════════════════════════-// FEATURE ENGINEERING PANEL-// ═══════════════════════════════════════════════════════════════════════════════-QWidget* QuantModulePanel::build_feature_engineering_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- auto* tabs = new QTabWidget(w);- tabs->setStyleSheet(tab_ss(module_.color.name()));-- // ── Indicators tab ──- auto* ind = new QWidget(this);- auto* ivl = new QVBoxLayout(ind);- ivl->setContentsMargins(12, 12, 12, 12);- ivl->setSpacing(8);-- auto* ind_data = new QLineEdit(ind);- ind_data->setPlaceholderText("Price data (comma-separated, e.g. 100,102,101,105,108)");- ind_data->setStyleSheet(input_ss());- text_inputs_["fe_data"] = ind_data;- ivl->addWidget(build_input_row("Price Data", ind_data, ind));-- auto* ind_indicator = new QComboBox(ind);- ind_indicator->addItems({"moving_average", "rsi", "macd", "bollinger_bands", "momentum", "volatility", "returns",- "log_returns", "drawdown"});- ind_indicator->setStyleSheet(combo_ss());- combo_inputs_["fe_indicator"] = ind_indicator;- ivl->addWidget(build_input_row("Indicator", ind_indicator, ind));-- auto* ind_window = new QSpinBox(ind);- ind_window->setRange(2, 200);- ind_window->setValue(14);- ind_window->setStyleSheet(spinbox_ss());- int_inputs_["fe_window"] = ind_window;- ivl->addWidget(build_input_row("Window", ind_window, ind));-- auto* ind_run = make_run_button("COMPUTE INDICATOR", ind);- connect(ind_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Computing...");- QJsonObject params;- params["data"] = text_inputs_["fe_data"]->text();- params["indicator"] = combo_inputs_["fe_indicator"]->currentText();- params["window"] = int_inputs_["fe_window"]->value();- AIQuantLabService::instance().feature_compute(params);- });- ivl->addWidget(ind_run);- ivl->addStretch();- tabs->addTab(ind, "Indicators");-- // ── Feature Selection tab ──- auto* sel = new QWidget(this);- auto* svl = new QVBoxLayout(sel);- svl->setContentsMargins(12, 12, 12, 12);- svl->setSpacing(8);-- auto* sel_features = new QLineEdit(sel);- sel_features->setPlaceholderText("Feature values JSON: {\"rsi\":[...],\"macd\":[...]}");- sel_features->setStyleSheet(input_ss());- text_inputs_["fe_sel_features"] = sel_features;- svl->addWidget(build_input_row("Features (JSON)", sel_features, sel));-- auto* sel_returns = new QLineEdit(sel);- sel_returns->setPlaceholderText("Target returns (comma-separated)");- sel_returns->setStyleSheet(input_ss());- text_inputs_["fe_sel_returns"] = sel_returns;- svl->addWidget(build_input_row("Returns", sel_returns, sel));-- auto* sel_topk = new QSpinBox(sel);- sel_topk->setRange(1, 50);- sel_topk->setValue(5);- sel_topk->setStyleSheet(spinbox_ss());- int_inputs_["fe_topk"] = sel_topk;- svl->addWidget(build_input_row("Top-K Features", sel_topk, sel));-- auto* sel_run = make_run_button("SELECT FEATURES BY IC", sel);- connect(sel_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Selecting...");- QJsonObject params;- auto feat_text = text_inputs_["fe_sel_features"]->text();- auto doc = QJsonDocument::fromJson(feat_text.toUtf8());- if (!doc.isNull())- params["features"] = doc.object();- params["returns"] = text_inputs_["fe_sel_returns"]->text();- params["top_k"] = int_inputs_["fe_topk"]->value();- AIQuantLabService::instance().feature_select_by_ic(params);- });- svl->addWidget(sel_run);- svl->addStretch();- tabs->addTab(sel, "Feature Selection");-- // ── Expression Engine tab ──- auto* expr = new QWidget(this);- auto* evl = new QVBoxLayout(expr);- evl->setContentsMargins(12, 12, 12, 12);- evl->setSpacing(8);-- auto* expr_data = new QLineEdit(expr);- expr_data->setPlaceholderText("{\"close\":[100,102,...],\"volume\":[1000,1200,...]}");- expr_data->setStyleSheet(input_ss());- text_inputs_["fe_expr_data"] = expr_data;- evl->addWidget(build_input_row("OHLCV Data (JSON)", expr_data, expr));-- auto* expr_expr = new QLineEdit(expr);- expr_expr->setPlaceholderText("e.g. Mean(close, 5) / Std(close, 20)");- expr_expr->setStyleSheet(input_ss());- text_inputs_["fe_expression"] = expr_expr;- evl->addWidget(build_input_row("Expression", expr_expr, expr));-- auto* expr_run = make_run_button("EVALUATE EXPRESSION", expr);- connect(expr_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Evaluating...");- QJsonObject params;- auto data_text = text_inputs_["fe_expr_data"]->text();- auto doc = QJsonDocument::fromJson(data_text.toUtf8());- if (!doc.isNull())- params["data"] = doc.object();- params["expression"] = text_inputs_["fe_expression"]->text();- AIQuantLabService::instance().feature_evaluate_expression(params);- });- evl->addWidget(expr_run);- evl->addStretch();- tabs->addTab(expr, "Expression Engine");-- vl->addWidget(tabs, 1);- results_layout_ = new QVBoxLayout;- vl->addLayout(results_layout_);- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// PORTFOLIO OPTIMIZATION PANEL-// ═══════════════════════════════════════════════════════════════════════════════-QWidget* QuantModulePanel::build_portfolio_opt_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- auto* tabs = new QTabWidget(w);- tabs->setStyleSheet(tab_ss(module_.color.name()));-- // ── Shared covariance / returns helper ──- auto make_cov_tab = [&](const QString& method_id, const QString& btn_label, bool needs_returns) -> QWidget* {- auto* t = new QWidget(this);- auto* tvl = new QVBoxLayout(t);- tvl->setContentsMargins(12, 12, 12, 12);- tvl->setSpacing(8);-- auto* assets_in = new QLineEdit(t);- assets_in->setPlaceholderText("Asset names (comma-separated, e.g. AAPL,GOOG,MSFT)");- assets_in->setStyleSheet(input_ss());- text_inputs_[method_id + "_assets"] = assets_in;- tvl->addWidget(build_input_row("Assets", assets_in, t));-- auto* cov_in = new QLineEdit(t);- cov_in->setPlaceholderText("Covariance matrix JSON: [[0.04,0.01],[0.01,0.09]]");- cov_in->setStyleSheet(input_ss());- text_inputs_[method_id + "_cov"] = cov_in;- tvl->addWidget(build_input_row("Covariance Matrix", cov_in, t));-- if (needs_returns) {- auto* ret_in = new QLineEdit(t);- ret_in->setPlaceholderText("Expected returns (comma-separated, e.g. 0.10,0.15,0.12)");- ret_in->setStyleSheet(input_ss());- text_inputs_[method_id + "_returns"] = ret_in;- tvl->addWidget(build_input_row("Expected Returns", ret_in, t));- }-- auto* rf_spin = make_double_spin(0, 20, 2.0, 2, "%", t);- double_inputs_[method_id + "_rf"] = rf_spin;- tvl->addWidget(build_input_row("Risk-Free Rate", rf_spin, t));-- auto* run = make_run_button(btn_label, t);- connect(run, &QPushButton::clicked, this, [this, method_id, needs_returns]() {- status_label_->setText("Optimizing...");- QJsonObject params;- auto assets_str = text_inputs_[method_id + "_assets"]->text().split(',');- QJsonArray assets_arr;- for (auto& a : assets_str)- assets_arr.append(a.trimmed());- params["assets"] = assets_arr;- auto cov_doc = QJsonDocument::fromJson(text_inputs_[method_id + "_cov"]->text().toUtf8());- if (!cov_doc.isNull())- params["cov_matrix"] = cov_doc.array();- if (needs_returns) {- QJsonArray ret_arr;- for (auto& r : text_inputs_[method_id + "_returns"]->text().split(','))- ret_arr.append(r.trimmed().toDouble());- params["expected_returns"] = ret_arr;- }- params["risk_free_rate"] = double_inputs_[method_id + "_rf"]->value() / 100.0;- AIQuantLabService::instance().portopt_run(method_id, params);- });- tvl->addWidget(run);- tvl->addStretch();- return t;- };-- tabs->addTab(make_cov_tab("hierarchical_risk_parity", "RUN HRP", false), "HRP");- tabs->addTab(make_cov_tab("minimum_variance", "MIN VARIANCE", false), "Min Variance");- tabs->addTab(make_cov_tab("maximum_sharpe", "MAX SHARPE", true), "Max Sharpe");- tabs->addTab(make_cov_tab("efficient_frontier", "EFFICIENT FRONTIER", true), "Eff. Frontier");-- // ── Black-Litterman ──- auto* bl = new QWidget(this);- auto* blvl = new QVBoxLayout(bl);- blvl->setContentsMargins(12, 12, 12, 12);- blvl->setSpacing(8);- auto* bl_assets = new QLineEdit(bl);- bl_assets->setPlaceholderText("Asset names (comma-separated)");- bl_assets->setStyleSheet(input_ss());- text_inputs_["bl_assets"] = bl_assets;- blvl->addWidget(build_input_row("Assets", bl_assets, bl));- auto* bl_caps = new QLineEdit(bl);- bl_caps->setPlaceholderText("Market caps (comma-separated, e.g. 2000,1500,800)");- bl_caps->setStyleSheet(input_ss());- text_inputs_["bl_caps"] = bl_caps;- blvl->addWidget(build_input_row("Market Caps ($B)", bl_caps, bl));- auto* bl_cov = new QLineEdit(bl);- bl_cov->setPlaceholderText("Covariance matrix JSON: [[0.04,0.01],[0.01,0.09]]");- bl_cov->setStyleSheet(input_ss());- text_inputs_["bl_cov"] = bl_cov;- blvl->addWidget(build_input_row("Covariance Matrix", bl_cov, bl));- auto* bl_views = new QLineEdit(bl);- bl_views->setPlaceholderText("Views (comma-separated, e.g. 0.05,0.10)");- bl_views->setStyleSheet(input_ss());- text_inputs_["bl_views"] = bl_views;- blvl->addWidget(build_input_row("Views", bl_views, bl));- auto* bl_conf = new QLineEdit(bl);- bl_conf->setPlaceholderText("View confidences (e.g. 0.8,0.6)");- bl_conf->setStyleSheet(input_ss());- text_inputs_["bl_conf"] = bl_conf;- blvl->addWidget(build_input_row("View Confidences", bl_conf, bl));- auto* bl_run = make_run_button("RUN BLACK-LITTERMAN", bl);- connect(bl_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Running BL...");- QJsonObject params;- QJsonArray caps, views, confs, assets;- for (auto& v : text_inputs_["bl_caps"]->text().split(','))- caps.append(v.trimmed().toDouble());- for (auto& v : text_inputs_["bl_views"]->text().split(','))- views.append(v.trimmed().toDouble());- for (auto& v : text_inputs_["bl_conf"]->text().split(','))- confs.append(v.trimmed().toDouble());- for (auto& v : text_inputs_["bl_assets"]->text().split(','))- assets.append(v.trimmed());- params["market_caps"] = caps;- params["views"] = views;- params["view_confidences"] = confs;- params["assets"] = assets;- auto cov_doc = QJsonDocument::fromJson(text_inputs_["bl_cov"]->text().toUtf8());- if (!cov_doc.isNull())- params["cov_matrix"] = cov_doc.array();- AIQuantLabService::instance().portopt_run("black_litterman", params);- });- blvl->addWidget(bl_run);- blvl->addStretch();- tabs->addTab(bl, "Black-Litterman");-- vl->addWidget(tabs, 1);- results_layout_ = new QVBoxLayout;- vl->addLayout(results_layout_);- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// FACTOR EVALUATION PANEL-// ═══════════════════════════════════════════════════════════════════════════════-QWidget* QuantModulePanel::build_factor_evaluation_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- auto* tabs = new QTabWidget(w);- tabs->setStyleSheet(tab_ss(module_.color.name()));-- // ── IC Metrics tab ──- auto* ic = new QWidget(this);- auto* icvl = new QVBoxLayout(ic);- icvl->setContentsMargins(12, 12, 12, 12);- icvl->setSpacing(8);- auto* ic_preds = new QLineEdit(ic);- ic_preds->setPlaceholderText("Predictions (comma-separated, e.g. 0.1,0.2,-0.1,0.3)");- ic_preds->setStyleSheet(input_ss());- text_inputs_["ev_predictions"] = ic_preds;- icvl->addWidget(build_input_row("Predictions", ic_preds, ic));- auto* ic_rets = new QLineEdit(ic);- ic_rets->setPlaceholderText("Actual returns (comma-separated)");- ic_rets->setStyleSheet(input_ss());- text_inputs_["ev_returns"] = ic_rets;- icvl->addWidget(build_input_row("Returns", ic_rets, ic));- auto* ic_method = new QComboBox(ic);- ic_method->addItems({"pearson", "spearman"});- ic_method->setStyleSheet(combo_ss());- combo_inputs_["ev_ic_method"] = ic_method;- icvl->addWidget(build_input_row("Method", ic_method, ic));- auto* ic_run = make_run_button("CALCULATE IC METRICS", ic);- connect(ic_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Calculating...");- QJsonObject params;- QJsonArray preds, rets;- for (auto& v : text_inputs_["ev_predictions"]->text().split(','))- preds.append(v.trimmed().toDouble());- for (auto& v : text_inputs_["ev_returns"]->text().split(','))- rets.append(v.trimmed().toDouble());- params["predictions"] = preds;- params["returns"] = rets;- params["method"] = combo_inputs_["ev_ic_method"]->currentText();- AIQuantLabService::instance().evaluation_ic(params);- });- icvl->addWidget(ic_run);- icvl->addStretch();- tabs->addTab(ic, "IC Metrics");-- // ── Full Report tab ──- auto* rep = new QWidget(this);- auto* repvl = new QVBoxLayout(rep);- repvl->setContentsMargins(12, 12, 12, 12);- repvl->setSpacing(8);- auto* rep_name = new QLineEdit(rep);- rep_name->setPlaceholderText("Factor name (e.g. momentum)");- rep_name->setStyleSheet(input_ss());- text_inputs_["ev_factor_name"] = rep_name;- repvl->addWidget(build_input_row("Factor Name", rep_name, rep));- auto* rep_preds = new QLineEdit(rep);- rep_preds->setPlaceholderText("Predictions (comma-separated)");- rep_preds->setStyleSheet(input_ss());- text_inputs_["ev_rep_preds"] = rep_preds;- repvl->addWidget(build_input_row("Predictions", rep_preds, rep));- auto* rep_rets = new QLineEdit(rep);- rep_rets->setPlaceholderText("Returns (comma-separated)");- rep_rets->setStyleSheet(input_ss());- text_inputs_["ev_rep_returns"] = rep_rets;- repvl->addWidget(build_input_row("Returns", rep_rets, rep));- auto* rep_run = make_run_button("GENERATE EVALUATION REPORT", rep);- connect(rep_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Generating...");- QJsonObject params;- QJsonArray preds, rets;- for (auto& v : text_inputs_["ev_rep_preds"]->text().split(','))- preds.append(v.trimmed().toDouble());- for (auto& v : text_inputs_["ev_rep_returns"]->text().split(','))- rets.append(v.trimmed().toDouble());- params["factor_name"] = text_inputs_["ev_factor_name"]->text();- params["predictions"] = preds;- params["returns"] = rets;- AIQuantLabService::instance().evaluation_report(params);- });- repvl->addWidget(rep_run);- repvl->addStretch();- tabs->addTab(rep, "Full Report");-- // ── Risk Metrics tab ──- auto* risk = new QWidget(this);- auto* riskvl = new QVBoxLayout(risk);- riskvl->setContentsMargins(12, 12, 12, 12);- riskvl->setSpacing(8);- auto* risk_rets = new QLineEdit(risk);- risk_rets->setPlaceholderText("Daily returns (comma-separated)");- risk_rets->setStyleSheet(input_ss());- text_inputs_["ev_risk_returns"] = risk_rets;- riskvl->addWidget(build_input_row("Returns", risk_rets, risk));- auto* risk_bench = new QLineEdit(risk);- risk_bench->setPlaceholderText("Benchmark returns (optional, comma-separated)");- risk_bench->setStyleSheet(input_ss());- text_inputs_["ev_risk_bench"] = risk_bench;- riskvl->addWidget(build_input_row("Benchmark (opt.)", risk_bench, risk));- auto* risk_conf = make_double_spin(0.8, 0.999, 0.95, 3, "", risk);- double_inputs_["ev_risk_conf"] = risk_conf;- riskvl->addWidget(build_input_row("Confidence Level", risk_conf, risk));- auto* risk_run = make_run_button("CALCULATE RISK METRICS", risk);- connect(risk_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Calculating...");- QJsonObject params;- QJsonArray rets;- for (auto& v : text_inputs_["ev_risk_returns"]->text().split(','))- rets.append(v.trimmed().toDouble());- params["returns"] = rets;- params["confidence_level"] = double_inputs_["ev_risk_conf"]->value();- auto bench_text = text_inputs_["ev_risk_bench"]->text().trimmed();- if (!bench_text.isEmpty()) {- QJsonArray bench;- for (auto& v : bench_text.split(','))- bench.append(v.trimmed().toDouble());- params["benchmark_returns"] = bench;- }- AIQuantLabService::instance().evaluation_risk_metrics(params);- });- riskvl->addWidget(risk_run);- riskvl->addStretch();- tabs->addTab(risk, "Risk Metrics");-- vl->addWidget(tabs, 1);- results_layout_ = new QVBoxLayout;- vl->addLayout(results_layout_);- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// STRATEGY BUILDER PANEL-// ═══════════════════════════════════════════════════════════════════════════════-QWidget* QuantModulePanel::build_strategy_builder_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- auto* tabs = new QTabWidget(w);- tabs->setStyleSheet(tab_ss(module_.color.name()));-- // ── TopK-Dropout ──- auto* topk = new QWidget(this);- auto* tkvl = new QVBoxLayout(topk);- tkvl->setContentsMargins(12, 12, 12, 12);- tkvl->setSpacing(8);- auto* tk_signal = new QLineEdit(topk);- tk_signal->setPlaceholderText("Signal values (comma-separated)");- tk_signal->setStyleSheet(input_ss());- text_inputs_["st_tk_signal"] = tk_signal;- tkvl->addWidget(build_input_row("Signal", tk_signal, topk));- auto* tk_topk = new QSpinBox(topk);- tk_topk->setRange(1, 500);- tk_topk->setValue(50);- tk_topk->setStyleSheet(spinbox_ss());- int_inputs_["st_topk"] = tk_topk;- tkvl->addWidget(build_input_row("Top-K", tk_topk, topk));- auto* tk_drop = new QSpinBox(topk);- tk_drop->setRange(1, 100);- tk_drop->setValue(5);- tk_drop->setStyleSheet(tk_topk->styleSheet());- int_inputs_["st_ndrop"] = tk_drop;- tkvl->addWidget(build_input_row("N-Drop", tk_drop, topk));- auto* tk_run = make_run_button("CREATE TOPK-DROPOUT STRATEGY", topk);- connect(tk_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Creating...");- QJsonObject params;- QJsonArray signal;- for (auto& v : text_inputs_["st_tk_signal"]->text().split(','))- signal.append(v.trimmed().toDouble());- params["signal"] = signal;- params["topk"] = int_inputs_["st_topk"]->value();- params["n_drop"] = int_inputs_["st_ndrop"]->value();- AIQuantLabService::instance().strategy_create("create_topk_dropout", params);- });- tkvl->addWidget(tk_run);- tkvl->addStretch();- tabs->addTab(topk, "TopK-Dropout");-- // ── Risk Parity ──- auto* rp = new QWidget(this);- auto* rpvl = new QVBoxLayout(rp);- rpvl->setContentsMargins(12, 12, 12, 12);- rpvl->setSpacing(8);- auto* rp_returns = new QLineEdit(rp);- rp_returns->setPlaceholderText("Asset returns matrix JSON: [[0.01,-0.02,...],[...]]");- rp_returns->setStyleSheet(input_ss());- text_inputs_["st_rp_returns"] = rp_returns;- rpvl->addWidget(build_input_row("Returns Matrix", rp_returns, rp));- auto* rp_target = make_double_spin(0.01, 1.0, 0.10, 2, "", rp);- double_inputs_["st_rp_target"] = rp_target;- rpvl->addWidget(build_input_row("Target Risk", rp_target, rp));- auto* rp_freq = new QComboBox(rp);- rp_freq->addItems({"monthly", "weekly", "daily", "quarterly"});- rp_freq->setStyleSheet(combo_ss());- combo_inputs_["st_rp_freq"] = rp_freq;- rpvl->addWidget(build_input_row("Rebalance", rp_freq, rp));- auto* rp_run = make_run_button("CREATE RISK PARITY STRATEGY", rp);- connect(rp_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Creating...");- QJsonObject params;- auto ret_doc = QJsonDocument::fromJson(text_inputs_["st_rp_returns"]->text().toUtf8());- if (!ret_doc.isNull())- params["returns"] = ret_doc.array();- params["target_risk"] = double_inputs_["st_rp_target"]->value();- params["rebalance_frequency"] = combo_inputs_["st_rp_freq"]->currentText();- AIQuantLabService::instance().strategy_create("create_risk_parity", params);- });- rpvl->addWidget(rp_run);- rpvl->addStretch();- tabs->addTab(rp, "Risk Parity");-- // ── Portfolio Metrics ──- auto* pm = new QWidget(this);- auto* pmvl = new QVBoxLayout(pm);- pmvl->setContentsMargins(12, 12, 12, 12);- pmvl->setSpacing(8);- auto* pm_rets = new QLineEdit(pm);- pm_rets->setPlaceholderText("Portfolio returns (comma-separated)");- pm_rets->setStyleSheet(input_ss());- text_inputs_["st_pm_returns"] = pm_rets;- pmvl->addWidget(build_input_row("Returns", pm_rets, pm));- auto* pm_bench = new QLineEdit(pm);- pm_bench->setPlaceholderText("Benchmark returns (optional)");- pm_bench->setStyleSheet(input_ss());- text_inputs_["st_pm_bench"] = pm_bench;- pmvl->addWidget(build_input_row("Benchmark (opt.)", pm_bench, pm));- auto* pm_rf = make_double_spin(0, 20, 2.0, 2, "%", pm);- double_inputs_["st_pm_rf"] = pm_rf;- pmvl->addWidget(build_input_row("Risk-Free Rate", pm_rf, pm));- auto* pm_run = make_run_button("CALCULATE PORTFOLIO METRICS", pm);- connect(pm_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Calculating...");- QJsonObject params;- QJsonArray rets;- for (auto& v : text_inputs_["st_pm_returns"]->text().split(','))- rets.append(v.trimmed().toDouble());- params["returns"] = rets;- params["risk_free_rate"] = double_inputs_["st_pm_rf"]->value() / 100.0;- auto bench_text = text_inputs_["st_pm_bench"]->text().trimmed();- if (!bench_text.isEmpty()) {- QJsonArray bench;- for (auto& v : bench_text.split(','))- bench.append(v.trimmed().toDouble());- params["benchmark_returns"] = bench;- }- AIQuantLabService::instance().strategy_portfolio_metrics(params);- });- pmvl->addWidget(pm_run);- pmvl->addStretch();- tabs->addTab(pm, "Portfolio Metrics");-- vl->addWidget(tabs, 1);- results_layout_ = new QVBoxLayout;- vl->addLayout(results_layout_);- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// DATA PROCESSORS PANEL-// ═══════════════════════════════════════════════════════════════════════════════-QWidget* QuantModulePanel::build_data_processors_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- auto* tabs = new QTabWidget(w);- tabs->setStyleSheet(tab_ss(module_.color.name()));-- // ── List Processors ──- auto* list_tab = new QWidget(this);- auto* ltvl = new QVBoxLayout(list_tab);- ltvl->setContentsMargins(12, 12, 12, 12);- ltvl->setSpacing(8);- auto* lt_info = new QLabel("Browse all available data normalizers and transformation processors.", list_tab);- lt_info->setWordWrap(true);- lt_info->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")- .arg(ui::colors::TEXT_SECONDARY())- .arg(ui::fonts::SMALL)- .arg(ui::fonts::DATA_FAMILY));- ltvl->addWidget(lt_info);- auto* lt_run = make_run_button("LIST ALL PROCESSORS", list_tab);- connect(lt_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Loading...");- AIQuantLabService::instance().dataproc_list_processors();- });- ltvl->addWidget(lt_run);- ltvl->addStretch();- tabs->addTab(list_tab, "Browse");-- // ── Create Pipeline ──- auto* pipe_tab = new QWidget(this);- auto* ptvl = new QVBoxLayout(pipe_tab);- ptvl->setContentsMargins(12, 12, 12, 12);- ptvl->setSpacing(8);- auto* pipe_id = new QLineEdit(pipe_tab);- pipe_id->setPlaceholderText("Pipeline ID (e.g. my_pipeline)");- pipe_id->setStyleSheet(input_ss());- text_inputs_["dp_pipeline_id"] = pipe_id;- ptvl->addWidget(build_input_row("Pipeline ID", pipe_id, pipe_tab));- auto* pipe_procs = new QLineEdit(pipe_tab);- pipe_procs->setPlaceholderText(R"([{"type":"zscore"},{"type":"winsorize","lower":0.01,"upper":0.99}])");- pipe_procs->setStyleSheet(input_ss());- text_inputs_["dp_processors"] = pipe_procs;- ptvl->addWidget(build_input_row("Processors (JSON)", pipe_procs, pipe_tab));- auto* pipe_run = make_run_button("CREATE PIPELINE", pipe_tab);- connect(pipe_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Creating...");- QJsonObject params;- params["pipeline_id"] = text_inputs_["dp_pipeline_id"]->text();- auto doc = QJsonDocument::fromJson(text_inputs_["dp_processors"]->text().toUtf8());- if (!doc.isNull())- params["processors"] = doc.array();- AIQuantLabService::instance().dataproc_create_pipeline(params);- });- ptvl->addWidget(pipe_run);- ptvl->addStretch();- tabs->addTab(pipe_tab, "Create Pipeline");-- // ── Process Data ──- auto* proc_tab = new QWidget(this);- auto* procvl = new QVBoxLayout(proc_tab);- procvl->setContentsMargins(12, 12, 12, 12);- procvl->setSpacing(8);- auto* proc_pid = new QLineEdit(proc_tab);- proc_pid->setPlaceholderText("Pipeline ID (must be created first)");- proc_pid->setStyleSheet(input_ss());- text_inputs_["dp_proc_pid"] = proc_pid;- procvl->addWidget(build_input_row("Pipeline ID", proc_pid, proc_tab));- auto* proc_data = new QLineEdit(proc_tab);- proc_data->setPlaceholderText(R"({"feature_close":[100,102,...],"feature_volume":[1000,1200,...]})");- proc_data->setStyleSheet(input_ss());- text_inputs_["dp_proc_data"] = proc_data;- procvl->addWidget(build_input_row("Data (JSON)", proc_data, proc_tab));- auto* proc_run = make_run_button("PROCESS DATA", proc_tab);- connect(proc_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Processing...");- QJsonObject params;- params["pipeline_id"] = text_inputs_["dp_proc_pid"]->text();- auto doc = QJsonDocument::fromJson(text_inputs_["dp_proc_data"]->text().toUtf8());- if (!doc.isNull())- params["data"] = doc.object();- AIQuantLabService::instance().dataproc_process_data(params);- });- procvl->addWidget(proc_run);- procvl->addStretch();- tabs->addTab(proc_tab, "Process Data");-- vl->addWidget(tabs, 1);- results_layout_ = new QVBoxLayout;- vl->addLayout(results_layout_);- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// QUANT REPORTING PANEL-// ═══════════════════════════════════════════════════════════════════════════════-QWidget* QuantModulePanel::build_quant_reporting_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- auto* tabs = new QTabWidget(w);- tabs->setStyleSheet(tab_ss(module_.color.name()));-- // ── IC Analysis ──- auto* ic_tab = new QWidget(this);- auto* icvl = new QVBoxLayout(ic_tab);- icvl->setContentsMargins(12, 12, 12, 12);- icvl->setSpacing(8);- auto* ic_preds = new QLineEdit(ic_tab);- ic_preds->setPlaceholderText("Predictions (comma-separated)");- ic_preds->setStyleSheet(input_ss());- text_inputs_["rp_ic_preds"] = ic_preds;- icvl->addWidget(build_input_row("Predictions", ic_preds, ic_tab));- auto* ic_rets = new QLineEdit(ic_tab);- ic_rets->setPlaceholderText("Returns (comma-separated)");- ic_rets->setStyleSheet(input_ss());- text_inputs_["rp_ic_rets"] = ic_rets;- icvl->addWidget(build_input_row("Returns", ic_rets, ic_tab));- auto* ic_method = new QComboBox(ic_tab);- ic_method->addItems({"both", "pearson", "spearman"});- ic_method->setStyleSheet(combo_ss());- combo_inputs_["rp_ic_method"] = ic_method;- icvl->addWidget(build_input_row("Method", ic_method, ic_tab));- auto* ic_run = make_run_button("GENERATE IC ANALYSIS", ic_tab);- connect(ic_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Analyzing...");- QJsonObject params;- QJsonArray preds, rets;- for (auto& v : text_inputs_["rp_ic_preds"]->text().split(','))- preds.append(v.trimmed().toDouble());- for (auto& v : text_inputs_["rp_ic_rets"]->text().split(','))- rets.append(v.trimmed().toDouble());- params["predictions"] = preds;- params["returns"] = rets;- params["method"] = combo_inputs_["rp_ic_method"]->currentText();- AIQuantLabService::instance().reporting_ic_analysis(params);- });- icvl->addWidget(ic_run);- icvl->addStretch();- tabs->addTab(ic_tab, "IC Analysis");-- // ── Model Performance ──- auto* mp_tab = new QWidget(this);- auto* mpvl = new QVBoxLayout(mp_tab);- mpvl->setContentsMargins(12, 12, 12, 12);- mpvl->setSpacing(8);- auto* mp_preds = new QLineEdit(mp_tab);- mp_preds->setPlaceholderText("Model predictions (comma-separated)");- mp_preds->setStyleSheet(input_ss());- text_inputs_["rp_mp_preds"] = mp_preds;- mpvl->addWidget(build_input_row("Predictions", mp_preds, mp_tab));- auto* mp_rets = new QLineEdit(mp_tab);- mp_rets->setPlaceholderText("Actual returns (comma-separated)");- mp_rets->setStyleSheet(input_ss());- text_inputs_["rp_mp_rets"] = mp_rets;- mpvl->addWidget(build_input_row("Returns", mp_rets, mp_tab));- auto* mp_name = new QLineEdit(mp_tab);- mp_name->setPlaceholderText("Model name (e.g. LightGBM)");- mp_name->setStyleSheet(input_ss());- text_inputs_["rp_mp_name"] = mp_name;- mpvl->addWidget(build_input_row("Model Name", mp_name, mp_tab));- auto* mp_run = make_run_button("GENERATE MODEL PERFORMANCE REPORT", mp_tab);- connect(mp_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Generating...");- QJsonObject params;- QJsonArray preds, rets;- for (auto& v : text_inputs_["rp_mp_preds"]->text().split(','))- preds.append(v.trimmed().toDouble());- for (auto& v : text_inputs_["rp_mp_rets"]->text().split(','))- rets.append(v.trimmed().toDouble());- params["predictions"] = preds;- params["returns"] = rets;- params["model_name"] =- text_inputs_["rp_mp_name"]->text().isEmpty() ? QString("Model") : text_inputs_["rp_mp_name"]->text();- AIQuantLabService::instance().reporting_model_performance(params);- });- mpvl->addWidget(mp_run);- mpvl->addStretch();- tabs->addTab(mp_tab, "Model Performance");-- // ── Cumulative Returns ──- auto* cr_tab = new QWidget(this);- auto* crvl = new QVBoxLayout(cr_tab);- crvl->setContentsMargins(12, 12, 12, 12);- crvl->setSpacing(8);- auto* cr_rets = new QLineEdit(cr_tab);- cr_rets->setPlaceholderText("Portfolio returns (comma-separated)");- cr_rets->setStyleSheet(input_ss());- text_inputs_["rp_cr_rets"] = cr_rets;- crvl->addWidget(build_input_row("Returns", cr_rets, cr_tab));- auto* cr_bench = new QLineEdit(cr_tab);- cr_bench->setPlaceholderText("Benchmark returns (optional, comma-separated)");- cr_bench->setStyleSheet(input_ss());- text_inputs_["rp_cr_bench"] = cr_bench;- crvl->addWidget(build_input_row("Benchmark (opt.)", cr_bench, cr_tab));- auto* cr_title = new QLineEdit(cr_tab);- cr_title->setPlaceholderText("Chart title (e.g. Strategy vs Benchmark)");- cr_title->setStyleSheet(input_ss());- text_inputs_["rp_cr_title"] = cr_title;- crvl->addWidget(build_input_row("Title", cr_title, cr_tab));- auto* cr_run = make_run_button("GENERATE CUMULATIVE RETURN CHART", cr_tab);- connect(cr_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Generating...");- QJsonObject params;- QJsonArray rets;- for (auto& v : text_inputs_["rp_cr_rets"]->text().split(','))- rets.append(v.trimmed().toDouble());- params["returns"] = rets;- auto bench_text = text_inputs_["rp_cr_bench"]->text().trimmed();- if (!bench_text.isEmpty()) {- QJsonArray bench;- for (auto& v : bench_text.split(','))- bench.append(v.trimmed().toDouble());- params["benchmark_returns"] = bench;- }- auto title = text_inputs_["rp_cr_title"]->text().trimmed();- params["title"] = title.isEmpty() ? QString("Cumulative Returns") : title;- AIQuantLabService::instance().reporting_cumulative_returns(params);- });- crvl->addWidget(cr_run);- crvl->addStretch();- tabs->addTab(cr_tab, "Cumulative Returns");-- vl->addWidget(tabs, 1);- results_layout_ = new QVBoxLayout;- vl->addLayout(results_layout_);- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// FACTOR DISCOVERY PANEL-// ═══════════════════════════════════════════════════════════════════════════════-QWidget* QuantModulePanel::build_factor_discovery_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- auto* tabs = new QTabWidget(w);- tabs->setStyleSheet(tab_ss(module_.color.name()));-- // ── Factor Library ──- auto* lib_tab = new QWidget(this);- auto* libvl = new QVBoxLayout(lib_tab);- libvl->setContentsMargins(12, 12, 12, 12);- libvl->setSpacing(8);- auto* lib_info = new QLabel("Browse all built-in Qlib alpha factors and expressions.", lib_tab);- lib_info->setWordWrap(true);- lib_info->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")- .arg(ui::colors::TEXT_SECONDARY())- .arg(ui::fonts::SMALL)- .arg(ui::fonts::DATA_FAMILY));- libvl->addWidget(lib_info);- auto* lib_run = make_run_button("BROWSE FACTOR LIBRARY", lib_tab);- connect(lib_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Loading...");- AIQuantLabService::instance().factor_get_library();- });- libvl->addWidget(lib_run);- auto* inst_run = make_run_button("LIST INSTRUMENTS", lib_tab);- connect(inst_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Loading...");- AIQuantLabService::instance().factor_get_instruments();- });- libvl->addWidget(inst_run);- libvl->addStretch();- tabs->addTab(lib_tab, "Factor Library");-- // ── Fetch Data ──- auto* data_tab = new QWidget(this);- auto* datavl = new QVBoxLayout(data_tab);- datavl->setContentsMargins(12, 12, 12, 12);- datavl->setSpacing(8);- auto* fd_instr = new QLineEdit(data_tab);- fd_instr->setPlaceholderText("Instruments (comma-separated, e.g. aapl,msft)");- fd_instr->setStyleSheet(input_ss());- text_inputs_["fd_instruments"] = fd_instr;- datavl->addWidget(build_input_row("Instruments", fd_instr, data_tab));- auto* fd_fields = new QLineEdit(data_tab);- fd_fields->setPlaceholderText("Fields (comma-separated, e.g. $close,$volume,$open)");- fd_fields->setStyleSheet(input_ss());- text_inputs_["fd_fields"] = fd_fields;- datavl->addWidget(build_input_row("Fields", fd_fields, data_tab));- auto* fd_start = new QLineEdit(data_tab);- fd_start->setPlaceholderText("Start date (YYYY-MM-DD, e.g. 2019-01-01)");- fd_start->setStyleSheet(input_ss());- text_inputs_["fd_start"] = fd_start;- datavl->addWidget(build_input_row("Start Date", fd_start, data_tab));- auto* fd_end = new QLineEdit(data_tab);- fd_end->setPlaceholderText("End date (YYYY-MM-DD, e.g. 2020-11-10)");- fd_end->setStyleSheet(input_ss());- text_inputs_["fd_end"] = fd_end;- datavl->addWidget(build_input_row("End Date", fd_end, data_tab));- auto* fd_run = make_run_button("FETCH DATA", data_tab);- connect(fd_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Fetching...");- QJsonObject params;- QJsonArray instr;- for (auto& s : text_inputs_["fd_instruments"]->text().split(','))- if (!s.trimmed().isEmpty())- instr.append(s.trimmed().toLower());- params["instruments"] = instr;- QJsonArray fields;- for (auto& s : text_inputs_["fd_fields"]->text().split(','))- if (!s.trimmed().isEmpty())- fields.append(s.trimmed());- params["fields"] = fields;- if (!text_inputs_["fd_start"]->text().isEmpty())- params["start_date"] = text_inputs_["fd_start"]->text().trimmed();- if (!text_inputs_["fd_end"]->text().isEmpty())- params["end_date"] = text_inputs_["fd_end"]->text().trimmed();- AIQuantLabService::instance().factor_get_data(params);- });- datavl->addWidget(fd_run);- datavl->addStretch();- tabs->addTab(data_tab, "Fetch Data");-- // ── Calendar ──- auto* cal_tab = new QWidget(this);- auto* calvl = new QVBoxLayout(cal_tab);- calvl->setContentsMargins(12, 12, 12, 12);- calvl->setSpacing(8);- auto* cal_start = new QLineEdit(cal_tab);- cal_start->setPlaceholderText("Start date (YYYY-MM-DD)");- cal_start->setStyleSheet(input_ss());- text_inputs_["fd_cal_start"] = cal_start;- calvl->addWidget(build_input_row("Start Date", cal_start, cal_tab));- auto* cal_end = new QLineEdit(cal_tab);- cal_end->setPlaceholderText("End date (YYYY-MM-DD)");- cal_end->setStyleSheet(input_ss());- text_inputs_["fd_cal_end"] = cal_end;- calvl->addWidget(build_input_row("End Date", cal_end, cal_tab));- auto* cal_run = make_run_button("GET TRADING CALENDAR", cal_tab);- connect(cal_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Loading...");- QJsonObject params;- if (!text_inputs_["fd_cal_start"]->text().isEmpty())- params["start_date"] = text_inputs_["fd_cal_start"]->text().trimmed();- if (!text_inputs_["fd_cal_end"]->text().isEmpty())- params["end_date"] = text_inputs_["fd_cal_end"]->text().trimmed();- AIQuantLabService::instance().factor_get_calendar(params);- });- calvl->addWidget(cal_run);- calvl->addStretch();- tabs->addTab(cal_tab, "Calendar");-- vl->addWidget(tabs, 1);- results_layout_ = new QVBoxLayout;- vl->addLayout(results_layout_);- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// MODEL LIBRARY PANEL-// ═══════════════════════════════════════════════════════════════════════════════-QWidget* QuantModulePanel::build_model_library_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- auto* tabs = new QTabWidget(w);- tabs->setStyleSheet(tab_ss(module_.color.name()));-- // ── Model Browser ──- auto* browse_tab = new QWidget(this);- auto* btvl = new QVBoxLayout(browse_tab);- btvl->setContentsMargins(12, 12, 12, 12);- btvl->setSpacing(8);- auto* bt_info =- new QLabel("List all available Qlib models (LightGBM, XGBoost, LSTM, Transformer, etc.).", browse_tab);- bt_info->setWordWrap(true);- bt_info->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")- .arg(ui::colors::TEXT_SECONDARY())- .arg(ui::fonts::SMALL)- .arg(ui::fonts::DATA_FAMILY));- btvl->addWidget(bt_info);- auto* bt_list = make_run_button("LIST ALL MODELS", browse_tab);- connect(bt_list, &QPushButton::clicked, this, [this]() {- status_label_->setText("Loading...");- AIQuantLabService::instance().model_list();- });- btvl->addWidget(bt_list);- auto* bt_status = make_run_button("CHECK QLIB STATUS", browse_tab);- connect(bt_status, &QPushButton::clicked, this, [this]() {- status_label_->setText("Checking...");- AIQuantLabService::instance().model_check_status();- });- btvl->addWidget(bt_status);- btvl->addStretch();- tabs->addTab(browse_tab, "Browse");-- // ── Train Model ──- auto* train_tab = new QWidget(this);- auto* ttvl = new QVBoxLayout(train_tab);- ttvl->setContentsMargins(12, 12, 12, 12);- ttvl->setSpacing(8);- auto* ml_type = new QComboBox(train_tab);- ml_type->setStyleSheet(combo_ss());- ml_type->addItems({"lightgbm", "xgboost", "catboost", "linear", "lstm", "gru", "transformer"});- combo_inputs_["ml_model_type"] = ml_type;- ttvl->addWidget(build_input_row("Model Type", ml_type, train_tab));- auto* ml_instr = new QLineEdit(train_tab);- ml_instr->setPlaceholderText("Instruments (comma-separated, e.g. aapl,msft)");- ml_instr->setStyleSheet(input_ss());- text_inputs_["ml_instruments"] = ml_instr;- ttvl->addWidget(build_input_row("Instruments", ml_instr, train_tab));- auto* ml_start = new QLineEdit(train_tab);- ml_start->setPlaceholderText("Train start (YYYY-MM-DD)");- ml_start->setStyleSheet(input_ss());- text_inputs_["ml_start"] = ml_start;- ttvl->addWidget(build_input_row("Start Date", ml_start, train_tab));- auto* ml_end = new QLineEdit(train_tab);- ml_end->setPlaceholderText("Train end (YYYY-MM-DD)");- ml_end->setStyleSheet(input_ss());- text_inputs_["ml_end"] = ml_end;- ttvl->addWidget(build_input_row("End Date", ml_end, train_tab));- auto* ml_run = make_run_button("TRAIN MODEL", train_tab);- connect(ml_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Training...");- QJsonObject params;- params["model_type"] = combo_inputs_["ml_model_type"]->currentText();- QJsonArray instr;- for (auto& s : text_inputs_["ml_instruments"]->text().split(','))- if (!s.trimmed().isEmpty())- instr.append(s.trimmed().toLower());- params["instruments"] = instr;- if (!text_inputs_["ml_start"]->text().isEmpty())- params["start_date"] = text_inputs_["ml_start"]->text().trimmed();- if (!text_inputs_["ml_end"]->text().isEmpty())- params["end_date"] = text_inputs_["ml_end"]->text().trimmed();- AIQuantLabService::instance().model_train(params);- });- ttvl->addWidget(ml_run);- ttvl->addStretch();- tabs->addTab(train_tab, "Train Model");-- // ── Backtest ──- auto* bt_tab = new QWidget(this);- auto* btvl2 = new QVBoxLayout(bt_tab);- btvl2->setContentsMargins(12, 12, 12, 12);- btvl2->setSpacing(8);- auto* bt_model = new QLineEdit(bt_tab);- bt_model->setPlaceholderText("Model ID (from training output)");- bt_model->setStyleSheet(input_ss());- text_inputs_["ml_bt_model"] = bt_model;- btvl2->addWidget(build_input_row("Model ID", bt_model, bt_tab));- auto* bt_instr = new QLineEdit(bt_tab);- bt_instr->setPlaceholderText("Instruments (comma-separated)");- bt_instr->setStyleSheet(input_ss());- text_inputs_["ml_bt_instr"] = bt_instr;- btvl2->addWidget(build_input_row("Instruments", bt_instr, bt_tab));- auto* bt_start2 = new QLineEdit(bt_tab);- bt_start2->setPlaceholderText("Backtest start (YYYY-MM-DD)");- bt_start2->setStyleSheet(input_ss());- text_inputs_["ml_bt_start"] = bt_start2;- btvl2->addWidget(build_input_row("Start Date", bt_start2, bt_tab));- auto* bt_end2 = new QLineEdit(bt_tab);- bt_end2->setPlaceholderText("Backtest end (YYYY-MM-DD)");- bt_end2->setStyleSheet(input_ss());- text_inputs_["ml_bt_end"] = bt_end2;- btvl2->addWidget(build_input_row("End Date", bt_end2, bt_tab));- auto* bt_run2 = make_run_button("RUN BACKTEST", bt_tab);- connect(bt_run2, &QPushButton::clicked, this, [this]() {- status_label_->setText("Running backtest...");- QJsonObject params;- params["model_id"] = text_inputs_["ml_bt_model"]->text().trimmed();- QJsonArray instr;- for (auto& s : text_inputs_["ml_bt_instr"]->text().split(','))- if (!s.trimmed().isEmpty())- instr.append(s.trimmed().toLower());- params["instruments"] = instr;- if (!text_inputs_["ml_bt_start"]->text().isEmpty())- params["start_date"] = text_inputs_["ml_bt_start"]->text().trimmed();- if (!text_inputs_["ml_bt_end"]->text().isEmpty())- params["end_date"] = text_inputs_["ml_bt_end"]->text().trimmed();- AIQuantLabService::instance().model_backtest(params);- });- btvl2->addWidget(bt_run2);- btvl2->addStretch();- tabs->addTab(bt_tab, "Backtest");-- vl->addWidget(tabs, 1);- results_layout_ = new QVBoxLayout;- vl->addLayout(results_layout_);- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// LIVE SIGNALS PANEL-// ═══════════════════════════════════════════════════════════════════════════════-QWidget* QuantModulePanel::build_live_signals_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- auto* tabs = new QTabWidget(w);- tabs->setStyleSheet(tab_ss(module_.color.name()));-- // ── Signal Data ──- auto* sig_tab = new QWidget(this);- auto* sigvl = new QVBoxLayout(sig_tab);- sigvl->setContentsMargins(12, 12, 12, 12);- sigvl->setSpacing(8);- auto* sig_instr = new QLineEdit(sig_tab);- sig_instr->setPlaceholderText("Instruments (comma-separated, e.g. aapl,msft,goog)");- sig_instr->setStyleSheet(input_ss());- text_inputs_["ls_instruments"] = sig_instr;- sigvl->addWidget(build_input_row("Instruments", sig_instr, sig_tab));- auto* sig_fields = new QLineEdit(sig_tab);- sig_fields->setPlaceholderText("Fields (e.g. $close,$open,$high,$low,$volume)");- sig_fields->setStyleSheet(input_ss());- text_inputs_["ls_fields"] = sig_fields;- sigvl->addWidget(build_input_row("Fields", sig_fields, sig_tab));- auto* sig_start = new QLineEdit(sig_tab);- sig_start->setPlaceholderText("Start date (YYYY-MM-DD)");- sig_start->setStyleSheet(input_ss());- text_inputs_["ls_start"] = sig_start;- sigvl->addWidget(build_input_row("Start Date", sig_start, sig_tab));- auto* sig_end = new QLineEdit(sig_tab);- sig_end->setPlaceholderText("End date (YYYY-MM-DD)");- sig_end->setStyleSheet(input_ss());- text_inputs_["ls_end"] = sig_end;- sigvl->addWidget(build_input_row("End Date", sig_end, sig_tab));- auto* sig_run = make_run_button("FETCH SIGNALS", sig_tab);- connect(sig_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Fetching...");- QJsonObject params;- QJsonArray instr;- for (auto& s : text_inputs_["ls_instruments"]->text().split(','))- if (!s.trimmed().isEmpty())- instr.append(s.trimmed().toLower());- params["instruments"] = instr;- QJsonArray fields;- for (auto& s : text_inputs_["ls_fields"]->text().split(','))- if (!s.trimmed().isEmpty())- fields.append(s.trimmed());- params["fields"] = fields;- if (!text_inputs_["ls_start"]->text().isEmpty())- params["start_date"] = text_inputs_["ls_start"]->text().trimmed();- if (!text_inputs_["ls_end"]->text().isEmpty())- params["end_date"] = text_inputs_["ls_end"]->text().trimmed();- AIQuantLabService::instance().signals_get_data(params);- });- sigvl->addWidget(sig_run);- sigvl->addStretch();- tabs->addTab(sig_tab, "Signal Data");-- // ── Factor Analysis ──- auto* fa_tab = new QWidget(this);- auto* favl = new QVBoxLayout(fa_tab);- favl->setContentsMargins(12, 12, 12, 12);- favl->setSpacing(8);- auto* fa_instr = new QLineEdit(fa_tab);- fa_instr->setPlaceholderText("Instruments (comma-separated)");- fa_instr->setStyleSheet(input_ss());- text_inputs_["ls_fa_instr"] = fa_instr;- favl->addWidget(build_input_row("Instruments", fa_instr, fa_tab));- auto* fa_start = new QLineEdit(fa_tab);- fa_start->setPlaceholderText("Start date (YYYY-MM-DD)");- fa_start->setStyleSheet(input_ss());- text_inputs_["ls_fa_start"] = fa_start;- favl->addWidget(build_input_row("Start Date", fa_start, fa_tab));- auto* fa_end = new QLineEdit(fa_tab);- fa_end->setPlaceholderText("End date (YYYY-MM-DD)");- fa_end->setStyleSheet(input_ss());- text_inputs_["ls_fa_end"] = fa_end;- favl->addWidget(build_input_row("End Date", fa_end, fa_tab));- auto* fa_run = make_run_button("RUN FACTOR ANALYSIS", fa_tab);- connect(fa_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Analyzing...");- QJsonObject params;- QJsonArray instr;- for (auto& s : text_inputs_["ls_fa_instr"]->text().split(','))- if (!s.trimmed().isEmpty())- instr.append(s.trimmed().toLower());- params["instruments"] = instr;- if (!text_inputs_["ls_fa_start"]->text().isEmpty())- params["start_date"] = text_inputs_["ls_fa_start"]->text().trimmed();- if (!text_inputs_["ls_fa_end"]->text().isEmpty())- params["end_date"] = text_inputs_["ls_fa_end"]->text().trimmed();- AIQuantLabService::instance().signals_get_factor_analysis(params);- });- favl->addWidget(fa_run);- favl->addStretch();- tabs->addTab(fa_tab, "Factor Analysis");-- // ── Feature Importance ──- auto* fi_tab = new QWidget(this);- auto* fivl = new QVBoxLayout(fi_tab);- fivl->setContentsMargins(12, 12, 12, 12);- fivl->setSpacing(8);- auto* fi_model = new QLineEdit(fi_tab);- fi_model->setPlaceholderText("Trained model ID");- fi_model->setStyleSheet(input_ss());- text_inputs_["ls_fi_model"] = fi_model;- fivl->addWidget(build_input_row("Model ID", fi_model, fi_tab));- auto* fi_run = make_run_button("GET FEATURE IMPORTANCE", fi_tab);- connect(fi_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Loading...");- QJsonObject params;- params["model_id"] = text_inputs_["ls_fi_model"]->text().trimmed();- AIQuantLabService::instance().signals_get_feature_importance(params);- });- fivl->addWidget(fi_run);- fivl->addStretch();- tabs->addTab(fi_tab, "Feature Importance");-- vl->addWidget(tabs, 1);- results_layout_ = new QVBoxLayout;- vl->addLayout(results_layout_);- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// ONLINE LEARNING PANEL-// ═══════════════════════════════════════════════════════════════════════════════-QWidget* QuantModulePanel::build_online_learning_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- auto* tabs = new QTabWidget(w);- tabs->setStyleSheet(tab_ss(module_.color.name()));-- // ── Models ──- auto* models_tab = new QWidget(this);- auto* mtvl = new QVBoxLayout(models_tab);- mtvl->setContentsMargins(12, 12, 12, 12);- mtvl->setSpacing(8);- auto* mt_info = new QLabel("Incrementally trained models that update on each new data point.", models_tab);- mt_info->setWordWrap(true);- mt_info->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")- .arg(ui::colors::TEXT_SECONDARY())- .arg(ui::fonts::SMALL)- .arg(ui::fonts::DATA_FAMILY));- mtvl->addWidget(mt_info);- auto* mt_list = make_run_button("LIST ALL MODELS", models_tab);- connect(mt_list, &QPushButton::clicked, this, [this]() {- status_label_->setText("Loading...");- AIQuantLabService::instance().online_list_models();- });- mtvl->addWidget(mt_list);- mtvl->addStretch();- tabs->addTab(models_tab, "Models");-- // ── Create Model ──- auto* create_tab = new QWidget(this);- auto* ctvl = new QVBoxLayout(create_tab);- ctvl->setContentsMargins(12, 12, 12, 12);- ctvl->setSpacing(8);- auto* ol_model_type = new QComboBox(create_tab);- ol_model_type->setStyleSheet(combo_ss());- ol_model_type->addItems({"linear", "bayesian_linear", "pa", "tree", "adaptive_tree", "bagging", "ewa", "srp"});- combo_inputs_["ol_model_type"] = ol_model_type;- ctvl->addWidget(build_input_row("Model Type", ol_model_type, create_tab));- auto* ol_model_id = new QLineEdit(create_tab);- ol_model_id->setPlaceholderText("Model ID (optional, auto-generated if blank)");- ol_model_id->setStyleSheet(input_ss());- text_inputs_["ol_model_id"] = ol_model_id;- ctvl->addWidget(build_input_row("Model ID", ol_model_id, create_tab));- auto* ol_create = make_run_button("CREATE MODEL", create_tab);- connect(ol_create, &QPushButton::clicked, this, [this]() {- status_label_->setText("Creating...");- QJsonObject params;- params["model_type"] = combo_inputs_["ol_model_type"]->currentText();- auto mid = text_inputs_["ol_model_id"]->text().trimmed();- if (!mid.isEmpty())- params["model_id"] = mid;- AIQuantLabService::instance().online_create_model(params);- });- ctvl->addWidget(ol_create);- ctvl->addStretch();- tabs->addTab(create_tab, "Create Model");-- // ── Incremental Train ──- auto* train_tab = new QWidget(this);- auto* ttvl = new QVBoxLayout(train_tab);- ttvl->setContentsMargins(12, 12, 12, 12);- ttvl->setSpacing(8);- auto* ol_tid = new QLineEdit(train_tab);- ol_tid->setPlaceholderText("Model ID");- ol_tid->setStyleSheet(input_ss());- text_inputs_["ol_train_id"] = ol_tid;- ttvl->addWidget(build_input_row("Model ID", ol_tid, train_tab));- auto* ol_feats = new QLineEdit(train_tab);- ol_feats->setPlaceholderText(R"({"close":94.0,"volume":1000000,"rsi":55.0})");- ol_feats->setStyleSheet(input_ss());- text_inputs_["ol_features"] = ol_feats;- ttvl->addWidget(build_input_row("Features (JSON)", ol_feats, train_tab));- auto* ol_target = new QLineEdit(train_tab);- ol_target->setPlaceholderText("Target value (e.g. 0.02)");- ol_target->setStyleSheet(input_ss());- text_inputs_["ol_target"] = ol_target;- ttvl->addWidget(build_input_row("Target", ol_target, train_tab));- auto* ol_train = make_run_button("TRAIN ONE STEP", train_tab);- connect(ol_train, &QPushButton::clicked, this, [this]() {- status_label_->setText("Training...");- QJsonObject params;- params["model_id"] = text_inputs_["ol_train_id"]->text().trimmed();- auto doc = QJsonDocument::fromJson(text_inputs_["ol_features"]->text().toUtf8());- if (!doc.isNull())- params["features"] = doc.object();- params["target"] = text_inputs_["ol_target"]->text().trimmed().toDouble();- AIQuantLabService::instance().online_train(params);- });- ttvl->addWidget(ol_train);- ttvl->addStretch();- tabs->addTab(train_tab, "Incremental Train");-- // ── Predict ──- auto* pred_tab = new QWidget(this);- auto* predvl = new QVBoxLayout(pred_tab);- predvl->setContentsMargins(12, 12, 12, 12);- predvl->setSpacing(8);- auto* ol_pid = new QLineEdit(pred_tab);- ol_pid->setPlaceholderText("Model ID");- ol_pid->setStyleSheet(input_ss());- text_inputs_["ol_pred_id"] = ol_pid;- predvl->addWidget(build_input_row("Model ID", ol_pid, pred_tab));- auto* ol_pfeats = new QLineEdit(pred_tab);- ol_pfeats->setPlaceholderText(R"({"close":95.0,"volume":1100000,"rsi":58.0})");- ol_pfeats->setStyleSheet(input_ss());- text_inputs_["ol_pred_feats"] = ol_pfeats;- predvl->addWidget(build_input_row("Features (JSON)", ol_pfeats, pred_tab));- auto* ol_pred = make_run_button("PREDICT", pred_tab);- connect(ol_pred, &QPushButton::clicked, this, [this]() {- status_label_->setText("Predicting...");- QJsonObject params;- params["model_id"] = text_inputs_["ol_pred_id"]->text().trimmed();- auto doc = QJsonDocument::fromJson(text_inputs_["ol_pred_feats"]->text().toUtf8());- if (!doc.isNull())- params["features"] = doc.object();- AIQuantLabService::instance().online_predict(params);- });- predvl->addWidget(ol_pred);- auto* ol_perf = make_run_button("GET PERFORMANCE", pred_tab);- connect(ol_perf, &QPushButton::clicked, this, [this]() {- status_label_->setText("Loading...");- QJsonObject params;- params["model_id"] = text_inputs_["ol_pred_id"]->text().trimmed();- AIQuantLabService::instance().online_performance(params);- });- predvl->addWidget(ol_perf);- predvl->addStretch();- tabs->addTab(pred_tab, "Predict");-- vl->addWidget(tabs, 1);- results_layout_ = new QVBoxLayout;- vl->addLayout(results_layout_);- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// META LEARNING PANEL-// ═══════════════════════════════════════════════════════════════════════════════-QWidget* QuantModulePanel::build_meta_learning_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- auto* tabs = new QTabWidget(w);- tabs->setStyleSheet(tab_ss(module_.color.name()));-- // ── Model Selection ──- auto* sel_tab = new QWidget(this);- auto* selvl = new QVBoxLayout(sel_tab);- selvl->setContentsMargins(12, 12, 12, 12);- selvl->setSpacing(8);- auto* sel_info = new QLabel("Automatically select the best model from a set of candidates.", sel_tab);- sel_info->setWordWrap(true);- sel_info->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")- .arg(ui::colors::TEXT_SECONDARY())- .arg(ui::fonts::SMALL)- .arg(ui::fonts::DATA_FAMILY));- selvl->addWidget(sel_info);- auto* sel_list_btn = make_run_button("LIST AVAILABLE MODELS", sel_tab);- connect(sel_list_btn, &QPushButton::clicked, this, [this]() {- status_label_->setText("Loading...");- AIQuantLabService::instance().meta_list_models();- });- selvl->addWidget(sel_list_btn);- auto* sel_models = new QLineEdit(sel_tab);- sel_models->setPlaceholderText("Model IDs (comma-separated, e.g. lightgbm,xgboost,random_forest)");- sel_models->setStyleSheet(input_ss());- text_inputs_["ml_sel_models"] = sel_models;- selvl->addWidget(build_input_row("Models", sel_models, sel_tab));- auto* sel_task = new QComboBox(sel_tab);- sel_task->setStyleSheet(combo_ss());- sel_task->addItems({"regression", "classification"});- combo_inputs_["ml_sel_task"] = sel_task;- selvl->addWidget(build_input_row("Task Type", sel_task, sel_tab));- auto* sel_run = make_run_button("RUN MODEL SELECTION", sel_tab);- connect(sel_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Selecting...");- QJsonObject params;- QJsonArray model_ids;- for (auto& s : text_inputs_["ml_sel_models"]->text().split(','))- if (!s.trimmed().isEmpty())- model_ids.append(s.trimmed());- params["model_ids"] = model_ids;- params["task_type"] = combo_inputs_["ml_sel_task"]->currentText();- AIQuantLabService::instance().meta_run_selection(params);- });- selvl->addWidget(sel_run);- selvl->addStretch();- tabs->addTab(sel_tab, "Model Selection");-- // ── Ensemble ──- auto* ens_tab = new QWidget(this);- auto* ensvl = new QVBoxLayout(ens_tab);- ensvl->setContentsMargins(12, 12, 12, 12);- ensvl->setSpacing(8);- auto* ens_keys = new QLineEdit(ens_tab);- ens_keys->setPlaceholderText("Model keys (from selection output, comma-separated)");- ens_keys->setStyleSheet(input_ss());- text_inputs_["ml_ens_keys"] = ens_keys;- ensvl->addWidget(build_input_row("Model Keys", ens_keys, ens_tab));- auto* ens_method = new QComboBox(ens_tab);- ens_method->setStyleSheet(combo_ss());- ens_method->addItems({"voting", "stacking", "averaging"});- combo_inputs_["ml_ens_method"] = ens_method;- ensvl->addWidget(build_input_row("Ensemble Method", ens_method, ens_tab));- auto* ens_run = make_run_button("CREATE ENSEMBLE", ens_tab);- connect(ens_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Creating ensemble...");- QJsonObject params;- QJsonArray keys;- for (auto& s : text_inputs_["ml_ens_keys"]->text().split(','))- if (!s.trimmed().isEmpty())- keys.append(s.trimmed());- params["model_keys"] = keys;- params["method"] = combo_inputs_["ml_ens_method"]->currentText();- AIQuantLabService::instance().meta_create_ensemble(params);- });- ensvl->addWidget(ens_run);- ensvl->addStretch();- tabs->addTab(ens_tab, "Ensemble");-- // ── Hyperparameter Tuning ──- auto* tune_tab = new QWidget(this);- auto* tunevl = new QVBoxLayout(tune_tab);- tunevl->setContentsMargins(12, 12, 12, 12);- tunevl->setSpacing(8);- auto* tune_model = new QComboBox(tune_tab);- tune_model->setStyleSheet(combo_ss());- tune_model->addItems({"lightgbm", "xgboost", "random_forest", "catboost"});- combo_inputs_["ml_tune_model"] = tune_model;- tunevl->addWidget(build_input_row("Model", tune_model, tune_tab));- auto* tune_grid = new QLineEdit(tune_tab);- tune_grid->setPlaceholderText(R"({"n_estimators":[50,100,200],"max_depth":[3,5,7]})");- tune_grid->setStyleSheet(input_ss());- text_inputs_["ml_tune_grid"] = tune_grid;- tunevl->addWidget(build_input_row("Param Grid (JSON)", tune_grid, tune_tab));- auto* tune_method = new QComboBox(tune_tab);- tune_method->setStyleSheet(combo_ss());- tune_method->addItems({"grid", "random"});- combo_inputs_["ml_tune_method"] = tune_method;- tunevl->addWidget(build_input_row("Search Method", tune_method, tune_tab));- auto* tune_run = make_run_button("TUNE HYPERPARAMETERS", tune_tab);- connect(tune_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Tuning...");- QJsonObject params;- params["model_id"] = combo_inputs_["ml_tune_model"]->currentText();- auto doc = QJsonDocument::fromJson(text_inputs_["ml_tune_grid"]->text().toUtf8());- if (!doc.isNull())- params["param_grid"] = doc.object();- params["search_method"] = combo_inputs_["ml_tune_method"]->currentText();- AIQuantLabService::instance().meta_tune_hyperparameters(params);- });- tunevl->addWidget(tune_run);- auto* results_btn = make_run_button("GET ALL RESULTS", tune_tab);- connect(results_btn, &QPushButton::clicked, this, [this]() {- status_label_->setText("Loading...");- AIQuantLabService::instance().meta_get_results();- });- tunevl->addWidget(results_btn);- tunevl->addStretch();- tabs->addTab(tune_tab, "Hyperparameter Tuning");-- vl->addWidget(tabs, 1);- results_layout_ = new QVBoxLayout;- vl->addLayout(results_layout_);- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// HFT PANEL-// ═══════════════════════════════════════════════════════════════════════════════-QWidget* QuantModulePanel::build_hft_panel() {- const QString accent = module_.color.name();-- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(0, 0, 0, 0);- vl->setSpacing(0);-- // ── Shared exchange/symbol bar ────────────────────────────────────────────- auto* top_bar = new QWidget(w);- top_bar->setStyleSheet(QString("background:%1; border-bottom:1px solid %2;")- .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));- auto* top_hl = new QHBoxLayout(top_bar);- top_hl->setContentsMargins(12, 8, 12, 8);- top_hl->setSpacing(8);-- auto* exch_lbl = new QLabel("EXCHANGE", top_bar);- exch_lbl->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; letter-spacing:0.5px;")- .arg(ui::colors::TEXT_TERTIARY()));- auto* hft_exchange = new QComboBox(top_bar);- hft_exchange->addItems({"binance", "kraken", "coinbase", "bybit", "okx", "hyperliquid"});- hft_exchange->setStyleSheet(combo_ss());- hft_exchange->setFixedWidth(110);- combo_inputs_["hft_exchange"] = hft_exchange;-- auto* sym_lbl = new QLabel("SYMBOL", top_bar);- sym_lbl->setStyleSheet(exch_lbl->styleSheet());- auto* hft_symbol = new QLineEdit(top_bar);- hft_symbol->setText("BTC/USDT");- hft_symbol->setFixedWidth(100);- hft_symbol->setStyleSheet(input_ss());- hft_symbol->setToolTip("e.g. BTC/USDT, ETH/USDT");- text_inputs_["hft_symbol"] = hft_symbol;-- auto* depth_lbl = new QLabel("DEPTH", top_bar);- depth_lbl->setStyleSheet(exch_lbl->styleSheet());- auto* hft_depth = new QComboBox(top_bar);- hft_depth->addItems({"10", "20", "50", "100"});- hft_depth->setCurrentIndex(1);- hft_depth->setFixedWidth(60);- hft_depth->setStyleSheet(combo_ss());- combo_inputs_["hft_depth"] = hft_depth;-- top_hl->addWidget(exch_lbl);- top_hl->addWidget(hft_exchange);- top_hl->addWidget(sym_lbl);- top_hl->addWidget(hft_symbol);- top_hl->addWidget(depth_lbl);- top_hl->addWidget(hft_depth);- top_hl->addStretch();-- // Live latency badge- auto* latency_lbl = new QLabel("LATENCY —", top_bar);- latency_lbl->setObjectName("hftLatency");- latency_lbl->setStyleSheet(QString("color:%1; font-size:9px; font-family:'Courier New'; background:transparent;")- .arg(ui::colors::TEXT_TERTIARY()));- top_hl->addWidget(latency_lbl);- vl->addWidget(top_bar);-- // ── Tab widget ────────────────────────────────────────────────────────────- auto* tabs = new QTabWidget(w);- tabs->setStyleSheet(tab_ss(accent));-- // ════════════════════════════════════════════════════════- // TAB 1 — LIVE ORDER BOOK- // ════════════════════════════════════════════════════════- auto* ob_tab = new QWidget(this);- auto* ob_root = new QVBoxLayout(ob_tab);- ob_root->setContentsMargins(12, 10, 12, 10);- ob_root->setSpacing(8);-- // Controls row- auto* ob_ctrl = new QHBoxLayout;- ob_ctrl->setSpacing(8);- auto* ob_fetch = make_run_button("FETCH LIVE ORDER BOOK", ob_tab);- connect(ob_fetch, &QPushButton::clicked, this, [this]() {- status_label_->setText("Fetching live order book...");- QJsonObject p;- p["exchange"] = combo_inputs_["hft_exchange"]->currentText();- p["symbol"] = text_inputs_["hft_symbol"]->text().trimmed();- p["depth"] = combo_inputs_["hft_depth"]->currentText().toInt();- AIQuantLabService::instance().hft_create_orderbook(p);- });- ob_ctrl->addWidget(ob_fetch);- ob_ctrl->addStretch();- ob_root->addLayout(ob_ctrl);-- // Metrics row — 5 cards in a grid- auto* metrics_row = new QHBoxLayout;- metrics_row->setSpacing(6);-- auto make_card = [&](const QString& label, QWidget* parent) -> QPair<QWidget*, QLabel*> {- auto* card = new QWidget(parent);- card->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:3px;")- .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));- auto* cvl = new QVBoxLayout(card);- cvl->setContentsMargins(10, 6, 10, 6);- cvl->setSpacing(2);- auto* l = new QLabel(label, card);- l->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; letter-spacing:0.5px; background:transparent;")- .arg(ui::colors::TEXT_TERTIARY()));- auto* v = new QLabel("—", card);- v->setObjectName("hftCardVal");- v->setStyleSheet(QString("color:%1; font-size:13px; font-weight:700; font-family:'Courier New'; background:transparent;")- .arg(ui::colors::TEXT_PRIMARY()));- cvl->addWidget(l);- cvl->addWidget(v);- return {card, v};- };-- auto [mid_card, mid_val] = make_card("MID PRICE", ob_tab);- auto [spread_card, spread_val] = make_card("SPREAD BPS", ob_tab);- auto [obi_card, obi_val] = make_card("ORDER BOOK IMBALANCE", ob_tab);- auto [pressure_card, pres_val] = make_card("PRESSURE", ob_tab);- auto [wmid_card, wmid_val] = make_card("WEIGHTED MID", ob_tab);-- // Store for result update- mid_val->setObjectName("hft_mid_val");- spread_val->setObjectName("hft_spread_val");- obi_val->setObjectName("hft_obi_val");- pres_val->setObjectName("hft_pressure_val");- wmid_val->setObjectName("hft_wmid_val");-- metrics_row->addWidget(mid_card, 1);- metrics_row->addWidget(spread_card, 1);- metrics_row->addWidget(obi_card, 1);- metrics_row->addWidget(pressure_card, 1);- metrics_row->addWidget(wmid_card, 1);- ob_root->addLayout(metrics_row);-- // Bid / Ask tables side by side- auto* books_row = new QHBoxLayout;- books_row->setSpacing(8);-- // Bids- auto* bids_frame = new QWidget(ob_tab);- bids_frame->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:3px;")- .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));- auto* bids_vl = new QVBoxLayout(bids_frame);- bids_vl->setContentsMargins(0, 0, 0, 0);- bids_vl->setSpacing(0);- auto* bids_hdr = new QLabel(" BIDS", bids_frame);- bids_hdr->setFixedHeight(24);- bids_hdr->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; letter-spacing:1px;"- "background:%2; border-bottom:1px solid %3;")- .arg(ui::colors::POSITIVE(), ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));- auto* bid_table = new QTableWidget(10, 3, bids_frame);- bid_table->setObjectName("hft_bid_table");- bid_table->setHorizontalHeaderLabels({"Price", "Size", "Cumulative"});- bid_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);- bid_table->verticalHeader()->setVisible(false);- bid_table->setEditTriggers(QAbstractItemView::NoEditTriggers);- bid_table->setSelectionMode(QAbstractItemView::NoSelection);- bid_table->setShowGrid(false);- bid_table->setStyleSheet(- QString("QTableWidget { background:%1; border:none; }"- "QHeaderView::section { background:%2; color:%3; font-size:9px; font-weight:700;"- " padding:3px 6px; border:none; border-bottom:1px solid %4; }"- "QTableWidget::item { padding:2px 6px; font-family:'Courier New'; font-size:10px; border:none; }")- .arg(ui::colors::BG_RAISED(), ui::colors::BG_SURFACE(),- ui::colors::TEXT_TERTIARY(), ui::colors::BORDER_DIM()));- bids_vl->addWidget(bids_hdr);- bids_vl->addWidget(bid_table, 1);-- // Asks- auto* asks_frame = new QWidget(ob_tab);- asks_frame->setStyleSheet(bids_frame->styleSheet());- auto* asks_vl = new QVBoxLayout(asks_frame);- asks_vl->setContentsMargins(0, 0, 0, 0);- asks_vl->setSpacing(0);- auto* asks_hdr = new QLabel(" ASKS", asks_frame);- asks_hdr->setFixedHeight(24);- asks_hdr->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; letter-spacing:1px;"- "background:%2; border-bottom:1px solid %3;")- .arg(ui::colors::NEGATIVE(), ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));- auto* ask_table = new QTableWidget(10, 3, asks_frame);- ask_table->setObjectName("hft_ask_table");- ask_table->setHorizontalHeaderLabels({"Price", "Size", "Cumulative"});- ask_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);- ask_table->verticalHeader()->setVisible(false);- ask_table->setEditTriggers(QAbstractItemView::NoEditTriggers);- ask_table->setSelectionMode(QAbstractItemView::NoSelection);- ask_table->setShowGrid(false);- ask_table->setStyleSheet(bid_table->styleSheet());- asks_vl->addWidget(asks_hdr);- asks_vl->addWidget(ask_table, 1);-- books_row->addWidget(bids_frame, 1);- books_row->addWidget(asks_frame, 1);- ob_root->addLayout(books_row, 1);- tabs->addTab(ob_tab, "Live Order Book");-- // ════════════════════════════════════════════════════════- // TAB 2 — MICROSTRUCTURE (Market Making + Toxic Flow)- // ════════════════════════════════════════════════════════- auto* micro_tab = new QWidget(this);- auto* micro_root = new QVBoxLayout(micro_tab);- micro_root->setContentsMargins(12, 10, 12, 10);- micro_root->setSpacing(10);-- // ─ Market Making section ─- auto* mm_section = new QWidget(micro_tab);- mm_section->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:3px;")- .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));- auto* mm_vl = new QVBoxLayout(mm_section);- mm_vl->setContentsMargins(12, 10, 12, 10);- mm_vl->setSpacing(8);-- auto* mm_title = new QLabel("MARKET MAKING — Avellaneda-Stoikov Model", mm_section);- mm_title->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; letter-spacing:0.5px; background:transparent;")- .arg(accent));- mm_vl->addWidget(mm_title);-- auto* mm_params = new QHBoxLayout;- mm_params->setSpacing(8);- auto* inv_spin = make_double_spin(-1000, 1000, 0.0, 4, " units", mm_section);- int_inputs_["hft_inventory"] = nullptr;- double_inputs_["hft_inventory_d"] = inv_spin;- mm_params->addWidget(build_input_row("Inventory", inv_spin, mm_section));- auto* spread_spin = make_double_spin(1.0, 10.0, 1.5, 2, "×", mm_section);- double_inputs_["hft_spread_mult"] = spread_spin;- mm_params->addWidget(build_input_row("Spread Mult", spread_spin, mm_section));- auto* risk_spin = make_double_spin(0.001, 0.1, 0.01, 3, "", mm_section);- double_inputs_["hft_risk_aversion"] = risk_spin;- mm_params->addWidget(build_input_row("Risk Aversion", risk_spin, mm_section));- mm_vl->addLayout(mm_params);-- auto* mm_run = make_run_button("CALCULATE OPTIMAL QUOTES", mm_section);- connect(mm_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Fetching live data + computing quotes...");- QJsonObject p;- p["exchange"] = combo_inputs_["hft_exchange"]->currentText();- p["symbol"] = text_inputs_["hft_symbol"]->text().trimmed();- p["inventory"] = double_inputs_["hft_inventory_d"]->value();- p["spread_multiplier"] = double_inputs_["hft_spread_mult"]->value();- p["risk_aversion"] = double_inputs_["hft_risk_aversion"]->value();- AIQuantLabService::instance().hft_market_making_quotes(p);- });- mm_vl->addWidget(mm_run);-- // MM result cards- auto* mm_results = new QHBoxLayout;- mm_results->setSpacing(6);- auto [bid_card, bid_val2] = make_card("BID QUOTE", mm_section);- auto [ask_card, ask_val2] = make_card("ASK QUOTE", mm_section);- auto [qs_card, qs_val] = make_card("QUOTED SPREAD BPS", mm_section);- auto [edge_card, edge_val] = make_card("EDGE/SIDE BPS", mm_section);- auto [rec_card, rec_val] = make_card("RECOMMENDATION", mm_section);- bid_val2->setObjectName("hft_mm_bid");- ask_val2->setObjectName("hft_mm_ask");- qs_val->setObjectName("hft_mm_qspread");- edge_val->setObjectName("hft_mm_edge");- rec_val->setObjectName("hft_mm_rec");- mm_results->addWidget(bid_card, 1);- mm_results->addWidget(ask_card, 1);- mm_results->addWidget(qs_card, 1);- mm_results->addWidget(edge_card, 1);- mm_results->addWidget(rec_card, 1);- mm_vl->addLayout(mm_results);- micro_root->addWidget(mm_section);-- // ─ Toxic Flow section ─- auto* tox_section = new QWidget(micro_tab);- tox_section->setStyleSheet(mm_section->styleSheet());- auto* tox_vl = new QVBoxLayout(tox_section);- tox_vl->setContentsMargins(12, 10, 12, 10);- tox_vl->setSpacing(8);-- auto* tox_title = new QLabel("TOXIC FLOW DETECTION — PIN Score Model", tox_section);- tox_title->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; letter-spacing:0.5px; background:transparent;")- .arg(accent));- tox_vl->addWidget(tox_title);-- auto* tox_params = new QHBoxLayout;- tox_params->setSpacing(8);- auto* tox_limit = new QComboBox(tox_section);- tox_limit->addItems({"50", "100", "200", "500"});- tox_limit->setCurrentIndex(2);- tox_limit->setStyleSheet(combo_ss());- combo_inputs_["hft_tox_limit"] = tox_limit;- tox_params->addWidget(build_input_row("Trade History", tox_limit, tox_section));- tox_params->addStretch();- tox_vl->addLayout(tox_params);-- auto* tox_run = make_run_button("DETECT TOXIC FLOW", tox_section);- connect(tox_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Fetching trades + analyzing flow...");- QJsonObject p;- p["exchange"] = combo_inputs_["hft_exchange"]->currentText();- p["symbol"] = text_inputs_["hft_symbol"]->text().trimmed();- p["limit"] = combo_inputs_["hft_tox_limit"]->currentText().toInt();- AIQuantLabService::instance().hft_detect_toxic(p);- });- tox_vl->addWidget(tox_run);-- auto* tox_results = new QHBoxLayout;- tox_results->setSpacing(6);- auto [pin_card, pin_val] = make_card("PIN SCORE (0-100)", tox_section);- auto [vol_card, vol_val] = make_card("VOLUME IMBALANCE", tox_section);- auto [impact_card, impact_val] = make_card("PRICE IMPACT BPS", tox_section);- auto [class_card, class_val] = make_card("CLASSIFICATION", tox_section);- auto [action_card, action_val] = make_card("RECOMMENDED ACTION", tox_section);- pin_val->setObjectName("hft_tox_pin");- vol_val->setObjectName("hft_tox_vol");- impact_val->setObjectName("hft_tox_impact");- class_val->setObjectName("hft_tox_class");- action_val->setObjectName("hft_tox_action");- tox_results->addWidget(pin_card, 1);- tox_results->addWidget(vol_card, 1);- tox_results->addWidget(impact_card, 1);- tox_results->addWidget(class_card, 1);- tox_results->addWidget(action_card, 1);- tox_vl->addLayout(tox_results);- micro_root->addWidget(tox_section);- micro_root->addStretch();- tabs->addTab(micro_tab, "Microstructure");-- // ════════════════════════════════════════════════════════- // TAB 3 — SLIPPAGE ESTIMATOR- // ════════════════════════════════════════════════════════- auto* slip_tab = new QWidget(this);- auto* slip_root = new QVBoxLayout(slip_tab);- slip_root->setContentsMargins(12, 10, 12, 10);- slip_root->setSpacing(10);-- auto* slip_section = new QWidget(slip_tab);- slip_section->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:3px;")- .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));- auto* slip_vl = new QVBoxLayout(slip_section);- slip_vl->setContentsMargins(12, 10, 12, 10);- slip_vl->setSpacing(8);-- auto* slip_title = new QLabel("SLIPPAGE ESTIMATOR — Real Order Book Walk", slip_section);- slip_title->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; letter-spacing:0.5px; background:transparent;")- .arg(accent));- slip_vl->addWidget(slip_title);-- auto* slip_desc = new QLabel(- "Walks the live order book level-by-level to compute actual fill price and slippage for a given order size.", slip_section);- slip_desc->setWordWrap(true);- slip_desc->setStyleSheet(QString("color:%1; font-size:10px; background:transparent;").arg(ui::colors::TEXT_SECONDARY()));- slip_vl->addWidget(slip_desc);-- auto* slip_params = new QHBoxLayout;- slip_params->setSpacing(8);- auto* slip_side = new QComboBox(slip_section);- slip_side->addItems({"buy", "sell"});- slip_side->setStyleSheet(combo_ss());- combo_inputs_["hft_slip_side"] = slip_side;- slip_params->addWidget(build_input_row("Side", slip_side, slip_section));- auto* slip_qty = make_double_spin(0.0001, 1'000'000, 1.0, 6, "", slip_section);- double_inputs_["hft_slip_qty"] = slip_qty;- slip_params->addWidget(build_input_row("Quantity", slip_qty, slip_section));- slip_vl->addLayout(slip_params);-- auto* slip_run = make_run_button("ESTIMATE SLIPPAGE", slip_section);- connect(slip_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Walking order book...");- QJsonObject p;- p["exchange"] = combo_inputs_["hft_exchange"]->currentText();- p["symbol"] = text_inputs_["hft_symbol"]->text().trimmed();- p["side"] = combo_inputs_["hft_slip_side"]->currentText();- p["quantity"] = double_inputs_["hft_slip_qty"]->value();- AIQuantLabService::instance().hft_execute_order(p);- });- slip_vl->addWidget(slip_run);-- // Slippage result cards- auto* slip_results = new QHBoxLayout;- slip_results->setSpacing(6);- auto [avgp_card, avgp_val] = make_card("AVG FILL PRICE", slip_section);- auto [slbps_card, slbps_val] = make_card("SLIPPAGE BPS", slip_section);- auto [cost_card, cost_val] = make_card("TOTAL COST", slip_section);- auto [fills_card, fills_val] = make_card("FILL LEVELS", slip_section);- auto [viable_card, viable_val] = make_card("VIABILITY", slip_section);- avgp_val->setObjectName("hft_slip_avgp");- slbps_val->setObjectName("hft_slip_bps");- cost_val->setObjectName("hft_slip_cost");- fills_val->setObjectName("hft_slip_fills");- viable_val->setObjectName("hft_slip_viable");- slip_results->addWidget(avgp_card, 1);- slip_results->addWidget(slbps_card, 1);- slip_results->addWidget(cost_card, 1);- slip_results->addWidget(fills_card, 1);- slip_results->addWidget(viable_card, 1);- slip_vl->addLayout(slip_results);-- // Fills table- auto* fills_table = new QTableWidget(0, 3, slip_section);- fills_table->setObjectName("hft_slip_table");- fills_table->setHorizontalHeaderLabels({"Fill Price", "Quantity", "Cost"});- fills_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);- fills_table->verticalHeader()->setVisible(false);- fills_table->setEditTriggers(QAbstractItemView::NoEditTriggers);- fills_table->setSelectionMode(QAbstractItemView::NoSelection);- fills_table->setShowGrid(false);- fills_table->setMaximumHeight(160);- fills_table->setStyleSheet(- QString("QTableWidget { background:%1; border:1px solid %2; }"- "QHeaderView::section { background:%3; color:%4; font-size:9px; font-weight:700;"- " padding:3px 6px; border:none; border-bottom:1px solid %2; }"- "QTableWidget::item { padding:2px 6px; font-family:'Courier New'; font-size:10px; }")- .arg(ui::colors::BG_BASE(), ui::colors::BORDER_DIM(),- ui::colors::BG_SURFACE(), ui::colors::TEXT_TERTIARY()));- slip_vl->addWidget(fills_table);-- slip_root->addWidget(slip_section);- slip_root->addStretch();- tabs->addTab(slip_tab, "Slippage Estimator");-- // ── Full Analyze button (bottom bar) ─────────────────────────────────────- auto* bottom_bar = new QWidget(w);- bottom_bar->setStyleSheet(QString("background:%1; border-top:1px solid %2;")- .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));- auto* bot_hl = new QHBoxLayout(bottom_bar);- bot_hl->setContentsMargins(12, 6, 12, 6);- auto* analyze_btn = make_run_button("⚡ FULL ANALYSIS — FETCH ALL & COMPUTE", bottom_bar);- analyze_btn->setToolTip("Fetches live order book + trades, computes book metrics, market making quotes, toxic flow, and slippage in one call");- connect(analyze_btn, &QPushButton::clicked, this, [this]() {- status_label_->setText("Running full microstructure analysis...");- QJsonObject p;- p["exchange"] = combo_inputs_["hft_exchange"]->currentText();- p["symbol"] = text_inputs_["hft_symbol"]->text().trimmed();- p["depth"] = combo_inputs_["hft_depth"]->currentText().toInt();- p["limit"] = combo_inputs_["hft_tox_limit"]->currentText().toInt();- p["inventory"] = double_inputs_["hft_inventory_d"]->value();- p["spread_multiplier"] = double_inputs_["hft_spread_mult"]->value();- p["quantity"] = double_inputs_["hft_slip_qty"]->value();- AIQuantLabService::instance().hft_snapshot(p);- });- bot_hl->addWidget(analyze_btn, 1);-- vl->addWidget(tabs, 1);- vl->addWidget(bottom_bar);-- results_layout_ = new QVBoxLayout;- vl->addLayout(results_layout_);- return w;-}--// ═══════════════════════════════════════════════════════════════════════════════-// ROLLING RETRAINING PANEL-// ═══════════════════════════════════════════════════════════════════════════════-QWidget* QuantModulePanel::build_rolling_retraining_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);-- const QString accent = module_.color.name();- auto* tabs = new QTabWidget(w);- tabs->setStyleSheet(tab_ss(accent));-- // ── Tab 1: Schedules ─────────────────────────────────────────────────────- auto* list_tab = new QWidget;- auto* ltvl = new QVBoxLayout(list_tab);- ltvl->setContentsMargins(12, 12, 12, 12);- ltvl->setSpacing(10);-- auto* lt_info = new QLabel(- "Schedules are persisted in ~/.fincept/rolling_schedules.json. "- "Click Refresh to load the latest state.", list_tab);- lt_info->setWordWrap(true);- lt_info->setStyleSheet(QString("color:%1; font-size:11px;").arg(ui::colors::TEXT_SECONDARY()));- ltvl->addWidget(lt_info);-- // Schedule cards container (scrollable)- auto* scroll = new QScrollArea(list_tab);- scroll->setWidgetResizable(true);- scroll->setFrameShape(QFrame::NoFrame);- scroll->setStyleSheet(QString("QScrollArea{background:transparent;border:none;}"- "QScrollBar:vertical{background:%1;width:6px;border-radius:3px;}"- "QScrollBar::handle:vertical{background:%2;border-radius:3px;}")- .arg(ui::colors::BG_BASE(), ui::colors::BORDER_MED()));- auto* cards_w = new QWidget;- cards_w->setStyleSheet("background:transparent;");- auto* cards_vl = new QVBoxLayout(cards_w);- cards_vl->setContentsMargins(0, 0, 0, 0);- cards_vl->setSpacing(8);- cards_vl->addStretch();- scroll->setWidget(cards_w);- ltvl->addWidget(scroll, 1);-- // Store pointer so result handler can repopulate cards- // We tag the cards container via objectName- cards_w->setObjectName("rr_cards_container");-- auto* lt_run = make_run_button("REFRESH SCHEDULES", list_tab);- connect(lt_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Loading schedules...");- AIQuantLabService::instance().rolling_list_schedules();- });- ltvl->addWidget(lt_run);- tabs->addTab(list_tab, "Schedules");-- // ── Tab 2: Create Schedule ───────────────────────────────────────────────- auto* create_tab = new QWidget;- auto* ctvl = new QVBoxLayout(create_tab);- ctvl->setContentsMargins(12, 12, 12, 12);- ctvl->setSpacing(8);-- auto* rr_model_id = new QLineEdit(create_tab);- rr_model_id->setPlaceholderText("Unique model ID (e.g. lgbm_sp500)");- rr_model_id->setStyleSheet(input_ss());- text_inputs_["rr_model_id"] = rr_model_id;- ctvl->addWidget(build_input_row("Model ID *", rr_model_id, create_tab));-- auto* rr_conf = new QLineEdit(create_tab);- rr_conf->setPlaceholderText("Optional: path to Qlib YAML config (leave blank for built-in LightGBM+Alpha158)");- rr_conf->setStyleSheet(input_ss());- text_inputs_["rr_conf_path"] = rr_conf;- ctvl->addWidget(build_input_row("Config Path", rr_conf, create_tab));-- auto* rr_freq = new QComboBox(create_tab);- rr_freq->setStyleSheet(combo_ss());- rr_freq->addItems({"daily", "weekly", "monthly"});- combo_inputs_["rr_frequency"] = rr_freq;- ctvl->addWidget(build_input_row("Frequency", rr_freq, create_tab));-- auto* rr_window = new QLineEdit(create_tab);- rr_window->setPlaceholderText("Rolling window in trading days (default: 252)");- rr_window->setStyleSheet(input_ss());- text_inputs_["rr_window"] = rr_window;- ctvl->addWidget(build_input_row("Window (days)", rr_window, create_tab));-- auto* rr_step = new QLineEdit(create_tab);- rr_step->setPlaceholderText("Step size between windows (default: 20)");- rr_step->setStyleSheet(input_ss());- text_inputs_["rr_step"] = rr_step;- ctvl->addWidget(build_input_row("Step (days)", rr_step, create_tab));-- // Region selector- auto* rr_region = new QComboBox(create_tab);- rr_region->setStyleSheet(combo_ss());- rr_region->addItems({"us", "cn"});- combo_inputs_["rr_region"] = rr_region;- ctvl->addWidget(build_input_row("Data Region", rr_region, create_tab));-- // Preview + Create buttons side by side- auto* btn_row = new QWidget(create_tab);- auto* btn_hl = new QHBoxLayout(btn_row);- btn_hl->setContentsMargins(0, 4, 0, 0);- btn_hl->setSpacing(8);-- auto* rr_preview = make_run_button("PREVIEW WINDOWS", btn_row);- rr_preview->setStyleSheet(QString(- "QPushButton{background:%1;color:%2;border:1px solid %1;border-radius:4px;"- "font-size:11px;font-weight:700;padding:6px 14px;}"- "QPushButton:hover{background:%3;}")- .arg(ui::colors::BG_RAISED(), accent, ui::colors::BG_HOVER()));- connect(rr_preview, &QPushButton::clicked, this, [this]() {- const QString mid = text_inputs_["rr_model_id"]->text().trimmed();- const QString cp = text_inputs_["rr_conf_path"]->text().trimmed();- if (mid.isEmpty() && cp.isEmpty()) {- status_label_->setText("Enter a Model ID or Config Path to preview.");- return;- }- status_label_->setText("Generating preview...");- QJsonObject params;- if (!mid.isEmpty()) params["model_id"] = mid;- if (!cp.isEmpty()) params["conf_path"] = cp;- const QString step = text_inputs_["rr_step"]->text().trimmed();- if (!step.isEmpty()) params["step"] = step.toInt();- AIQuantLabService::instance().rolling_preview_tasks(params);- });- btn_hl->addWidget(rr_preview, 1);-- auto* rr_create = make_run_button("CREATE SCHEDULE", btn_row);- connect(rr_create, &QPushButton::clicked, this, [this]() {- const QString mid = text_inputs_["rr_model_id"]->text().trimmed();- if (mid.isEmpty()) {- status_label_->setText("Model ID is required.");- return;- }- status_label_->setText("Creating schedule...");- QJsonObject params;- params["model_id"] = mid;- params["frequency"] = combo_inputs_["rr_frequency"]->currentText();- params["region"] = combo_inputs_["rr_region"]->currentText();- const QString cp = text_inputs_["rr_conf_path"]->text().trimmed();- if (!cp.isEmpty()) params["conf_path"] = cp;- const QString win = text_inputs_["rr_window"]->text().trimmed();- if (!win.isEmpty()) params["window"] = win.toInt();- const QString step = text_inputs_["rr_step"]->text().trimmed();- if (!step.isEmpty()) params["step"] = step.toInt();- AIQuantLabService::instance().rolling_create_schedule(params);- });- btn_hl->addWidget(rr_create, 1);- ctvl->addWidget(btn_row);- ctvl->addStretch();- tabs->addTab(create_tab, "Create Schedule");-- // ── Tab 3: Execute Retrain ───────────────────────────────────────────────- auto* retrain_tab = new QWidget;- auto* retrainvl = new QVBoxLayout(retrain_tab);- retrainvl->setContentsMargins(12, 12, 12, 12);- retrainvl->setSpacing(10);-- auto* rt_info = new QLabel(- "Executes a full rolling retrain for a scheduled model. Each window trains "- "independently and progress is streamed live below.", retrain_tab);- rt_info->setWordWrap(true);- rt_info->setStyleSheet(QString("color:%1; font-size:11px;").arg(ui::colors::TEXT_SECONDARY()));- retrainvl->addWidget(rt_info);-- auto* rr_exec_id = new QLineEdit(retrain_tab);- rr_exec_id->setPlaceholderText("Model ID (must be in Schedules)");- rr_exec_id->setStyleSheet(input_ss());- text_inputs_["rr_exec_id"] = rr_exec_id;- retrainvl->addWidget(build_input_row("Model ID *", rr_exec_id, retrain_tab));-- // Progress bar- auto* rr_progress = new QProgressBar(retrain_tab);- rr_progress->setObjectName("rr_progress");- rr_progress->setRange(0, 100);- rr_progress->setValue(0);- rr_progress->setTextVisible(true);- rr_progress->setFormat("Idle");- rr_progress->setStyleSheet(QString(- "QProgressBar{background:%1;border:1px solid %2;border-radius:4px;"- "color:%3;font-size:11px;font-weight:600;text-align:center;height:20px;}"- "QProgressBar::chunk{background:%4;border-radius:3px;}")- .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_MED(),- ui::colors::TEXT_PRIMARY(), accent));- retrainvl->addWidget(rr_progress);-- // Streaming log output- auto* rr_log = new QTextEdit(retrain_tab);- rr_log->setObjectName("rr_log");- rr_log->setReadOnly(true);- rr_log->setPlaceholderText("Training progress will stream here...");- rr_log->setStyleSheet(output_ss());- rr_log->setMinimumHeight(140);- retrainvl->addWidget(rr_log, 1);-- auto* rr_exec = make_run_button("EXECUTE RETRAIN NOW", retrain_tab);- connect(rr_exec, &QPushButton::clicked, this, [this]() {- const QString mid = text_inputs_["rr_exec_id"]->text().trimmed();- if (mid.isEmpty()) {- status_label_->setText("Model ID is required.");- return;- }- // Reset progress UI- if (auto* pb = this->findChild<QProgressBar*>("rr_progress")) {- pb->setValue(0);- pb->setFormat("Starting...");- }- if (auto* log = this->findChild<QTextEdit*>("rr_log"))- log->clear();- status_label_->setText("Retraining...");- QJsonObject params;- params["model_id"] = mid;- AIQuantLabService::instance().rolling_execute_retrain(params);- });- retrainvl->addWidget(rr_exec);- tabs->addTab(retrain_tab, "Execute Retrain");-- vl->addWidget(tabs, 1);- results_layout_ = new QVBoxLayout;- vl->addLayout(results_layout_);- return w;-}-} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.h b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.hindex 7f9aa2717..b7e6cef3d 100644--- a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.h+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.h@@ -39,6 +39,10 @@ class QuantModulePanel : public QWidget {QWidget* build_rd_agent_tab(QComboBox* llm_combo);QWidget* build_generic_panel();QWidget* build_gs_quant_panel();+ QWidget* build_functime_panel();+ QWidget* build_statsmodels_panel();+ QWidget* build_fortitudo_panel();+ QWidget* build_gluonts_panel();QWidget* build_cfa_quant_panel();QWidget* build_backtesting_panel();QWidget* build_rl_trading_panel();@@ -67,6 +71,13 @@ class QuantModulePanel : public QWidget {void display_result(const QJsonObject& data);void display_backtest_result(const QJsonObject& data);void display_cfa_result(const QString& command, const QJsonObject& data);+ void display_gs_result(const QString& command, const QJsonObject& data);+ void display_functime_result(const QString& command, const QJsonObject& data);+ void display_statsmodels_result(const QString& command, const QJsonObject& data);+ void display_fortitudo_result(const QString& command, const QJsonObject& data);+ void display_quant_reporting_result(const QString& command, const QJsonObject& data);+ void display_gluonts_result(const QString& command, const QJsonObject& data);+ void show_loading(const QString& message);void display_error(const QString& msg);void clear_results();diff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Backtesting.cpp b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Backtesting.cppnew file mode 100644index 000000000..e75077d7c--- /dev/null+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Backtesting.cpp@@ -0,0 +1,479 @@+// src/screens/ai_quant_lab/QuantModulePanel_Backtesting.cpp+//+// Backtesting panel — Qlib-style strategy backtester with rich result display+// (KPI cards, equity curve chart, execution cost strip, JSON export). Extracted+// from QuantModulePanel.cpp to keep that file maintainable.+#include "screens/ai_quant_lab/QuantModulePanel.h"+#include "screens/ai_quant_lab/QuantModulePanel_Common.h"+#include "screens/ai_quant_lab/QuantModulePanel_GsHelpers.h"+#include "screens/ai_quant_lab/QuantModulePanel_Styles.h"++#include "core/logging/Logger.h"+#include "services/ai_quant_lab/AIQuantLabService.h"+#include "services/file_manager/FileManagerService.h"+#include "ui/theme/Theme.h"++#include <QAreaSeries>+#include <QBrush>+#include <QChart>+#include <QChartView>+#include <QColor>+#include <QComboBox>+#include <QDate>+#include <QDateEdit>+#include <QDateTime>+#include <QDateTimeAxis>+#include <QFile>+#include <QFileInfo>+#include <QFrame>+#include <QGridLayout>+#include <QHBoxLayout>+#include <QJsonArray>+#include <QJsonDocument>+#include <QJsonObject>+#include <QLabel>+#include <QLineEdit>+#include <QLineSeries>+#include <QList>+#include <QMargins>+#include <QPainter>+#include <QPen>+#include <QPushButton>+#include <QRegularExpression>+#include <QSpinBox>+#include <QString>+#include <QStringList>+#include <QValueAxis>+#include <QVBoxLayout>+#include <QWidget>++#include <algorithm>+#include <cmath>++namespace fincept::screens {++using namespace fincept::services::quant;+using namespace fincept::screens::quant_styles;+using namespace fincept::screens::quant_common;+using namespace fincept::screens::quant_gs_helpers;++// ═══════════════════════════════════════════════════════════════════════════════+// BACKTESTING PANEL+// ═══════════════════════════════════════════════════════════════════════════════++QWidget* QuantModulePanel::build_backtesting_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* strat = new QComboBox(w);+ strat->addItems({"topk_dropout", "weight_based", "enhanced_indexing"});+ strat->setStyleSheet(combo_ss());+ combo_inputs_["bt_strategy"] = strat;+ vl->addWidget(build_input_row("Strategy", strat, w));++ auto* instruments = new QLineEdit(w);+ instruments->setPlaceholderText("AAPL,MSFT,GOOG,AMZN");+ instruments->setStyleSheet(input_ss());+ text_inputs_["bt_instruments"] = instruments;+ vl->addWidget(build_input_row("Instruments", instruments, w));++ auto* start_date = new QDateEdit(QDate(2020, 1, 1), w);+ start_date->setDisplayFormat("yyyy-MM-dd");+ start_date->setCalendarPopup(true);+ start_date->setStyleSheet(input_ss());+ date_inputs_["bt_start"] = start_date;+ vl->addWidget(build_input_row("Start Date", start_date, w));++ auto* end_date = new QDateEdit(QDate(2024, 1, 1), w);+ end_date->setDisplayFormat("yyyy-MM-dd");+ end_date->setCalendarPopup(true);+ end_date->setStyleSheet(input_ss());+ date_inputs_["bt_end"] = end_date;+ vl->addWidget(build_input_row("End Date", end_date, w));++ auto* capital = make_double_spin(1000, 1e12, 1e6, 0, "", w);+ double_inputs_["bt_capital"] = capital;+ vl->addWidget(build_input_row("Initial Capital ($)", capital, w));++ auto* topk = new QSpinBox(w);+ topk->setRange(1, 100);+ topk->setValue(10);+ topk->setStyleSheet(spinbox_ss());+ int_inputs_["bt_topk"] = topk;+ vl->addWidget(build_input_row("Top K Positions", topk, w));++ auto* benchmark = new QLineEdit(w);+ benchmark->setPlaceholderText("SH000300 (CSI300)");+ benchmark->setStyleSheet(input_ss());+ text_inputs_["bt_benchmark"] = benchmark;+ vl->addWidget(build_input_row("Benchmark", benchmark, w));++ auto* run = make_run_button("RUN BACKTEST", w);+ connect(run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Backtesting...");+ QJsonObject params;+ QJsonObject strategy_config;+ strategy_config["type"] = combo_inputs_["bt_strategy"]->currentText();+ strategy_config["topk"] = int_inputs_["bt_topk"]->value();+ params["strategy_config"] = strategy_config;+ QJsonObject dataset;+ dataset["instruments"] = text_inputs_["bt_instruments"]->text();+ dataset["start_date"] = date_inputs_["bt_start"]->date().toString("yyyy-MM-dd");+ dataset["end_date"] = date_inputs_["bt_end"]->date().toString("yyyy-MM-dd");+ params["dataset_config"] = dataset;+ QJsonObject portfolio;+ portfolio["initial_capital"] = double_inputs_["bt_capital"]->value();+ portfolio["benchmark"] = text_inputs_["bt_benchmark"]->text();+ params["portfolio_config"] = portfolio;+ AIQuantLabService::instance().run_backtest(params);+ });+ vl->addWidget(run);++ auto* rc = new QWidget(w);+ results_layout_ = new QVBoxLayout(rc);+ results_layout_->setContentsMargins(0, 8, 0, 0);+ results_layout_->setSpacing(8);+ vl->addWidget(rc);+ vl->addStretch();++ return w;+}++// ── Backtest Result Display ───────────────────────────────────────────────────++void QuantModulePanel::display_backtest_result(const QJsonObject& payload) {+ clear_results();++ if (!payload["success"].toBool()) {+ display_error(payload["error"].toString("Unknown error"));+ return;+ }++ const QJsonObject metrics = payload["metrics"].toObject();+ const QJsonArray curve = payload["equity_curve"].toArray();+ const QJsonObject costs = payload["execution_cost_estimate"].toObject();+ const QStringList tickers = [&]() {+ QStringList t;+ for (const auto& v : payload["tickers"].toArray())+ t << v.toString();+ return t;+ }();++ const QString strategy = payload["strategy"].toString();+ const QString start_date = payload["start_date"].toString();+ const QString end_date = payload["end_date"].toString();++ const QColor accent = module_.color;+ const QString accent_hex = accent.name();+ const QString green_hex = ui::colors::POSITIVE();+ const QString red_hex = ui::colors::NEGATIVE();+ const QString text_p = ui::colors::TEXT_PRIMARY();+ const QString text_s = ui::colors::TEXT_SECONDARY();+ const QString text_t = ui::colors::TEXT_TERTIARY();+ const QString bg_surface = ui::colors::BG_SURFACE();+ const QString bg_raised = ui::colors::BG_RAISED();+ const QString border_dim = ui::colors::BORDER_DIM();+ const QString border_med = ui::colors::BORDER_MED();+ const QString font_data = ui::fonts::DATA_FAMILY;+ const int fs_sm = ui::fonts::SMALL;+ const int fs_lg = ui::fonts::HEADER;++ // ── 1. Header bar ──────────────────────────────────────────────────────+ auto* header_w = new QWidget;+ auto* header_h = new QHBoxLayout(header_w);+ header_h->setContentsMargins(0, 0, 0, 8);+ header_h->setSpacing(8);++ auto* title_lbl = new QLabel("BACKTEST RESULTS");+ title_lbl->setStyleSheet(+ QString("color:%1; font-size:%2px; font-family:%3; font-weight:800; letter-spacing:2px;")+ .arg(accent_hex).arg(fs_lg).arg(font_data));+ header_h->addWidget(title_lbl);++ header_h->addSpacing(16);++ auto make_chip = [&](const QString& text, const QString& fg, const QString& bg_hex) -> QLabel* {+ auto* c = new QLabel(text);+ c->setStyleSheet(+ QString("color:%1; background:%2; border-radius:3px; padding:2px 8px;"+ "font-size:%3px; font-family:%4; font-weight:600;")+ .arg(fg, bg_hex).arg(fs_sm).arg(font_data));+ return c;+ };++ QString strat_display = strategy;+ strat_display.replace('_', ' ');+ strat_display = strat_display.toUpper();+ header_h->addWidget(make_chip(strat_display, accent_hex,+ QColor(accent).darker(300).name() + "55"));++ header_h->addWidget(make_chip(start_date + " → " + end_date,+ text_s, bg_raised));++ for (const auto& t : tickers)+ header_h->addWidget(make_chip(t, text_p, bg_raised));++ header_h->addStretch();+ results_layout_->addWidget(header_w);++ // ── 2. KPI cards row ──────────────────────────────────────────────────+ struct KpiCard {+ QString label;+ QString value;+ QString sub;+ bool positive = true;+ bool neutral = false;+ };++ double total_ret = metrics["total_return_pct"].toDouble();+ double ann_ret = metrics["annualised_return"].toDouble();+ double ann_vol = metrics["annualised_vol"].toDouble();+ double sharpe = metrics["sharpe_ratio"].toDouble();+ double max_dd = metrics["max_drawdown_pct"].toDouble();+ double calmar = metrics["calmar_ratio"].toDouble();+ double win_rate = metrics["win_rate_pct"].toDouble();+ double final_val = metrics["final_value"].toDouble();+ double init_cap = metrics["initial_capital"].toDouble();+ int t_days = metrics["trading_days"].toInt();++ auto fmt_pct = [](double v) { return QString("%1%2%").arg(v >= 0 ? "+" : "").arg(v, 0, 'f', 2); };+ auto fmt_usd = [](double v) -> QString {+ if (v >= 1e6) return QString("$%1M").arg(v / 1e6, 0, 'f', 2);+ return QString("$%1K").arg(v / 1e3, 0, 'f', 0);+ };++ QList<KpiCard> kpis = {+ {"TOTAL RETURN", fmt_pct(total_ret), fmt_usd(final_val) + " final", total_ret >= 0, false},+ {"ANN. RETURN", fmt_pct(ann_ret), QString("Vol: %1%").arg(ann_vol, 0, 'f', 1), ann_ret >= 0, false},+ {"SHARPE RATIO", QString::number(sharpe, 'f', 3),+ sharpe >= 1 ? "Excellent" : sharpe >= 0.5 ? "Good" : "Weak", sharpe >= 0.5, false},+ {"MAX DRAWDOWN", fmt_pct(max_dd), QString("Calmar: %1").arg(calmar, 0, 'f', 3), false, false},+ {"WIN RATE", QString("%1%").arg(win_rate, 0, 'f', 1), QString("%1 days").arg(t_days), win_rate >= 50, false},+ {"CAPITAL", fmt_usd(init_cap), "Initial capital", true, true},+ };++ auto* cards_w = new QWidget;+ auto* cards_gl = new QGridLayout(cards_w);+ cards_gl->setContentsMargins(0, 0, 0, 0);+ cards_gl->setSpacing(8);++ for (int i = 0; i < kpis.size(); ++i) {+ const auto& k = kpis[i];+ auto* card = new QWidget;+ card->setObjectName("btKpiCard");+ card->setStyleSheet(+ QString("#btKpiCard { background:%1; border:1px solid %2; border-radius:4px; }")+ .arg(bg_surface, border_dim));++ auto* cl = new QVBoxLayout(card);+ cl->setContentsMargins(12, 10, 12, 10);+ cl->setSpacing(2);++ auto* lbl = new QLabel(k.label);+ lbl->setStyleSheet(+ QString("color:%1; font-size:%2px; font-family:%3; font-weight:600; letter-spacing:1px;")+ .arg(text_t).arg(fs_sm - 1).arg(font_data));++ QString val_color = k.neutral ? text_s : (k.positive ? green_hex : red_hex);+ auto* val = new QLabel(k.value);+ val->setStyleSheet(+ QString("color:%1; font-size:%2px; font-family:%3; font-weight:800;")+ .arg(val_color).arg(fs_lg + 2).arg(font_data));++ auto* sub = new QLabel(k.sub);+ sub->setStyleSheet(+ QString("color:%1; font-size:%2px; font-family:%3;")+ .arg(text_t).arg(fs_sm - 1).arg(font_data));++ cl->addWidget(lbl);+ cl->addWidget(val);+ cl->addWidget(sub);+ cards_gl->addWidget(card, i / 3, i % 3);+ }++ results_layout_->addWidget(cards_w);++ // ── 3. Equity curve chart ─────────────────────────────────────────────+ if (!curve.isEmpty()) {+ auto* port_series = new QLineSeries;+ auto* bm_series = new QLineSeries;+ auto* port_upper = new QLineSeries; // for area fill+ auto* port_base = new QLineSeries; // baseline for area++ port_series->setName("Portfolio");+ bm_series->setName("Benchmark");++ // Style lines+ QPen port_pen(accent);+ port_pen.setWidth(2);+ port_series->setPen(port_pen);++ {+ QString bm_col_str = QString(text_t);+ QPen bm_pen;+ bm_pen.setColor(::QColor(bm_col_str));+ bm_pen.setWidth(1);+ bm_pen.setStyle(Qt::DashLine);+ bm_series->setPen(bm_pen);+ }++ double min_val = 1e18, max_val = -1e18;++ for (const auto& pt_val : curve) {+ auto pt = pt_val.toObject();+ QDateTime dt = QDateTime::fromString(pt["date"].toString(), "yyyy-MM-dd");+ qint64 ms = dt.toMSecsSinceEpoch();+ double pv = pt["portfolio"].toDouble();+ double bv = pt["benchmark"].toDouble();+ port_series->append(ms, pv);+ bm_series->append(ms, bv);+ port_upper->append(ms, pv);+ port_base->append(ms, init_cap);+ min_val = std::min({min_val, pv, bv});+ max_val = std::max({max_val, pv, bv});+ }++ // Area series for portfolio fill+ auto* area = new QAreaSeries(port_upper, port_base);+ QColor fill_color = accent;+ fill_color.setAlpha(30);+ area->setBrush(fill_color);+ QPen area_pen(Qt::transparent);+ area->setPen(area_pen);++ auto* chart = new QChart;+ chart->addSeries(area);+ chart->addSeries(port_series);+ chart->addSeries(bm_series);+ chart->setBackgroundBrush(QBrush(QColor(QString(bg_surface))));+ chart->setBackgroundRoundness(0);+ chart->setMargins(QMargins(4, 4, 4, 4));+ chart->legend()->setLabelColor(QColor(QString(text_s)));+ chart->legend()->setAlignment(Qt::AlignTop);+ chart->setAnimationOptions(QChart::NoAnimation);+ chart->setTitle("");++ auto* x_axis = new QDateTimeAxis;+ x_axis->setFormat("MMM yy");+ x_axis->setLabelsColor(QColor(QString(text_t)));+ x_axis->setGridLineColor(QColor(QString(border_dim)));+ x_axis->setLinePen(QPen(QColor(QString(border_med))));+ chart->addAxis(x_axis, Qt::AlignBottom);++ auto* y_axis = new QValueAxis;+ double padding = (max_val - min_val) * 0.05;+ y_axis->setRange(min_val - padding, max_val + padding);+ y_axis->setLabelFormat("$%.0f");+ y_axis->setLabelsColor(QColor(QString(text_t)));+ y_axis->setGridLineColor(QColor(QString(border_dim)));+ y_axis->setLinePen(QPen(QColor(QString(border_med))));+ chart->addAxis(y_axis, Qt::AlignLeft);++ for (auto* s : chart->series()) {+ s->attachAxis(x_axis);+ s->attachAxis(y_axis);+ }++ auto* chart_view = new QChartView(chart);+ chart_view->setRenderHint(QPainter::Antialiasing);+ chart_view->setFixedHeight(280);+ chart_view->setStyleSheet(+ QString("background:%1; border:1px solid %2; border-radius:4px;")+ .arg(bg_surface, border_dim));++ // Chart title label above+ auto* chart_title = new QLabel("EQUITY CURVE");+ chart_title->setStyleSheet(+ QString("color:%1; font-size:%2px; font-family:%3; font-weight:700;"+ "letter-spacing:1px; padding:8px 0 2px 0;")+ .arg(text_s).arg(fs_sm).arg(font_data));+ results_layout_->addWidget(chart_title);+ results_layout_->addWidget(chart_view);+ }++ // ── 4. Execution cost strip ────────────────────────────────────────────+ auto* cost_w = new QWidget;+ cost_w->setStyleSheet(+ QString("background:%1; border:1px solid %2; border-radius:4px;")+ .arg(bg_surface, border_dim));+ auto* cost_h = new QHBoxLayout(cost_w);+ cost_h->setContentsMargins(16, 8, 16, 8);+ cost_h->setSpacing(24);++ auto add_cost_item = [&](const QString& lbl, const QString& val) {+ auto* w = new QWidget;+ auto* l = new QHBoxLayout(w);+ l->setContentsMargins(0, 0, 0, 0);+ l->setSpacing(6);+ auto* k = new QLabel(lbl);+ k->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")+ .arg(text_t).arg(fs_sm).arg(font_data));+ auto* v = new QLabel(val);+ v->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3; font-weight:700;")+ .arg(text_s).arg(fs_sm).arg(font_data));+ l->addWidget(k);+ l->addWidget(v);+ cost_h->addWidget(w);+ };++ auto* cost_hdr = new QLabel("EXECUTION COSTS");+ cost_hdr->setStyleSheet(+ QString("color:%1; font-size:%2px; font-family:%3; font-weight:700; letter-spacing:1px;")+ .arg(text_t).arg(fs_sm - 1).arg(font_data));+ cost_h->addWidget(cost_hdr);+ cost_h->addWidget([&]() {+ auto* sep = new QFrame;+ sep->setFrameShape(QFrame::VLine);+ sep->setStyleSheet(QString("color:%1;").arg(border_dim));+ return sep;+ }());++ add_cost_item("Commission",+ QString("%1 bps").arg(costs["commission_bps"].toDouble(), 0, 'f', 2));+ add_cost_item("Expected Slippage",+ QString("%1 bps").arg(costs["expected_slippage_bps"].toDouble(), 0, 'f', 2));+ cost_h->addStretch();+ results_layout_->addWidget(cost_w);++ // ── 5. Export button ───────────────────────────────────────────────────+ auto* export_btn = new QPushButton("EXPORT JSON");+ export_btn->setCursor(Qt::PointingHandCursor);+ export_btn->setFixedHeight(28);+ export_btn->setStyleSheet(+ QString("QPushButton { background:transparent; color:%1; border:1px solid %2;"+ "font-size:%3px; font-family:%4; padding:0 14px; border-radius:3px; }"+ "QPushButton:hover { background:rgba(255,255,255,0.05); }")+ .arg(accent_hex, border_dim).arg(fs_sm).arg(font_data));++ QString json_str = QJsonDocument(payload).toJson(QJsonDocument::Indented);+ connect(export_btn, &QPushButton::clicked, this, [this, json_str]() {+ QString safe = module_.label;+ safe.replace(QRegularExpression("[^a-zA-Z0-9_\\-]"), "_");+ QString fname = safe + "_" + QString::number(QDateTime::currentMSecsSinceEpoch()) + ".json";+ QString dest = services::FileManagerService::instance().storage_dir() + "/" + fname;+ QFile f(dest);+ if (f.open(QIODevice::WriteOnly | QIODevice::Text)) {+ f.write(json_str.toUtf8());+ f.close();+ services::FileManagerService::instance().register_file(+ fname, module_.label + "_backtest.json", QFileInfo(dest).size(),+ "application/json", "ai_quant_lab");+ LOG_INFO("AIQuantLab", "Backtest exported: " + fname);+ }+ });++ auto* export_row = new QWidget;+ auto* export_hl = new QHBoxLayout(export_row);+ export_hl->setContentsMargins(0, 4, 0, 0);+ export_hl->addStretch();+ export_hl->addWidget(export_btn);+ results_layout_->addWidget(export_row);++ status_label_->setText(QString("Done — %1% return | Sharpe %2")+ .arg(total_ret, 0, 'f', 2)+ .arg(sharpe, 0, 'f', 3));+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_CFA.cpp b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_CFA.cppnew file mode 100644index 000000000..85e4a8f0e--- /dev/null+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_CFA.cpp@@ -0,0 +1,639 @@+// src/screens/ai_quant_lab/QuantModulePanel_CFA.cpp+//+// CFA Quant panel — 8 analysis types. Extracted from QuantModulePanel.cpp to+// keep that file maintainable.+#include "screens/ai_quant_lab/QuantModulePanel.h"+#include "screens/ai_quant_lab/QuantModulePanel_Common.h"+#include "screens/ai_quant_lab/QuantModulePanel_GsHelpers.h"+#include "screens/ai_quant_lab/QuantModulePanel_Styles.h"++#include "core/logging/Logger.h"+#include "services/ai_quant_lab/AIQuantLabService.h"+#include "services/file_manager/FileManagerService.h"+#include "ui/theme/Theme.h"++#include <QAbstractItemView>+#include <QComboBox>+#include <QDateTime>+#include <QFile>+#include <QFileInfo>+#include <QHash>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QJsonArray>+#include <QJsonDocument>+#include <QJsonObject>+#include <QJsonValue>+#include <QLabel>+#include <QLineEdit>+#include <QList>+#include <QPushButton>+#include <QRegularExpression>+#include <QSpinBox>+#include <QStackedWidget>+#include <QString>+#include <QStringList>+#include <QTableWidget>+#include <QTableWidgetItem>+#include <QTextEdit>+#include <QVBoxLayout>+#include <QWidget>++#include <cmath>+#include <initializer_list>++namespace fincept::screens {++using namespace fincept::services::quant;+using namespace fincept::screens::quant_styles;+using namespace fincept::screens::quant_common;+using namespace fincept::screens::quant_gs_helpers;++// ═══════════════════════════════════════════════════════════════════════════════+// CFA QUANT PANEL — 8 analysis types+// ═══════════════════════════════════════════════════════════════════════════════++QWidget* QuantModulePanel::build_cfa_quant_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ // ── Section header ──────────────────────────────────────────────────────+ auto* data_lbl = new QLabel("DATA INPUT", w);+ data_lbl->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2;"+ "letter-spacing:1px;")+ .arg(module_.color.name())+ .arg(ui::fonts::DATA_FAMILY));+ vl->addWidget(data_lbl);++ // ── Symbol / data input ─────────────────────────────────────────────────+ auto* symbol = new QLineEdit(w);+ symbol->setPlaceholderText("Ticker (AAPL, ^GSPC, BTC-USD) or comma-separated values");+ symbol->setStyleSheet(input_ss());+ symbol->setText("AAPL");+ text_inputs_["cfa_symbol"] = symbol;+ vl->addWidget(build_input_row("Symbol / Data", symbol, w));++ // Period / interval / column for ticker fetches+ auto* period = new QComboBox(w);+ period->addItems({"1mo", "3mo", "6mo", "1y", "2y", "5y", "10y", "max"});+ period->setCurrentText("1y");+ period->setStyleSheet(combo_ss());+ combo_inputs_["cfa_period"] = period;+ vl->addWidget(build_input_row("Period (ticker only)", period, w));++ auto* interval = new QComboBox(w);+ interval->addItems({"1d", "1wk", "1mo"});+ interval->setStyleSheet(combo_ss());+ combo_inputs_["cfa_interval"] = interval;+ vl->addWidget(build_input_row("Interval (ticker only)", interval, w));++ // ── Analysis selector ───────────────────────────────────────────────────+ auto* analysis_type = new QComboBox(w);+ const QStringList analyses = {+ "trend_analysis", "stationarity_test", "arima_model", "forecasting",+ "supervised_learning", "unsupervised_learning", "model_evaluation",+ "resampling_methods", "sampling_techniques", "central_limit_theorem",+ "sampling_error_analysis", "validate_data",+ };+ analysis_type->addItems(analyses);+ analysis_type->setStyleSheet(combo_ss());+ combo_inputs_["cfa_analysis"] = analysis_type;+ vl->addWidget(build_input_row("Analysis Type", analysis_type, w));++ // ── Per-analysis parameter stack ────────────────────────────────────────+ auto* params_lbl = new QLabel("ANALYSIS PARAMETERS", w);+ params_lbl->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2;"+ "letter-spacing:1px; margin-top:8px;")+ .arg(module_.color.name())+ .arg(ui::fonts::DATA_FAMILY));+ vl->addWidget(params_lbl);++ auto* stack = new QStackedWidget(w);+ auto add_page = [&](std::initializer_list<QWidget*> rows) {+ auto* page = new QWidget(stack);+ auto* pv = new QVBoxLayout(page);+ pv->setContentsMargins(0, 0, 0, 0);+ pv->setSpacing(6);+ for (auto* r : rows)+ pv->addWidget(r);+ pv->addStretch();+ stack->addWidget(page);+ return page;+ };++ // 0: trend_analysis — trend_type+ {+ auto* t = new QComboBox(stack);+ t->addItems({"linear", "log_linear"});+ t->setStyleSheet(combo_ss());+ combo_inputs_["cfa_trend_type"] = t;+ add_page({build_input_row("Trend Type", t, stack)});+ }+ // 1: stationarity_test — test_type+ {+ auto* t = new QComboBox(stack);+ t->addItems({"adf", "kpss"});+ t->setStyleSheet(combo_ss());+ combo_inputs_["cfa_stationarity_test"] = t;+ add_page({build_input_row("Test Type", t, stack)});+ }+ // 2: arima_model — order p,d,q + optional seasonal+ {+ auto* p = new QSpinBox(stack);+ p->setRange(0, 10);+ p->setValue(1);+ p->setStyleSheet(spinbox_ss());+ int_inputs_["cfa_arima_p"] = p;+ auto* d = new QSpinBox(stack);+ d->setRange(0, 3);+ d->setValue(0);+ d->setStyleSheet(spinbox_ss());+ int_inputs_["cfa_arima_d"] = d;+ auto* q = new QSpinBox(stack);+ q->setRange(0, 10);+ q->setValue(1);+ q->setStyleSheet(spinbox_ss());+ int_inputs_["cfa_arima_q"] = q;+ add_page({+ build_input_row("AR order (p)", p, stack),+ build_input_row("Differencing (d)", d, stack),+ build_input_row("MA order (q)", q, stack),+ });+ }+ // 3: forecasting — horizon, method, train_size+ {+ auto* h = new QSpinBox(stack);+ h->setRange(1, 252);+ h->setValue(5);+ h->setStyleSheet(spinbox_ss());+ int_inputs_["cfa_forecast_horizon"] = h;+ auto* m = new QComboBox(stack);+ m->addItems({"simple_exponential", "holt", "holt_winters", "arima", "naive", "drift"});+ m->setStyleSheet(combo_ss());+ combo_inputs_["cfa_forecast_method"] = m;+ auto* ts = make_double_spin(0.5, 0.95, 0.8, 2, "", stack);+ double_inputs_["cfa_forecast_train_size"] = ts;+ add_page({+ build_input_row("Horizon (steps)", h, stack),+ build_input_row("Method", m, stack),+ build_input_row("Train Size", ts, stack),+ });+ }+ // 4: supervised_learning — n_lags, problem_type, algorithms+ {+ auto* lags = new QSpinBox(stack);+ lags->setRange(1, 50);+ lags->setValue(5);+ lags->setStyleSheet(spinbox_ss());+ int_inputs_["cfa_sup_lags"] = lags;+ auto* pt = new QComboBox(stack);+ pt->addItems({"regression", "classification"});+ pt->setStyleSheet(combo_ss());+ combo_inputs_["cfa_sup_problem"] = pt;+ auto* algos = new QLineEdit(stack);+ algos->setText("ridge,random_forest");+ algos->setPlaceholderText("comma-separated: ridge,lasso,random_forest,svr,knn");+ algos->setStyleSheet(input_ss());+ text_inputs_["cfa_sup_algorithms"] = algos;+ add_page({+ build_input_row("Lag features (n_lags)", lags, stack),+ build_input_row("Problem Type", pt, stack),+ build_input_row("Algorithms", algos, stack),+ });+ }+ // 5: unsupervised_learning — n_lags, methods+ {+ auto* lags = new QSpinBox(stack);+ lags->setRange(1, 50);+ lags->setValue(5);+ lags->setStyleSheet(spinbox_ss());+ int_inputs_["cfa_unsup_lags"] = lags;+ auto* methods = new QLineEdit(stack);+ methods->setText("pca,kmeans");+ methods->setPlaceholderText("comma-separated: pca,kmeans,agglomerative");+ methods->setStyleSheet(input_ss());+ text_inputs_["cfa_unsup_methods"] = methods;+ add_page({+ build_input_row("Lag features (n_lags)", lags, stack),+ build_input_row("Methods", methods, stack),+ });+ }+ // 6: model_evaluation — n_lags, model_type, cv_folds+ {+ auto* lags = new QSpinBox(stack);+ lags->setRange(1, 50);+ lags->setValue(5);+ lags->setStyleSheet(spinbox_ss());+ int_inputs_["cfa_eval_lags"] = lags;+ auto* mt = new QComboBox(stack);+ mt->addItems({"random_forest", "ridge", "lasso", "svr", "knn", "decision_tree"});+ mt->setStyleSheet(combo_ss());+ combo_inputs_["cfa_eval_model"] = mt;+ auto* cv = new QSpinBox(stack);+ cv->setRange(2, 20);+ cv->setValue(5);+ cv->setStyleSheet(spinbox_ss());+ int_inputs_["cfa_eval_cv"] = cv;+ add_page({+ build_input_row("Lag features (n_lags)", lags, stack),+ build_input_row("Model Type", mt, stack),+ build_input_row("CV Folds", cv, stack),+ });+ }+ // 7: resampling_methods — methods, n_resamples+ {+ auto* m = new QLineEdit(stack);+ m->setText("bootstrap,jackknife");+ m->setPlaceholderText("comma-separated: bootstrap,jackknife,permutation");+ m->setStyleSheet(input_ss());+ text_inputs_["cfa_resample_methods"] = m;+ auto* n = new QSpinBox(stack);+ n->setRange(50, 100000);+ n->setValue(1000);+ n->setStyleSheet(spinbox_ss());+ int_inputs_["cfa_resample_n"] = n;+ add_page({+ build_input_row("Methods", m, stack),+ build_input_row("Resamples", n, stack),+ });+ }+ // 8: sampling_techniques — sample_size, methods (population uses Symbol/Data)+ {+ auto* size = new QSpinBox(stack);+ size->setRange(10, 100000);+ size->setValue(100);+ size->setStyleSheet(spinbox_ss());+ int_inputs_["cfa_sampling_size"] = size;+ auto* m = new QLineEdit(stack);+ m->setText("simple,stratified,systematic");+ m->setStyleSheet(input_ss());+ text_inputs_["cfa_sampling_methods"] = m;+ add_page({+ build_input_row("Sample Size", size, stack),+ build_input_row("Methods", m, stack),+ });+ }+ // 9: central_limit_theorem — distribution, sample_sizes, n_samples+ {+ auto* dist = new QComboBox(stack);+ dist->addItems({"exponential", "uniform", "normal", "poisson", "binomial"});+ dist->setStyleSheet(combo_ss());+ combo_inputs_["cfa_clt_dist"] = dist;+ auto* sizes = new QLineEdit(stack);+ sizes->setText("5,10,30,100");+ sizes->setStyleSheet(input_ss());+ text_inputs_["cfa_clt_sizes"] = sizes;+ auto* n = new QSpinBox(stack);+ n->setRange(100, 100000);+ n->setValue(1000);+ n->setStyleSheet(spinbox_ss());+ int_inputs_["cfa_clt_n"] = n;+ add_page({+ build_input_row("Distribution", dist, stack),+ build_input_row("Sample Sizes", sizes, stack),+ build_input_row("Samples per size", n, stack),+ });+ }+ // 10: sampling_error_analysis — pop_mean, pop_std, sample_sizes, conf, n_sims+ {+ auto* mean = make_double_spin(-1e6, 1e6, 0.0, 4, "", stack);+ double_inputs_["cfa_serr_mean"] = mean;+ auto* sd = make_double_spin(0.0001, 1e6, 1.0, 4, "", stack);+ double_inputs_["cfa_serr_std"] = sd;+ auto* sizes = new QLineEdit(stack);+ sizes->setText("10,30,50,100,500");+ sizes->setStyleSheet(input_ss());+ text_inputs_["cfa_serr_sizes"] = sizes;+ auto* conf = make_double_spin(0.5, 0.999, 0.95, 3, "", stack);+ double_inputs_["cfa_serr_conf"] = conf;+ auto* sims = new QSpinBox(stack);+ sims->setRange(100, 100000);+ sims->setValue(1000);+ sims->setStyleSheet(spinbox_ss());+ int_inputs_["cfa_serr_sims"] = sims;+ add_page({+ build_input_row("Population Mean", mean, stack),+ build_input_row("Population Std", sd, stack),+ build_input_row("Sample Sizes", sizes, stack),+ build_input_row("Confidence Level", conf, stack),+ build_input_row("Simulations", sims, stack),+ });+ }+ // 11: validate_data — data_type, data_name+ {+ auto* dt = new QComboBox(stack);+ dt->addItems({"general", "returns", "prices", "rates"});+ dt->setStyleSheet(combo_ss());+ combo_inputs_["cfa_validate_type"] = dt;+ auto* dn = new QLineEdit(stack);+ dn->setText("data");+ dn->setStyleSheet(input_ss());+ text_inputs_["cfa_validate_name"] = dn;+ add_page({+ build_input_row("Data Type", dt, stack),+ build_input_row("Data Name", dn, stack),+ });+ }++ vl->addWidget(stack);++ // Switch stack page when analysis combo changes+ connect(analysis_type, qOverload<int>(&QComboBox::currentIndexChanged), stack,+ &QStackedWidget::setCurrentIndex);++ // ── Run button ──────────────────────────────────────────────────────────+ auto* run = make_run_button("RUN ANALYSIS", w);+ connect(run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Running...");+ const QString cmd = combo_inputs_["cfa_analysis"]->currentText();+ const QString raw = text_inputs_["cfa_symbol"]->text().trimmed();++ QJsonObject params;+ params["period"] = combo_inputs_["cfa_period"]->currentText();+ params["interval"] = combo_inputs_["cfa_interval"]->currentText();++ // Sample-error analysis is the only command that doesn't read from "data".+ // Everything else reads from "data" (or "population" for sampling_techniques).+ const bool needs_data = (cmd != "sampling_error_analysis" &&+ cmd != "central_limit_theorem");+ if (needs_data && raw.isEmpty()) {+ display_error("Please enter a ticker symbol or comma-separated values");+ status_label_->setText("Error");+ return;+ }+ if (cmd == "sampling_techniques")+ params["population"] = raw;+ else if (needs_data)+ params["data"] = raw;++ auto split_csv = [](const QString& s) {+ QJsonArray arr;+ for (const auto& part : s.split(',', Qt::SkipEmptyParts))+ arr.append(part.trimmed());+ return arr;+ };+ auto split_csv_int = [](const QString& s) {+ QJsonArray arr;+ for (const auto& part : s.split(',', Qt::SkipEmptyParts)) {+ bool ok = false;+ int v = part.trimmed().toInt(&ok);+ if (ok) arr.append(v);+ }+ return arr;+ };++ if (cmd == "trend_analysis") {+ params["trend_type"] = combo_inputs_["cfa_trend_type"]->currentText();+ } else if (cmd == "stationarity_test") {+ params["test_type"] = combo_inputs_["cfa_stationarity_test"]->currentText();+ } else if (cmd == "arima_model") {+ QJsonArray order;+ order.append(int_inputs_["cfa_arima_p"]->value());+ order.append(int_inputs_["cfa_arima_d"]->value());+ order.append(int_inputs_["cfa_arima_q"]->value());+ params["order"] = order;+ } else if (cmd == "forecasting") {+ params["horizon"] = int_inputs_["cfa_forecast_horizon"]->value();+ params["method"] = combo_inputs_["cfa_forecast_method"]->currentText();+ params["train_size"] = double_inputs_["cfa_forecast_train_size"]->value();+ } else if (cmd == "supervised_learning") {+ params["n_lags"] = int_inputs_["cfa_sup_lags"]->value();+ params["problem_type"] = combo_inputs_["cfa_sup_problem"]->currentText();+ params["algorithms"] = split_csv(text_inputs_["cfa_sup_algorithms"]->text());+ } else if (cmd == "unsupervised_learning") {+ params["n_lags"] = int_inputs_["cfa_unsup_lags"]->value();+ params["methods"] = split_csv(text_inputs_["cfa_unsup_methods"]->text());+ } else if (cmd == "model_evaluation") {+ params["n_lags"] = int_inputs_["cfa_eval_lags"]->value();+ params["model_type"] = combo_inputs_["cfa_eval_model"]->currentText();+ params["cv_folds"] = int_inputs_["cfa_eval_cv"]->value();+ } else if (cmd == "resampling_methods") {+ params["methods"] = split_csv(text_inputs_["cfa_resample_methods"]->text());+ params["n_resamples"] = int_inputs_["cfa_resample_n"]->value();+ } else if (cmd == "sampling_techniques") {+ params["sample_size"] = int_inputs_["cfa_sampling_size"]->value();+ params["sampling_methods"] = split_csv(text_inputs_["cfa_sampling_methods"]->text());+ } else if (cmd == "central_limit_theorem") {+ params["population_dist"] = combo_inputs_["cfa_clt_dist"]->currentText();+ params["sample_sizes"] = split_csv_int(text_inputs_["cfa_clt_sizes"]->text());+ params["n_samples"] = int_inputs_["cfa_clt_n"]->value();+ } else if (cmd == "sampling_error_analysis") {+ params["population_mean"] = double_inputs_["cfa_serr_mean"]->value();+ params["population_std"] = double_inputs_["cfa_serr_std"]->value();+ params["sample_sizes"] = split_csv_int(text_inputs_["cfa_serr_sizes"]->text());+ params["confidence_level"] = double_inputs_["cfa_serr_conf"]->value();+ params["n_simulations"] = int_inputs_["cfa_serr_sims"]->value();+ } else if (cmd == "validate_data") {+ params["data_type"] = combo_inputs_["cfa_validate_type"]->currentText();+ params["data_name"] = text_inputs_["cfa_validate_name"]->text();+ }++ AIQuantLabService::instance().run_module("cfa_quant", cmd, params);+ });+ vl->addWidget(run);++ // ── Results container ───────────────────────────────────────────────────+ auto* rc = new QWidget(w);+ results_layout_ = new QVBoxLayout(rc);+ results_layout_->setContentsMargins(0, 8, 0, 0);+ results_layout_->setSpacing(8);+ vl->addWidget(rc);+ vl->addStretch();++ return w;+}++// ── CFA Quant Result Display ───────────────────────────────────────────────+//+// CFA Python returns a uniform shape:+// { success, analysis_type,+// result: { value, method, parameters, metadata, calculation_time, timestamp, calculator } }+//+// validate_data is the exception: result is a DataQualityReport.to_dict() with+// quality_score, issues, warnings, statistics, recommendations.+//+// We render flat scalars in result.value + result.metadata as a metrics table,+// surface the analysis method/calc-time as a header line, and keep the raw JSON+// + export button for inspection.++namespace {++void cfa_flatten_scalars(const QJsonObject& obj, const QString& prefix, QStringList& keys,+ QHash<QString, QJsonValue>& out) {+ for (auto it = obj.begin(); it != obj.end(); ++it) {+ const auto& v = it.value();+ const QString key = prefix.isEmpty() ? it.key() : prefix + "." + it.key();+ if (v.isObject()) {+ // Recurse one level deep so nested {slope, intercept} flattens nicely;+ // skip very deep / array-heavy fields (parameters.data, fitted_values).+ if (key.endsWith(".data") || key.endsWith(".fitted_values") ||+ key.endsWith(".residuals") || key.endsWith(".model_summary"))+ continue;+ cfa_flatten_scalars(v.toObject(), key, keys, out);+ } else if (!v.isArray()) {+ keys.append(key);+ out.insert(key, v);+ }+ }+}++} // namespace++void QuantModulePanel::display_cfa_result(const QString& command, const QJsonObject& payload) {+ clear_results();++ if (!payload.value("success").toBool()) {+ display_error(payload.value("error").toString("Unknown error"));+ return;+ }++ const QJsonObject result = payload.value("result").toObject();+ const QString method = result.value("method").toString();+ const double calc_time = result.value("calculation_time").toDouble();+ const QString analysis_type = payload.value("analysis_type").toString(command);++ // ── Header ──────────────────────────────────────────────────────────────+ auto* header = new QLabel(QString("%1 • %2 • %3 ms")+ .arg(analysis_type.toUpper())+ .arg(method)+ .arg(QString::number(calc_time * 1000.0, 'f', 1)));+ header->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2; letter-spacing:1px;")+ .arg(module_.color.name())+ .arg(ui::fonts::DATA_FAMILY));+ results_layout_->addWidget(header);++ // ── validate_data has its own report shape ──────────────────────────────+ if (command == "validate_data") {+ const double score = result.value("quality_score").toDouble();+ auto* score_lbl = new QLabel(QString("Quality Score: %1 / 100").arg(score, 0, 'f', 1));+ score_lbl->setStyleSheet(QString("color:%1; font-size:16px; font-weight:700;")+ .arg(score >= 80 ? ui::colors::POSITIVE()+ : score >= 50 ? ui::colors::WARNING()+ : ui::colors::NEGATIVE()));+ results_layout_->addWidget(score_lbl);++ const auto issues = result.value("issues").toArray();+ const auto warnings = result.value("warnings").toArray();+ const auto recs = result.value("recommendations").toArray();++ auto add_section = [this](const QString& title, const QJsonArray& items, bool issue_shape) {+ if (items.isEmpty())+ return;+ auto* lbl = new QLabel(QString("%1 (%2)").arg(title).arg(items.size()));+ lbl->setStyleSheet(QString("color:%1; font-weight:700; margin-top:6px;")+ .arg(ui::colors::TEXT_PRIMARY()));+ results_layout_->addWidget(lbl);+ for (const auto& v : items) {+ QString text;+ if (issue_shape) {+ auto o = v.toObject();+ text = QString("[%1] %2: %3")+ .arg(o.value("severity").toString(),+ o.value("type").toString(),+ o.value("description").toString(o.value("message").toString()));+ } else {+ text = "• " + v.toString();+ }+ auto* item = new QLabel(text);+ item->setWordWrap(true);+ item->setStyleSheet(QString("color:%1; padding:2px 0;").arg(ui::colors::TEXT_SECONDARY()));+ results_layout_->addWidget(item);+ }+ };+ add_section("Issues", issues, true);+ add_section("Warnings", warnings, true);+ add_section("Recommendations", recs, false);+ } else {+ // ── Standard analyses: flatten value + metadata into a metrics table ──+ QStringList keys;+ QHash<QString, QJsonValue> kv;+ const QJsonObject value_obj = result.value("value").toObject();+ const QJsonObject meta_obj = result.value("metadata").toObject();++ // value can also be a scalar (e.g. forecasting → array, but value can be number)+ const QJsonValue value_raw = result.value("value");+ if (value_obj.isEmpty() && !value_raw.isNull() && !value_raw.isObject() && !value_raw.isArray()) {+ keys.append("value");+ kv.insert("value", value_raw);+ } else {+ cfa_flatten_scalars(value_obj, "value", keys, kv);+ }+ cfa_flatten_scalars(meta_obj, "metadata", keys, kv);++ if (!keys.isEmpty()) {+ auto* table = new QTableWidget(keys.size(), 2);+ table->setHorizontalHeaderLabels({"Metric", "Value"});+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->setAlternatingRowColors(true);+ table->horizontalHeader()->setStretchLastSection(true);+ table->verticalHeader()->setVisible(false);+ table->setMaximumHeight(qMin(keys.size() * 28 + 32, 480));+ table->setStyleSheet(table_ss());+ for (int r = 0; r < keys.size(); ++r) {+ QString label = keys[r];+ label.replace('_', ' ');+ table->setItem(r, 0, new QTableWidgetItem(label.toUpper()));+ auto* vi = new QTableWidgetItem(format_val(kv.value(keys[r])));+ vi->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(r, 1, vi);+ }+ table->resizeColumnsToContents();+ results_layout_->addWidget(table);+ }++ // For forecasting the value is an array of forecast values — show inline+ if (value_raw.isArray()) {+ const auto arr = value_raw.toArray();+ QStringList parts;+ parts.reserve(arr.size());+ for (const auto& v : arr)+ parts << QString::number(v.toDouble(), 'f', 4);+ auto* fcst = new QLabel(QString("Forecast (%1 steps): %2").arg(arr.size()).arg(parts.join(", ")));+ fcst->setWordWrap(true);+ fcst->setStyleSheet(QString("color:%1; padding:6px 0;").arg(ui::colors::TEXT_PRIMARY()));+ results_layout_->addWidget(fcst);+ }+ }++ // ── Raw JSON viewer ─────────────────────────────────────────────────────+ auto* raw = new QTextEdit;+ raw->setReadOnly(true);+ raw->setMaximumHeight(220);+ raw->setPlainText(QJsonDocument(payload).toJson(QJsonDocument::Indented));+ raw->setStyleSheet(output_ss());+ results_layout_->addWidget(raw);++ // ── Export button ───────────────────────────────────────────────────────+ auto* export_btn = new QPushButton("EXPORT RESULTS");+ export_btn->setCursor(Qt::PointingHandCursor);+ export_btn->setFixedHeight(28);+ export_btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %2; "+ "font-size:%3px; font-family:%4; padding:0 12px; }"+ "QPushButton:hover { color:%1; background:rgba(255,255,255,0.05); }")+ .arg(module_.color.name(), ui::colors::BORDER_DIM())+ .arg(ui::fonts::SMALL)+ .arg(ui::fonts::DATA_FAMILY));+ const QString json_str = QJsonDocument(payload).toJson(QJsonDocument::Indented);+ connect(export_btn, &QPushButton::clicked, this, [this, json_str, command]() {+ QString safe_name = module_.label + "_" + command;+ safe_name.replace(QRegularExpression("[^a-zA-Z0-9_\\-]"), "_");+ const QString stored_name = safe_name + "_" + QString::number(QDateTime::currentMSecsSinceEpoch()) + ".json";+ const QString dest = services::FileManagerService::instance().storage_dir() + "/" + stored_name;+ QFile f(dest);+ if (f.open(QIODevice::WriteOnly | QIODevice::Text)) {+ f.write(json_str.toUtf8());+ f.close();+ services::FileManagerService::instance().register_file(stored_name, module_.label + "_" + command + ".json",+ QFileInfo(dest).size(), "application/json",+ "ai_quant_lab");+ LOG_INFO("AIQuantLab", "Exported result: " + stored_name);+ }+ });+ results_layout_->addWidget(export_btn);++ status_label_->setText("Done");+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Common.h b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Common.hnew file mode 100644index 000000000..4d7408e51--- /dev/null+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Common.h@@ -0,0 +1,107 @@+// src/screens/ai_quant_lab/QuantModulePanel_Common.h+//+// Private header — included only by QuantModulePanel*.cpp translation units.+// Provides cross-panel helpers that were originally in file-static anonymous+// namespaces inside QuantModulePanel.cpp. Several panel families (GS Quant,+// Functime, Statsmodels, Fortitudo, Gluonts, Quant Reporting) share the same+// numeric-input parsing and synthetic-sample generators, so they live here.+#pragma once++#include <QJsonArray>+#include <QRegularExpression>+#include <QString>+#include <QStringList>++#include <cmath>++namespace fincept::screens::quant_common {++// Parse a CSV / whitespace / newline string into a JSON array of doubles.+// Returns false on any non-numeric token (sets bad_token to the offender).+inline bool parse_doubles(const QString& text, QJsonArray& out, QString* bad_token = nullptr) {+ out = QJsonArray{};+ QString s = text;+ static const QRegularExpression seps(R"([,;\t\n\r])");+ s.replace(seps, " ");+ const QStringList parts = s.split(' ', Qt::SkipEmptyParts);+ bool ok = false;+ for (const QString& p : parts) {+ const double v = p.toDouble(&ok);+ if (!ok) {+ if (bad_token) *bad_token = p;+ return false;+ }+ out.append(v);+ }+ return true;+}++// Generate a small synthetic returns sample so the user can try the panel+// without typing 252 numbers. Produces ~1y of plausible daily returns.+inline QString sample_returns(unsigned seed = 1, int n = 252, double mu = 0.0005,+ double sigma = 0.012) {+ quint32 state = seed ? seed : 1u;+ auto rand01 = [&]() -> double {+ state = state * 1664525u + 1013904223u;+ return double(state >> 8) / double(1u << 24);+ };+ QStringList out;+ out.reserve(n);+ for (int i = 0; i < n; ++i) {+ const double u1 = std::max(rand01(), 1e-12);+ const double u2 = rand01();+ constexpr double kTwoPi = 6.283185307179586;+ const double z = std::sqrt(-2.0 * std::log(u1)) * std::cos(kTwoPi * u2);+ out << QString::number(mu + sigma * z, 'f', 6);+ }+ return out.join(',');+}++// Synthetic time series sample with trend + seasonality + noise.+// Useful for the LOAD SAMPLE buttons on the Functime / Statsmodels / Gluonts panels.+inline QString sample_series(unsigned seed = 1, int n = 200, double base = 50.0,+ double trend_per_step = 0.05, double season_amp = 5.0,+ int season_period = 30, double noise_sigma = 1.5) {+ quint32 state = seed ? seed : 1u;+ auto rand01 = [&]() -> double {+ state = state * 1664525u + 1013904223u;+ return double(state >> 8) / double(1u << 24);+ };+ QStringList out;+ out.reserve(n);+ for (int i = 0; i < n; ++i) {+ const double u1 = std::max(rand01(), 1e-12);+ const double u2 = rand01();+ constexpr double kTwoPi = 6.283185307179586;+ const double z = std::sqrt(-2.0 * std::log(u1)) * std::cos(kTwoPi * u2);+ const double v = base + trend_per_step * i ++ season_amp * std::sin(kTwoPi * double(i) / double(std::max(2, season_period))) ++ noise_sigma * z;+ out << QString::number(v, 'f', 4);+ }+ return out.join(',');+}++// Trending random walk — useful for stationarity testing where d=1 should win.+inline QString sample_random_walk(unsigned seed = 1, int n = 150, double drift = 0.05,+ double sigma = 1.0) {+ quint32 state = seed ? seed : 1u;+ auto rand01 = [&]() -> double {+ state = state * 1664525u + 1013904223u;+ return double(state >> 8) / double(1u << 24);+ };+ QStringList out;+ out.reserve(n);+ double level = 0.0;+ for (int i = 0; i < n; ++i) {+ const double u1 = std::max(rand01(), 1e-12);+ const double u2 = rand01();+ constexpr double kTwoPi = 6.283185307179586;+ const double z = std::sqrt(-2.0 * std::log(u1)) * std::cos(kTwoPi * u2);+ level += drift + sigma * z;+ out << QString::number(level, 'f', 4);+ }+ return out.join(',');+}++} // namespace fincept::screens::quant_commondiff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_DeepAgent.cpp b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_DeepAgent.cppnew file mode 100644index 000000000..44cc5ddc3--- /dev/null+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_DeepAgent.cpp@@ -0,0 +1,563 @@+// src/screens/ai_quant_lab/QuantModulePanel_DeepAgent.cpp+//+// Deep Agent panel — tabbed: LangGraph Deep Analysis + RD-Agent Research.+// Extracted from QuantModulePanel.cpp to keep that file maintainable.+#include "screens/ai_quant_lab/QuantModulePanel.h"+#include "screens/ai_quant_lab/QuantModulePanel_Common.h"+#include "screens/ai_quant_lab/QuantModulePanel_GsHelpers.h"+#include "screens/ai_quant_lab/QuantModulePanel_Styles.h"++#include "services/ai_quant_lab/AIQuantLabService.h"+#include "ui/theme/Theme.h"++#include <QAbstractItemView>+#include <QComboBox>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QJsonObject>+#include <QLabel>+#include <QLineEdit>+#include <QPushButton>+#include <QSpinBox>+#include <QString>+#include <QTabWidget>+#include <QTableWidget>+#include <QTextEdit>+#include <QVBoxLayout>+#include <QWidget>++namespace fincept::screens {++using namespace fincept::services::quant;+using namespace fincept::screens::quant_styles;+using namespace fincept::screens::quant_common;+using namespace fincept::screens::quant_gs_helpers;++// ═══════════════════════════════════════════════════════════════════════════════+// ═══════════════════════════════════════════════════════════════════════════════+// DEEP AGENT PANEL — tabbed: LangGraph Deep Analysis + RD-Agent Research+// ═══════════════════════════════════════════════════════════════════════════════++QWidget* QuantModulePanel::build_deep_agent_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(0, 0, 0, 0);+ vl->setSpacing(0);++ // ── Shared LLM profile picker (used by both Deep Analysis and RD-Agent) ──+ QComboBox* llm_combo = nullptr;+ auto* llm_bar = new QWidget(w);+ llm_bar->setStyleSheet(+ QString("background:%1; border-bottom:1px solid %2;").arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));+ auto* llm_bar_l = new QHBoxLayout(llm_bar);+ llm_bar_l->setContentsMargins(16, 8, 16, 8);+ llm_bar_l->setSpacing(0);+ llm_bar_l->addWidget(build_llm_picker(llm_bar, &llm_combo));+ vl->addWidget(llm_bar);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ // ── Tab 1: LangGraph Deep Analysis ──────────────────────────────────────+ auto* da_w = new QWidget(tabs);+ auto* da_vl = new QVBoxLayout(da_w);+ da_vl->setContentsMargins(16, 16, 16, 16);+ da_vl->setSpacing(12);++ auto* desc =+ new QLabel("Multi-agent financial analysis powered by LangGraph. Delegates to specialist subagents "+ "(research, data-analyst, trading, risk-analyzer, portfolio-optimizer, backtester, reporter).",+ da_w);+ desc->setWordWrap(true);+ desc->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")+ .arg(ui::colors::TEXT_SECONDARY())+ .arg(ui::fonts::SMALL)+ .arg(ui::fonts::DATA_FAMILY));+ da_vl->addWidget(desc);++ auto* task_edit = new QTextEdit(da_w);+ task_edit->setPlaceholderText("Describe your analysis task...\n"+ "e.g. \"Conduct a full investment analysis of NVDA: research fundamentals, "+ "assess risks, and give a buy/sell/hold recommendation with price target\"");+ task_edit->setFixedHeight(90);+ task_edit->setStyleSheet(QString("QTextEdit { background:%1; color:%2; border:1px solid %3;"+ "font-family:%4; font-size:%5px; padding:6px; }")+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_PRIMARY(), ui::colors::BORDER_MED())+ .arg(ui::fonts::DATA_FAMILY)+ .arg(ui::fonts::SMALL));+ da_vl->addWidget(build_input_row("Task", task_edit, da_w));++ auto* agent_type = new QComboBox(da_w);+ agent_type->addItems({"general", "research", "trading_strategy", "portfolio_management", "risk_assessment"});+ agent_type->setStyleSheet(combo_ss());+ combo_inputs_["agent_type"] = agent_type;+ da_vl->addWidget(build_input_row("Agent Type", agent_type, da_w));++ auto* thread_id = new QLineEdit(da_w);+ thread_id->setPlaceholderText("Optional — leave blank to auto-generate");+ thread_id->setStyleSheet(QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"+ "font-family:%4; font-size:%5px; padding:6px 8px; }")+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_PRIMARY(), ui::colors::BORDER_MED())+ .arg(ui::fonts::DATA_FAMILY)+ .arg(ui::fonts::SMALL));+ text_inputs_["thread_id"] = thread_id;+ da_vl->addWidget(build_input_row("Thread ID", thread_id, da_w));++ auto* da_run = make_run_button("RUN DEEP ANALYSIS", da_w);+ connect(da_run, &QPushButton::clicked, this, [this, task_edit, agent_type, thread_id, llm_combo]() {+ auto task = task_edit->toPlainText().trimmed();+ if (task.isEmpty()) {+ display_error("Please enter an analysis task.");+ return;+ }+ auto cfg = llm_config_from_combo(llm_combo);+ if (cfg.isEmpty()) {+ display_error("Select an LLM profile before running.");+ return;+ }+ status_label_->setText("Running...");+ clear_results();+ QJsonObject params;+ params["task"] = task;+ params["agent_type"] = agent_type->currentText();+ params["config"] = cfg;+ auto tid = thread_id->text().trimmed();+ if (!tid.isEmpty())+ params["thread_id"] = tid;+ AIQuantLabService::instance().run_deep_agent(params);+ });+ da_vl->addWidget(da_run);++ agent_output_ = new QTextEdit(da_w);+ agent_output_->setReadOnly(true);+ agent_output_->setPlaceholderText("Analysis results will appear here...");+ agent_output_->setMinimumHeight(300);+ agent_output_->setStyleSheet(output_ss());+ da_vl->addWidget(agent_output_, 1);++ auto* rc = new QWidget(da_w);+ results_layout_ = new QVBoxLayout(rc);+ results_layout_->setContentsMargins(0, 0, 0, 0);+ results_layout_->setSpacing(0);+ da_vl->addWidget(rc);++ tabs->addTab(da_w, "Deep Analysis");++ // ── Tab 2: RD-Agent ─────────────────────────────────────────────────────+ tabs->addTab(build_rd_agent_tab(llm_combo), "RD-Agent");++ vl->addWidget(tabs, 1);+ return w;+}++// ═══════════════════════════════════════════════════════════════════════════════+// RD-AGENT TAB — Autonomous factor/model research (Microsoft RD-Agent)+// ═══════════════════════════════════════════════════════════════════════════════++QWidget* QuantModulePanel::build_rd_agent_tab(QComboBox* llm_combo) {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(0, 0, 0, 0);+ vl->setSpacing(0);++ // shared styles++ auto* sub = new QTabWidget(w);+ sub->setStyleSheet(sub_tab_ss(module_.color.name()));++ // ── Status bar ───────────────────────────────────────────────────────────+ auto* status_bar = new QWidget(w);+ status_bar->setFixedHeight(28);+ status_bar->setStyleSheet(+ QString("background:%1; border-bottom:1px solid %2;").arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));+ auto* sbl = new QHBoxLayout(status_bar);+ sbl->setContentsMargins(12, 0, 12, 0);+ sbl->setSpacing(8);+ auto* status_dot = new QLabel("●", status_bar);+ status_dot->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_TERTIARY()));+ sbl->addWidget(status_dot);+ auto* status_txt = new QLabel("RD-Agent ready", status_bar);+ status_txt->setObjectName("rdStatusTxt");+ status_txt->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")+ .arg(ui::colors::TEXT_TERTIARY())+ .arg(ui::fonts::TINY)+ .arg(ui::fonts::DATA_FAMILY));+ sbl->addWidget(status_txt, 1);+ auto* check_btn = new QPushButton("CHECK STATUS", status_bar);+ check_btn->setCursor(Qt::PointingHandCursor);+ check_btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"+ "font-family:%2; font-size:%3px; padding:2px 8px; border-radius:2px; }"+ "QPushButton:hover { background:%1; color:%4; }")+ .arg(module_.color.name())+ .arg(ui::fonts::DATA_FAMILY)+ .arg(ui::fonts::TINY)+ .arg(ui::colors::BG_BASE()));+ connect(check_btn, &QPushButton::clicked, this, [status_txt]() {+ status_txt->setText("Checking...");+ AIQuantLabService::instance().rd_agent_check_status();+ });+ sbl->addWidget(check_btn);++ auto* ui_btn = new QPushButton("OPEN LOG VIEWER", status_bar);+ ui_btn->setCursor(Qt::PointingHandCursor);+ ui_btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"+ "font-family:%2; font-size:%3px; padding:2px 8px; border-radius:2px; }"+ "QPushButton:hover { background:%1; color:%4; }")+ .arg(ui::colors::TEXT_TERTIARY())+ .arg(ui::fonts::DATA_FAMILY)+ .arg(ui::fonts::TINY)+ .arg(ui::colors::BG_BASE()));+ connect(ui_btn, &QPushButton::clicked, this, [status_txt]() {+ status_txt->setText("Starting log viewer...");+ AIQuantLabService::instance().rd_agent_start_ui();+ });+ sbl->addWidget(ui_btn);++ auto* mcp_btn = new QPushButton("MCP TOOLS", status_bar);+ mcp_btn->setCursor(Qt::PointingHandCursor);+ mcp_btn->setCheckable(true);+ mcp_btn->setToolTip("Start/stop the Fincept MCP tool server\n"+ "Gives RD-Agent loops access to market data,\n"+ "financial news and economics tools.");+ mcp_btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"+ "font-family:%2; font-size:%3px; padding:2px 8px; border-radius:2px; }"+ "QPushButton:checked { background:%4; color:%5; border-color:%4; }"+ "QPushButton:hover { background:%1; color:%5; }")+ .arg(ui::colors::TEXT_TERTIARY())+ .arg(ui::fonts::DATA_FAMILY)+ .arg(ui::fonts::TINY)+ .arg(module_.color.name())+ .arg(ui::colors::BG_BASE()));+ connect(mcp_btn, &QPushButton::toggled, this, [mcp_btn, status_txt](bool checked) {+ if (checked) {+ status_txt->setText("Starting MCP tool server...");+ AIQuantLabService::instance().rd_agent_start_mcp_server();+ } else {+ status_txt->setText("MCP tool server stopped");+ mcp_btn->setText("MCP TOOLS");+ }+ });+ sbl->addWidget(mcp_btn);+ vl->addWidget(status_bar);++ // ── Sub-tab 1: Factor Mining ─────────────────────────────────────────────+ auto* fm_w = new QWidget(sub);+ auto* fm_vl = new QVBoxLayout(fm_w);+ fm_vl->setContentsMargins(14, 14, 14, 14);+ fm_vl->setSpacing(10);++ auto* fm_desc = new QLabel("Autonomous alpha factor discovery via FactorRDLoop. The agent proposes, codes, runs "+ "and evaluates factors iteratively until the target IC is reached.",+ fm_w);+ fm_desc->setWordWrap(true);+ fm_desc->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")+ .arg(ui::colors::TEXT_SECONDARY())+ .arg(ui::fonts::SMALL)+ .arg(ui::fonts::DATA_FAMILY));+ fm_vl->addWidget(fm_desc);++ auto* fm_task = new QTextEdit(fm_w);+ fm_task->setPlaceholderText(+ "Describe the factor hypothesis...\ne.g. \"Discover momentum-based alpha factors for US equities\"");+ fm_task->setFixedHeight(70);+ fm_task->setStyleSheet(input_ss());+ fm_vl->addWidget(build_input_row("Task Description", fm_task, fm_w));++ auto* fm_market = new QComboBox(fm_w);+ fm_market->addItems({"US", "CN", "EU", "IN", "JP", "HK", "GLOBAL"});+ fm_market->setStyleSheet(combo_ss());+ fm_vl->addWidget(build_input_row("Target Market", fm_market, fm_w));++ auto* fm_iter = new QSpinBox(fm_w);+ fm_iter->setRange(1, 100);+ fm_iter->setValue(10);+ fm_iter->setStyleSheet(input_ss());+ fm_vl->addWidget(build_input_row("Max Iterations", fm_iter, fm_w));++ auto* fm_ic = make_double_spin(0.01, 0.50, 0.05, 3, "", fm_w);+ fm_vl->addWidget(build_input_row("Target IC", fm_ic, fm_w));++ auto* fm_run = make_run_button("START FACTOR MINING", fm_w);+ connect(fm_run, &QPushButton::clicked, this, [this, fm_task, fm_market, fm_iter, fm_ic, status_txt, llm_combo]() {+ auto desc_text = fm_task->toPlainText().trimmed();+ if (desc_text.isEmpty()) {+ display_error("Enter a task description.");+ return;+ }+ auto cfg = llm_config_from_combo(llm_combo);+ if (cfg.isEmpty()) {+ display_error("Select an LLM profile before running.");+ return;+ }+ status_label_->setText("Starting...");+ status_txt->setText("Factor mining started...");+ QJsonObject params;+ params["task_description"] = desc_text;+ params["target_market"] = fm_market->currentText();+ params["max_iterations"] = fm_iter->value();+ params["target_ic"] = fm_ic->value();+ params["config"] = cfg;+ AIQuantLabService::instance().rd_agent_start_factor_mining(params);+ });+ fm_vl->addWidget(fm_run);+ fm_vl->addStretch();+ sub->addTab(fm_w, "Factor Mining");++ // ── Sub-tab 2: Model Optimization ────────────────────────────────────────+ auto* mo_w = new QWidget(sub);+ auto* mo_vl = new QVBoxLayout(mo_w);+ mo_vl->setContentsMargins(14, 14, 14, 14);+ mo_vl->setSpacing(10);++ auto* mo_desc = new QLabel("ML model hyperparameter optimization via ModelRDLoop. Supports LightGBM, XGBoost, "+ "LSTM, GRU, Transformer and TCN. Optimizes for Sharpe, IC, max drawdown, or win rate.",+ mo_w);+ mo_desc->setWordWrap(true);+ mo_desc->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")+ .arg(ui::colors::TEXT_SECONDARY())+ .arg(ui::fonts::SMALL)+ .arg(ui::fonts::DATA_FAMILY));+ mo_vl->addWidget(mo_desc);++ auto* mo_model = new QComboBox(mo_w);+ mo_model->addItems({"lightgbm", "xgboost", "lstm", "gru", "transformer", "tcn"});+ mo_model->setStyleSheet(combo_ss());+ mo_vl->addWidget(build_input_row("Model Type", mo_model, mo_w));++ auto* mo_target = new QComboBox(mo_w);+ mo_target->addItems({"sharpe", "ic", "max_drawdown", "win_rate", "calmar_ratio"});+ mo_target->setStyleSheet(combo_ss());+ mo_vl->addWidget(build_input_row("Optimize For", mo_target, mo_w));++ auto* mo_iter = new QSpinBox(mo_w);+ mo_iter->setRange(1, 100);+ mo_iter->setValue(10);+ mo_iter->setStyleSheet(input_ss());+ mo_vl->addWidget(build_input_row("Max Iterations", mo_iter, mo_w));++ auto* mo_run = make_run_button("START MODEL OPTIMIZATION", mo_w);+ connect(mo_run, &QPushButton::clicked, this, [this, mo_model, mo_target, mo_iter, status_txt, llm_combo]() {+ auto cfg = llm_config_from_combo(llm_combo);+ if (cfg.isEmpty()) {+ display_error("Select an LLM profile before running.");+ return;+ }+ status_label_->setText("Starting...");+ status_txt->setText("Model optimization started...");+ QJsonObject params;+ params["model_type"] = mo_model->currentText();+ params["optimization_target"] = mo_target->currentText();+ params["max_iterations"] = mo_iter->value();+ params["config"] = cfg;+ AIQuantLabService::instance().rd_agent_start_model_optimization(params);+ });+ mo_vl->addWidget(mo_run);+ mo_vl->addStretch();+ sub->addTab(mo_w, "Model Optimization");++ // ── Sub-tab 3: Quant Research ─────────────────────────────────────────────+ auto* qr_w = new QWidget(sub);+ auto* qr_vl = new QVBoxLayout(qr_w);+ qr_vl->setContentsMargins(14, 14, 14, 14);+ qr_vl->setSpacing(10);++ auto* qr_desc = new QLabel("Combined factor discovery + model optimization via QuantRDLoop. Runs the full "+ "research pipeline end-to-end: propose factors, code them, backtest, refine.",+ qr_w);+ qr_desc->setWordWrap(true);+ qr_desc->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")+ .arg(ui::colors::TEXT_SECONDARY())+ .arg(ui::fonts::SMALL)+ .arg(ui::fonts::DATA_FAMILY));+ qr_vl->addWidget(qr_desc);++ auto* qr_goal = new QTextEdit(qr_w);+ qr_goal->setPlaceholderText(+ "Research goal...\ne.g. \"Build a quantitative equity strategy for mid-cap US stocks\"");+ qr_goal->setFixedHeight(70);+ qr_goal->setStyleSheet(input_ss());+ qr_vl->addWidget(build_input_row("Research Goal", qr_goal, qr_w));++ auto* qr_market = new QComboBox(qr_w);+ qr_market->addItems({"US", "CN", "EU", "IN", "JP", "HK", "GLOBAL"});+ qr_market->setStyleSheet(combo_ss());+ qr_vl->addWidget(build_input_row("Target Market", qr_market, qr_w));++ auto* qr_iter = new QSpinBox(qr_w);+ qr_iter->setRange(1, 100);+ qr_iter->setValue(15);+ qr_iter->setStyleSheet(input_ss());+ qr_vl->addWidget(build_input_row("Max Iterations", qr_iter, qr_w));++ auto* qr_run = make_run_button("START QUANT RESEARCH", qr_w);+ connect(qr_run, &QPushButton::clicked, this, [this, qr_goal, qr_market, qr_iter, status_txt, llm_combo]() {+ auto goal = qr_goal->toPlainText().trimmed();+ if (goal.isEmpty()) {+ display_error("Enter a research goal.");+ return;+ }+ auto cfg = llm_config_from_combo(llm_combo);+ if (cfg.isEmpty()) {+ display_error("Select an LLM profile before running.");+ return;+ }+ status_label_->setText("Starting...");+ status_txt->setText("Quant research started...");+ QJsonObject params;+ params["research_goal"] = goal;+ params["target_market"] = qr_market->currentText();+ params["max_iterations"] = qr_iter->value();+ params["config"] = cfg;+ AIQuantLabService::instance().rd_agent_start_quant_research(params);+ });+ qr_vl->addWidget(qr_run);+ qr_vl->addStretch();+ sub->addTab(qr_w, "Quant Research");++ // ── Sub-tab 4: Task Monitor ───────────────────────────────────────────────+ auto* tm_w = new QWidget(sub);+ auto* tm_vl = new QVBoxLayout(tm_w);+ tm_vl->setContentsMargins(14, 14, 14, 14);+ tm_vl->setSpacing(8);++ // Toolbar: filter + buttons+ auto* tm_toolbar = new QWidget(tm_w);+ auto* tm_hl = new QHBoxLayout(tm_toolbar);+ tm_hl->setContentsMargins(0, 0, 0, 0);+ tm_hl->setSpacing(6);++ auto* filter_combo = new QComboBox(tm_toolbar);+ filter_combo->addItems({"All", "running", "completed", "stopped", "failed"});+ filter_combo->setFixedWidth(120);+ filter_combo->setStyleSheet(combo_ss());+ tm_hl->addWidget(filter_combo);++ auto* refresh_btn = new QPushButton("REFRESH", tm_toolbar);+ refresh_btn->setCursor(Qt::PointingHandCursor);+ refresh_btn->setStyleSheet(+ QString("QPushButton { background:%1; color:%2; border:none;"+ "font-family:%3; font-size:%4px; font-weight:700; padding:5px 12px; border-radius:2px; }"+ "QPushButton:hover { background:%5; }")+ .arg(module_.color.name())+ .arg(ui::colors::BG_BASE())+ .arg(ui::fonts::DATA_FAMILY)+ .arg(ui::fonts::TINY)+ .arg(module_.color.lighter(120).name()));+ tm_hl->addWidget(refresh_btn);++ auto* task_id_input = new QLineEdit(tm_toolbar);+ task_id_input->setPlaceholderText("Task ID...");+ task_id_input->setStyleSheet(input_ss());+ task_id_input->setFixedWidth(200);+ tm_hl->addWidget(task_id_input);++ auto* stop_btn = new QPushButton("STOP", tm_toolbar);+ stop_btn->setCursor(Qt::PointingHandCursor);+ stop_btn->setStyleSheet(+ QString("QPushButton { background:" + QString(ui::colors::NEGATIVE()) ++ "; color:" + QString(ui::colors::TEXT_PRIMARY()) ++ "; border:none;"+ "font-family:%1; font-size:%2px; font-weight:700; padding:5px 12px; border-radius:2px; }"+ "QPushButton:hover { background:" ++ QString(ui::colors::NEGATIVE()) + "; }")+ .arg(ui::fonts::DATA_FAMILY)+ .arg(ui::fonts::TINY));+ tm_hl->addWidget(stop_btn);++ auto* resume_btn = new QPushButton("RESUME", tm_toolbar);+ resume_btn->setCursor(Qt::PointingHandCursor);+ resume_btn->setStyleSheet(+ QString("QPushButton { background:" + QString(ui::colors::POSITIVE()) ++ "; color:" + QString(ui::colors::TEXT_PRIMARY()) ++ "; border:none;"+ "font-family:%1; font-size:%2px; font-weight:700; padding:5px 12px; border-radius:2px; }"+ "QPushButton:hover { background:" ++ QString(ui::colors::POSITIVE()) + "; }")+ .arg(ui::fonts::DATA_FAMILY)+ .arg(ui::fonts::TINY));+ tm_hl->addWidget(resume_btn);++ auto* factors_btn = new QPushButton("GET FACTORS", tm_toolbar);+ factors_btn->setCursor(Qt::PointingHandCursor);+ factors_btn->setStyleSheet(+ QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"+ "font-family:%2; font-size:%3px; font-weight:700; padding:5px 10px; border-radius:2px; }"+ "QPushButton:hover { background:%1; color:%4; }")+ .arg(module_.color.name())+ .arg(ui::fonts::DATA_FAMILY)+ .arg(ui::fonts::TINY)+ .arg(ui::colors::BG_BASE()));+ tm_hl->addWidget(factors_btn);+ tm_hl->addStretch();+ tm_vl->addWidget(tm_toolbar);++ // Task table+ rd_task_table_ = new QTableWidget(0, 6, tm_w);+ rd_task_table_->setHorizontalHeaderLabels({"Task ID", "Type", "Status", "Progress", "Best IC", "Elapsed"});+ rd_task_table_->horizontalHeader()->setStretchLastSection(true);+ rd_task_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ rd_task_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ rd_task_table_->setAlternatingRowColors(true);+ rd_task_table_->setStyleSheet(table_ss());+ tm_vl->addWidget(rd_task_table_, 1);++ // Output area for factor results+ rd_agent_output_ = new QTextEdit(tm_w);+ rd_agent_output_->setReadOnly(true);+ rd_agent_output_->setPlaceholderText("Select a task and click GET FACTORS / GET MODEL to view results...");+ rd_agent_output_->setFixedHeight(160);+ rd_agent_output_->setStyleSheet(output_ss());+ tm_vl->addWidget(rd_agent_output_);++ // Wire toolbar buttons+ connect(refresh_btn, &QPushButton::clicked, this, [filter_combo]() {+ auto filter = filter_combo->currentText();+ AIQuantLabService::instance().rd_agent_list_tasks(filter == "All" ? QString{} : filter);+ });++ connect(stop_btn, &QPushButton::clicked, this, [this, task_id_input]() {+ auto tid = task_id_input->text().trimmed();+ if (tid.isEmpty() && rd_task_table_->currentRow() >= 0)+ tid = rd_task_table_->item(rd_task_table_->currentRow(), 0)->text();+ if (tid.isEmpty()) {+ display_error("Select or enter a task ID.");+ return;+ }+ AIQuantLabService::instance().rd_agent_stop_task(tid);+ });++ connect(resume_btn, &QPushButton::clicked, this, [this, task_id_input]() {+ auto tid = task_id_input->text().trimmed();+ if (tid.isEmpty() && rd_task_table_->currentRow() >= 0)+ tid = rd_task_table_->item(rd_task_table_->currentRow(), 0)->text();+ if (tid.isEmpty()) {+ display_error("Select or enter a task ID.");+ return;+ }+ AIQuantLabService::instance().rd_agent_resume_task(tid);+ });++ connect(factors_btn, &QPushButton::clicked, this, [this, task_id_input]() {+ auto tid = task_id_input->text().trimmed();+ if (tid.isEmpty() && rd_task_table_->currentRow() >= 0)+ tid = rd_task_table_->item(rd_task_table_->currentRow(), 0)->text();+ if (tid.isEmpty()) {+ display_error("Select or enter a task ID.");+ return;+ }+ AIQuantLabService::instance().rd_agent_get_discovered_factors(tid);+ });++ // Populate task_id_input on row click+ connect(rd_task_table_, &QTableWidget::currentCellChanged, this, [task_id_input, this](int row, int, int, int) {+ if (row >= 0 && rd_task_table_->item(row, 0))+ task_id_input->setText(rd_task_table_->item(row, 0)->text());+ });++ sub->addTab(tm_w, "Task Monitor");++ vl->addWidget(sub, 1);+ return w;+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Fortitudo.cpp b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Fortitudo.cppnew file mode 100644index 000000000..5aef92fc7--- /dev/null+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Fortitudo.cpp@@ -0,0 +1,923 @@+// src/screens/ai_quant_lab/QuantModulePanel_Fortitudo.cpp+//+// Fortitudo panel — 6 risk-aware portfolio analyses (metrics, covariance, MV opt,+// CVaR opt, efficient frontier, exp-decay weights). Mirrors the GS Quant /+// Functime / Statsmodels pattern. Extracted from QuantModulePanel.cpp to keep+// that file maintainable.+#include "screens/ai_quant_lab/QuantModulePanel.h"+#include "screens/ai_quant_lab/QuantModulePanel_Common.h"+#include "screens/ai_quant_lab/QuantModulePanel_GsHelpers.h"+#include "screens/ai_quant_lab/QuantModulePanel_Styles.h"++#include "services/ai_quant_lab/AIQuantLabService.h"+#include "ui/theme/Theme.h"++#include <QAbstractItemView>+#include <QColor>+#include <QComboBox>+#include <QHash>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QJsonArray>+#include <QJsonObject>+#include <QLabel>+#include <QLineEdit>+#include <QList>+#include <QPushButton>+#include <QSpinBox>+#include <QString>+#include <QStringList>+#include <QTabWidget>+#include <QTableWidget>+#include <QTableWidgetItem>+#include <QVBoxLayout>+#include <QWidget>++#include <algorithm>+#include <cmath>++namespace fincept::screens {++using namespace fincept::services::quant;+using namespace fincept::screens::quant_styles;+using namespace fincept::screens::quant_common;+using namespace fincept::screens::quant_gs_helpers;++// ═══════════════════════════════════════════════════════════════════════════════+// FORTITUDO PANEL — 6 risk-aware portfolio analyses (metrics, covariance, MV opt,+// CVaR opt, efficient frontier, exp-decay weights). Mirrors the GS Quant /+// Functime / Statsmodels pattern.+// ═══════════════════════════════════════════════════════════════════════════════++namespace {++// Helper: build the asset-input row used by every Fortitudo sub-tab.+// Lets the user paste a tickers list ("AAPL,MSFT,GOOG") that the Python side+// fetches via yfinance — much simpler than typing thousands of return values.+struct FortAssetInputs {+ QLineEdit* tickers_edit;+ QComboBox* period_combo;+};++FortAssetInputs build_fort_asset_row(const QString& key_prefix, QWidget* parent,+ QHash<QString, QLineEdit*>& text_inputs,+ QHash<QString, QComboBox*>& combo_inputs,+ const QString& default_tickers = "AAPL,MSFT,GOOG,TSLA,AMZN") {+ auto* row = new QWidget(parent);+ auto* hl = new QHBoxLayout(row);+ hl->setContentsMargins(0, 0, 0, 0);+ hl->setSpacing(8);++ auto* tk = new QLineEdit(row);+ tk->setPlaceholderText("Tickers (comma-separated, >= 2). Returns fetched via Yahoo Finance.");+ tk->setText(default_tickers);+ tk->setStyleSheet(input_ss());+ text_inputs[key_prefix + "_tickers"] = tk;++ auto* per = new QComboBox(row);+ per->addItems({"6mo", "1y", "2y", "3y", "5y", "10y", "max"});+ per->setCurrentText("1y");+ per->setStyleSheet(combo_ss());+ per->setFixedWidth(80);+ combo_inputs[key_prefix + "_period"] = per;++ hl->addWidget(tk, 1);+ hl->addWidget(per);+ return {tk, per};+}++// Build a weights table: asset / weight / weight % with color-coded bars.+QTableWidget* fort_weights_table(const QJsonArray& weights, QWidget* parent) {+ auto* table = new QTableWidget(weights.size(), 3, parent);+ table->setHorizontalHeaderLabels({"Asset", "Weight", "% of Portfolio"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->setSelectionMode(QAbstractItemView::NoSelection);+ table->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ table->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents);+ table->horizontalHeader()->setSectionResizeMode(2, QHeaderView::ResizeToContents);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(weights.size() * 24 + 32, 320));+ for (int i = 0; i < weights.size(); ++i) {+ const auto w = weights[i].toObject();+ const double weight = w.value("weight").toDouble();+ const double pct = w.value("weight_pct").toDouble();+ table->setItem(i, 0, new QTableWidgetItem(w.value("asset").toString()));+ auto* wi = new QTableWidgetItem(QString::number(weight, 'f', 4));+ wi->setForeground(QColor(weight >= 0.0 ? ui::colors::POSITIVE() : ui::colors::NEGATIVE()));+ wi->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 1, wi);+ auto* pi = new QTableWidgetItem(QString::number(pct, 'f', 2) + "%");+ pi->setForeground(QColor(pct >= 50.0 ? ui::colors::WARNING()+ : pct >= 20.0 ? ui::colors::TEXT_PRIMARY()+ : ui::colors::TEXT_SECONDARY()));+ pi->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 2, pi);+ table->setRowHeight(i, 24);+ }+ return table;+}++} // namespace++QWidget* QuantModulePanel::build_fortitudo_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ // ── Portfolio Metrics ────────────────────────────────────────────────────+ auto* pm = new QWidget(this);+ auto* pml = new QVBoxLayout(pm);+ pml->setContentsMargins(12, 12, 12, 12);+ pml->setSpacing(8);++ auto pm_assets = build_fort_asset_row("ft_pm", pm, text_inputs_, combo_inputs_);+ pml->addWidget(build_input_row("Tickers", pm_assets.tickers_edit, pm));+ pml->addWidget(build_input_row("History Period", pm_assets.period_combo, pm));++ auto* pm_weights = new QLineEdit(pm);+ pm_weights->setPlaceholderText("Weights (comma-separated, will be normalized to 1.0). Equal-weight if blank.");+ pm_weights->setStyleSheet(input_ss());+ text_inputs_["ft_pm_weights"] = pm_weights;+ pml->addWidget(build_input_row("Portfolio Weights", pm_weights, pm));++ auto* pm_alpha = make_double_spin(0.001, 0.499, 0.05, 3, "", pm);+ double_inputs_["ft_pm_alpha"] = pm_alpha;+ pml->addWidget(build_input_row("CVaR α (tail probability)", pm_alpha, pm));++ auto* pm_run = make_run_button("COMPUTE PORTFOLIO METRICS", pm);+ connect(pm_run, &QPushButton::clicked, this, [this]() {+ const QString tk = text_inputs_["ft_pm_tickers"]->text().trimmed();+ if (tk.isEmpty()) {+ display_error("Enter at least 2 tickers (e.g. AAPL,MSFT,GOOG).");+ return;+ }+ QJsonObject params;+ params["tickers"] = tk;+ params["period"] = combo_inputs_["ft_pm_period"]->currentText();+ params["alpha"] = double_inputs_["ft_pm_alpha"]->value();+ const QString w_text = text_inputs_["ft_pm_weights"]->text().trimmed();+ if (!w_text.isEmpty()) {+ QJsonArray w;+ QString bad;+ if (!parse_doubles(w_text, w, &bad)) {+ display_error(QString("Weights: '%1' is not numeric.").arg(bad));+ return;+ }+ params["weights"] = w;+ }+ show_loading(QString("Fetching %1 from yfinance and computing metrics...").arg(tk));+ AIQuantLabService::instance().fort_portfolio_metrics(params);+ });+ pml->addWidget(pm_run);+ pml->addStretch();+ tabs->addTab(pm, "Portfolio Metrics");++ // ── Covariance / Correlation ─────────────────────────────────────────────+ auto* cv = new QWidget(this);+ auto* cvl = new QVBoxLayout(cv);+ cvl->setContentsMargins(12, 12, 12, 12);+ cvl->setSpacing(8);++ auto cv_assets = build_fort_asset_row("ft_cv", cv, text_inputs_, combo_inputs_);+ cvl->addWidget(build_input_row("Tickers", cv_assets.tickers_edit, cv));+ cvl->addWidget(build_input_row("History Period", cv_assets.period_combo, cv));++ auto* cv_hint = new QLabel(+ "Computes the full covariance matrix, correlation matrix, and per-asset moments "+ "(mean, vol, skew, kurtosis). Asset count is capped — keep it under 12 for readability.", cv);+ cv_hint->setWordWrap(true);+ cv_hint->setStyleSheet(QString("color:%1; font-size:10px;").arg(ui::colors::TEXT_TERTIARY()));+ cvl->addWidget(cv_hint);++ auto* cv_run = make_run_button("COMPUTE COV + CORR + MOMENTS", cv);+ connect(cv_run, &QPushButton::clicked, this, [this]() {+ const QString tk = text_inputs_["ft_cv_tickers"]->text().trimmed();+ if (tk.isEmpty()) {+ display_error("Enter at least 2 tickers.");+ return;+ }+ QJsonObject params;+ params["tickers"] = tk;+ params["period"] = combo_inputs_["ft_cv_period"]->currentText();+ show_loading(QString("Fetching %1 and computing covariance...").arg(tk));+ AIQuantLabService::instance().fort_covariance_matrix(params);+ });+ cvl->addWidget(cv_run);+ cvl->addStretch();+ tabs->addTab(cv, "Covariance");++ // ── Mean-Variance Optimization ───────────────────────────────────────────+ auto* mv = new QWidget(this);+ auto* mvl = new QVBoxLayout(mv);+ mvl->setContentsMargins(12, 12, 12, 12);+ mvl->setSpacing(8);++ auto mv_assets = build_fort_asset_row("ft_mv", mv, text_inputs_, combo_inputs_);+ mvl->addWidget(build_input_row("Tickers", mv_assets.tickers_edit, mv));+ mvl->addWidget(build_input_row("History Period", mv_assets.period_combo, mv));++ auto* mv_obj = new QComboBox(mv);+ mv_obj->addItems({"min_variance", "max_sharpe", "target_return"});+ mv_obj->setStyleSheet(combo_ss());+ combo_inputs_["ft_mv_objective"] = mv_obj;+ mvl->addWidget(build_input_row("Objective", mv_obj, mv));++ auto* mv_target = make_double_spin(0, 100, 8.0, 2, "%", mv);+ double_inputs_["ft_mv_target"] = mv_target;+ mvl->addWidget(build_input_row("Target Annualized Return", mv_target, mv));++ auto* mv_long = new QComboBox(mv);+ mv_long->addItems({"true", "false"});+ mv_long->setStyleSheet(combo_ss());+ combo_inputs_["ft_mv_long_only"] = mv_long;+ mvl->addWidget(build_input_row("Long Only", mv_long, mv));++ auto* mv_max = make_double_spin(0.0, 1.0, 0.5, 2, "", mv);+ mv_max->setSpecialValueText("none");+ double_inputs_["ft_mv_max"] = mv_max;+ mvl->addWidget(build_input_row("Max Single-Asset Weight (0 = none)", mv_max, mv));++ auto* mv_rf = make_double_spin(0, 20, 4.5, 2, "%", mv);+ double_inputs_["ft_mv_rf"] = mv_rf;+ mvl->addWidget(build_input_row("Risk-Free Rate (annual)", mv_rf, mv));++ auto* mv_run = make_run_button("OPTIMIZE PORTFOLIO", mv);+ connect(mv_run, &QPushButton::clicked, this, [this]() {+ const QString tk = text_inputs_["ft_mv_tickers"]->text().trimmed();+ if (tk.isEmpty()) {+ display_error("Enter at least 2 tickers.");+ return;+ }+ const QString obj = combo_inputs_["ft_mv_objective"]->currentText();+ QJsonObject params;+ params["tickers"] = tk;+ params["period"] = combo_inputs_["ft_mv_period"]->currentText();+ params["objective"] = obj;+ params["long_only"] = combo_inputs_["ft_mv_long_only"]->currentText() == "true";+ const double maxw = double_inputs_["ft_mv_max"]->value();+ if (maxw > 0.0) params["max_weight"] = maxw;+ // Translate annual % rf rate to per-day decimal for daily returns.+ params["risk_free_rate"] = double_inputs_["ft_mv_rf"]->value() / 100.0 / 252.0;+ if (obj == "target_return") {+ // Translate annualized % to per-day decimal so the optimizer's+ // expected_return constraint matches.+ params["target_return"] = std::pow(1.0 + double_inputs_["ft_mv_target"]->value() / 100.0,+ 1.0 / 252.0) - 1.0;+ }+ show_loading(QString("Fetching %1 and solving %2...").arg(tk, obj));+ AIQuantLabService::instance().fort_mean_variance_optimize(params);+ });+ mvl->addWidget(mv_run);+ mvl->addStretch();+ tabs->addTab(mv, "MV Optimize");++ // ── Mean-CVaR Optimization ───────────────────────────────────────────────+ auto* cvopt = new QWidget(this);+ auto* cvol = new QVBoxLayout(cvopt);+ cvol->setContentsMargins(12, 12, 12, 12);+ cvol->setSpacing(8);++ auto cv_opt_assets = build_fort_asset_row("ft_cvopt", cvopt, text_inputs_, combo_inputs_);+ cvol->addWidget(build_input_row("Tickers", cv_opt_assets.tickers_edit, cvopt));+ cvol->addWidget(build_input_row("History Period", cv_opt_assets.period_combo, cvopt));++ auto* cvopt_obj = new QComboBox(cvopt);+ cvopt_obj->addItems({"min_cvar", "target_return"});+ cvopt_obj->setStyleSheet(combo_ss());+ combo_inputs_["ft_cvopt_objective"] = cvopt_obj;+ cvol->addWidget(build_input_row("Objective", cvopt_obj, cvopt));++ auto* cvopt_alpha = make_double_spin(0.001, 0.499, 0.05, 3, "", cvopt);+ double_inputs_["ft_cvopt_alpha"] = cvopt_alpha;+ cvol->addWidget(build_input_row("CVaR α (tail probability)", cvopt_alpha, cvopt));++ auto* cvopt_target = make_double_spin(0, 100, 8.0, 2, "%", cvopt);+ double_inputs_["ft_cvopt_target"] = cvopt_target;+ cvol->addWidget(build_input_row("Target Annualized Return", cvopt_target, cvopt));++ auto* cvopt_long = new QComboBox(cvopt);+ cvopt_long->addItems({"true", "false"});+ cvopt_long->setStyleSheet(combo_ss());+ combo_inputs_["ft_cvopt_long_only"] = cvopt_long;+ cvol->addWidget(build_input_row("Long Only", cvopt_long, cvopt));++ auto* cvopt_max = make_double_spin(0.0, 1.0, 0.5, 2, "", cvopt);+ cvopt_max->setSpecialValueText("none");+ double_inputs_["ft_cvopt_max"] = cvopt_max;+ cvol->addWidget(build_input_row("Max Single-Asset Weight (0 = none)", cvopt_max, cvopt));++ auto* cvopt_run = make_run_button("MINIMIZE TAIL RISK", cvopt);+ connect(cvopt_run, &QPushButton::clicked, this, [this]() {+ const QString tk = text_inputs_["ft_cvopt_tickers"]->text().trimmed();+ if (tk.isEmpty()) {+ display_error("Enter at least 2 tickers.");+ return;+ }+ const QString obj = combo_inputs_["ft_cvopt_objective"]->currentText();+ QJsonObject params;+ params["tickers"] = tk;+ params["period"] = combo_inputs_["ft_cvopt_period"]->currentText();+ params["objective"] = obj;+ params["alpha"] = double_inputs_["ft_cvopt_alpha"]->value();+ params["long_only"] = combo_inputs_["ft_cvopt_long_only"]->currentText() == "true";+ const double maxw = double_inputs_["ft_cvopt_max"]->value();+ if (maxw > 0.0) params["max_weight"] = maxw;+ if (obj == "target_return") {+ params["target_return"] = std::pow(1.0 + double_inputs_["ft_cvopt_target"]->value() / 100.0,+ 1.0 / 252.0) - 1.0;+ }+ show_loading(QString("Fetching %1 and solving %2...").arg(tk, obj));+ AIQuantLabService::instance().fort_mean_cvar_optimize(params);+ });+ cvol->addWidget(cvopt_run);+ cvol->addStretch();+ tabs->addTab(cvopt, "CVaR Optimize");++ // ── Efficient Frontier ───────────────────────────────────────────────────+ auto* ef = new QWidget(this);+ auto* efl = new QVBoxLayout(ef);+ efl->setContentsMargins(12, 12, 12, 12);+ efl->setSpacing(8);++ auto ef_assets = build_fort_asset_row("ft_ef", ef, text_inputs_, combo_inputs_);+ efl->addWidget(build_input_row("Tickers", ef_assets.tickers_edit, ef));+ efl->addWidget(build_input_row("History Period", ef_assets.period_combo, ef));++ auto* ef_n = new QSpinBox(ef);+ ef_n->setRange(5, 50);+ ef_n->setValue(20);+ ef_n->setStyleSheet(spinbox_ss());+ int_inputs_["ft_ef_n_points"] = ef_n;+ efl->addWidget(build_input_row("Frontier Points", ef_n, ef));++ auto* ef_long = new QComboBox(ef);+ ef_long->addItems({"true", "false"});+ ef_long->setStyleSheet(combo_ss());+ combo_inputs_["ft_ef_long_only"] = ef_long;+ efl->addWidget(build_input_row("Long Only", ef_long, ef));++ auto* ef_max = make_double_spin(0.0, 1.0, 0.5, 2, "", ef);+ ef_max->setSpecialValueText("none");+ double_inputs_["ft_ef_max"] = ef_max;+ efl->addWidget(build_input_row("Max Single-Asset Weight (0 = none)", ef_max, ef));++ auto* ef_rf = make_double_spin(0, 20, 4.5, 2, "%", ef);+ double_inputs_["ft_ef_rf"] = ef_rf;+ efl->addWidget(build_input_row("Risk-Free Rate (annual)", ef_rf, ef));++ auto* ef_run = make_run_button("BUILD EFFICIENT FRONTIER", ef);+ connect(ef_run, &QPushButton::clicked, this, [this]() {+ const QString tk = text_inputs_["ft_ef_tickers"]->text().trimmed();+ if (tk.isEmpty()) {+ display_error("Enter at least 2 tickers.");+ return;+ }+ QJsonObject params;+ params["tickers"] = tk;+ params["period"] = combo_inputs_["ft_ef_period"]->currentText();+ params["n_points"] = int_inputs_["ft_ef_n_points"]->value();+ params["long_only"] = combo_inputs_["ft_ef_long_only"]->currentText() == "true";+ const double maxw = double_inputs_["ft_ef_max"]->value();+ if (maxw > 0.0) params["max_weight"] = maxw;+ params["risk_free_rate"] = double_inputs_["ft_ef_rf"]->value() / 100.0 / 252.0;+ show_loading(QString("Fetching %1 and tracing %2-point frontier...")+ .arg(tk).arg(int_inputs_["ft_ef_n_points"]->value()));+ AIQuantLabService::instance().fort_efficient_frontier(params);+ });+ efl->addWidget(ef_run);+ efl->addStretch();+ tabs->addTab(ef, "Efficient Frontier");++ // ── Exponential Decay Probabilities ──────────────────────────────────────+ auto* ed = new QWidget(this);+ auto* edl = new QVBoxLayout(ed);+ edl->setContentsMargins(12, 12, 12, 12);+ edl->setSpacing(8);++ auto ed_assets = build_fort_asset_row("ft_ed", ed, text_inputs_, combo_inputs_);+ edl->addWidget(build_input_row("Tickers", ed_assets.tickers_edit, ed));+ edl->addWidget(build_input_row("History Period", ed_assets.period_combo, ed));++ auto* ed_hl = new QSpinBox(ed);+ ed_hl->setRange(5, 1000);+ ed_hl->setValue(60);+ ed_hl->setSuffix(" obs");+ ed_hl->setStyleSheet(spinbox_ss());+ int_inputs_["ft_ed_half_life"] = ed_hl;+ edl->addWidget(build_input_row("Half-Life (observations)", ed_hl, ed));++ auto* ed_hint = new QLabel(+ "Builds exponentially-decayed scenario weights so recent observations dominate. "+ "ESS (Kish effective sample size) tells you how much of the history you're effectively using.", ed);+ ed_hint->setWordWrap(true);+ ed_hint->setStyleSheet(QString("color:%1; font-size:10px;").arg(ui::colors::TEXT_TERTIARY()));+ edl->addWidget(ed_hint);++ auto* ed_run = make_run_button("COMPUTE DECAY WEIGHTS", ed);+ connect(ed_run, &QPushButton::clicked, this, [this]() {+ const QString tk = text_inputs_["ft_ed_tickers"]->text().trimmed();+ if (tk.isEmpty()) {+ display_error("Enter at least 2 tickers (used only for series length).");+ return;+ }+ QJsonObject params;+ params["tickers"] = tk;+ params["period"] = combo_inputs_["ft_ed_period"]->currentText();+ params["half_life"] = int_inputs_["ft_ed_half_life"]->value();+ show_loading(QString("Computing %1-day half-life decay on %2...")+ .arg(int_inputs_["ft_ed_half_life"]->value()).arg(tk));+ AIQuantLabService::instance().fort_exp_decay_probabilities(params);+ });+ edl->addWidget(ed_run);+ edl->addStretch();+ tabs->addTab(ed, "Decay Weights");++ vl->addWidget(tabs);++ auto* rc = new QWidget(w);+ results_layout_ = new QVBoxLayout(rc);+ results_layout_->setContentsMargins(0, 8, 0, 0);+ results_layout_->setSpacing(8);+ vl->addWidget(rc);++ return w;+}++// ── FORTITUDO: rich card-based display per command ──────────────────────────++void QuantModulePanel::display_fortitudo_result(const QString& command, const QJsonObject& payload) {+ clear_results();++ if (!payload.value("success").toBool(false)) {+ const QString err = payload.value("error").toString("Unknown error");+ const QString kind = payload.value("error_kind").toString();+ const QString prefix = kind == "validation" ? "Input error: "+ : kind == "runtime" ? "Computation failed: "+ : "";+ display_error(prefix + err);+ return;+ }++ const QJsonObject d = payload.value("data").toObject();+ const QString accent = module_.color.name();++ // Section header — same shape as other rich displays+ QString header_text = command.toUpper();+ header_text.replace('_', ' ');+ if (d.contains("n_assets"))+ header_text += QString(" | %1 ASSETS").arg(d.value("n_assets").toInt());+ if (d.contains("n_scenarios"))+ header_text += QString(" | %1 SCENARIOS").arg(d.value("n_scenarios").toInt());+ else if (d.contains("n_observations"))+ header_text += QString(" | %1 OBS").arg(d.value("n_observations").toInt());+ results_layout_->addWidget(gs_section_header(header_text, accent));++ // ── 1. CHECK STATUS ──────────────────────────────────────────────────────+ if (command == "check_status") {+ auto bool_card = [this](const QString& label, bool ok) {+ return gs_make_card(label, ok ? "AVAILABLE" : "MISSING", this,+ ok ? ui::colors::POSITIVE() : ui::colors::NEGATIVE());+ };+ QList<QWidget*> deps = {+ bool_card("OPTIMIZATION", d.value("wrappers_optimization").toBool()),+ bool_card("FUNCTIONS", d.value("wrappers_functions").toBool()),+ bool_card("NATIVE FORTITUDO", d.value("native_fortitudo_tech").toBool()),+ gs_make_card("MODE", d.value("mode").toString().toUpper(), this, ui::colors::INFO()),+ };+ results_layout_->addWidget(gs_card_row(deps, this));+ const auto ops = d.value("ops_available").toArray();+ QStringList names;+ for (const auto& v : ops) names << v.toString();+ auto* lbl = new QLabel(QString("Operations: %1").arg(names.join(", ")));+ lbl->setWordWrap(true);+ lbl->setStyleSheet(QString("color:%1; font-size:10px; font-family:'Courier New';"+ "padding:8px 10px; background:%2; border:1px solid %3;")+ .arg(ui::colors::TEXT_SECONDARY(), ui::colors::BG_SURFACE(),+ ui::colors::BORDER_DIM()));+ results_layout_->addWidget(lbl);+ status_label_->setText("Fortitudo backend ready");+ return;+ }++ // ── 2. PORTFOLIO METRICS ─────────────────────────────────────────────────+ if (command == "portfolio_metrics") {+ const double exp_ret = d.value("expected_return").toDouble();+ const double vol = d.value("volatility").toDouble();+ const double sharpe = d.value("sharpe_ratio").toDouble();+ const double ann_ret = d.value("annualized_return").toDouble();+ const double ann_vol = d.value("annualized_volatility").toDouble();+ const double var_pct = d.value("var_pct").toDouble();+ const double cvar_pct = d.value("cvar_pct").toDouble();+ const double hhi = d.value("concentration_hhi").toDouble();++ QList<QWidget*> ann = {+ gs_make_card("ANN. RETURN", QString::number(ann_ret * 100, 'f', 2) + "%", this,+ gs_pos_neg_color(ann_ret)),+ gs_make_card("ANN. VOLATILITY", QString::number(ann_vol * 100, 'f', 2) + "%", this),+ gs_make_card("SHARPE RATIO", gs_fmt_num(sharpe, 4), this,+ sharpe >= 1.0 ? ui::colors::POSITIVE()+ : sharpe >= 0 ? ui::colors::TEXT_PRIMARY()+ : ui::colors::NEGATIVE()),+ gs_make_card("ALPHA (CVaR)", QString::number(d.value("alpha").toDouble() * 100, 'f', 1) + "%",+ this, ui::colors::INFO()),+ };+ results_layout_->addWidget(gs_card_row(ann, this));++ QList<QWidget*> daily = {+ gs_make_card("DAILY RETURN", QString::number(exp_ret * 100, 'f', 4) + "%", this,+ gs_pos_neg_color(exp_ret)),+ gs_make_card("DAILY VOL", QString::number(vol * 100, 'f', 4) + "%", this),+ gs_make_card("VaR", QString::number(var_pct, 'f', 2) + "%", this,+ var_pct < -2 ? ui::colors::NEGATIVE() : ui::colors::WARNING()),+ gs_make_card("CVaR (Expected Shortfall)", QString::number(cvar_pct, 'f', 2) + "%", this,+ cvar_pct < -2 ? ui::colors::NEGATIVE() : ui::colors::WARNING()),+ };+ results_layout_->addWidget(gs_card_row(daily, this));++ QList<QWidget*> conc = {+ gs_make_card("CONCENTRATION (HHI)", gs_fmt_num(hhi, 4), this,+ hhi > 0.4 ? ui::colors::WARNING() : ui::colors::POSITIVE()),+ gs_make_card("MAX WEIGHT", QString::number(d.value("max_weight").toDouble() * 100, 'f', 2) + "%", this),+ gs_make_card("MIN WEIGHT", QString::number(d.value("min_weight").toDouble() * 100, 'f', 2) + "%", this),+ gs_make_card("EFFECTIVE ASSETS",+ hhi > 0 ? gs_fmt_num(1.0 / hhi, 2) : QString("—"), this,+ ui::colors::INFO()),+ };+ results_layout_->addWidget(gs_card_row(conc, this));++ const QJsonArray weights = d.value("weights").toArray();+ if (!weights.isEmpty()) {+ results_layout_->addWidget(fort_weights_table(weights, this));+ }++ status_label_->setText(QString("Sharpe %1 | Ann. Ret %2% | Ann. Vol %3% | HHI %4")+ .arg(sharpe, 0, 'f', 3)+ .arg(ann_ret * 100, 0, 'f', 2)+ .arg(ann_vol * 100, 0, 'f', 2)+ .arg(hhi, 0, 'f', 3));+ return;+ }++ // ── 3. COVARIANCE / CORRELATION / MOMENTS ───────────────────────────────+ if (command == "covariance_matrix") {+ const double avg_corr = d.value("avg_off_diag_correlation").toDouble();+ QList<QWidget*> top = {+ gs_make_card("ASSETS", QString::number(d.value("n_assets").toInt()), this),+ gs_make_card("OBSERVATIONS", QString::number(d.value("n_observations").toInt()), this),+ gs_make_card("AVG OFF-DIAG ρ", gs_fmt_num(avg_corr, 4), this,+ std::abs(avg_corr) > 0.5 ? ui::colors::WARNING()+ : ui::colors::TEXT_PRIMARY()),+ gs_make_card("MAX |ρ|", gs_fmt_num(std::max(std::abs(d.value("max_off_diag_correlation").toDouble()),+ std::abs(d.value("min_off_diag_correlation").toDouble())), 4),+ this),+ };+ results_layout_->addWidget(gs_card_row(top, this));++ // Per-asset moments table+ const QJsonArray moments = d.value("moments").toArray();+ if (!moments.isEmpty()) {+ const auto first = moments[0].toObject();+ QStringList headers = {"Asset"};+ QStringList keys;+ for (auto it = first.begin(); it != first.end(); ++it) {+ if (it.key() == "asset") continue;+ keys << it.key();+ QString h = it.key();+ if (!h.isEmpty()) h[0] = h[0].toUpper();+ headers << h;+ }+ auto* mt = new QTableWidget(moments.size(), headers.size(), this);+ mt->setHorizontalHeaderLabels(headers);+ mt->verticalHeader()->setVisible(false);+ mt->setEditTriggers(QAbstractItemView::NoEditTriggers);+ mt->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ mt->setStyleSheet(table_ss());+ mt->setMaximumHeight(qMin(moments.size() * 24 + 32, 280));+ for (int r = 0; r < moments.size(); ++r) {+ const auto row = moments[r].toObject();+ mt->setItem(r, 0, new QTableWidgetItem(row.value("asset").toString()));+ for (int c = 0; c < keys.size(); ++c) {+ auto* it = new QTableWidgetItem(+ QString::number(row.value(keys[c]).toDouble(), 'f', 6));+ it->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ mt->setItem(r, c + 1, it);+ }+ mt->setRowHeight(r, 22);+ }+ auto* mlbl = new QLabel("PER-ASSET MOMENTS");+ mlbl->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; padding:4px 0 0 2px;")+ .arg(ui::colors::TEXT_TERTIARY()));+ results_layout_->addWidget(mlbl);+ results_layout_->addWidget(mt);+ }++ // Correlation matrix+ const QJsonArray corr = d.value("correlation_matrix").toArray();+ if (!corr.isEmpty()) {+ const auto first = corr[0].toObject();+ QStringList headers = {"Asset"};+ QStringList keys;+ for (auto it = first.begin(); it != first.end(); ++it) {+ if (it.key() == "asset") continue;+ keys << it.key();+ headers << it.key();+ }+ auto* ct = new QTableWidget(corr.size(), headers.size(), this);+ ct->setHorizontalHeaderLabels(headers);+ ct->verticalHeader()->setVisible(false);+ ct->setEditTriggers(QAbstractItemView::NoEditTriggers);+ ct->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);+ ct->setStyleSheet(table_ss());+ ct->setMaximumHeight(qMin(corr.size() * 24 + 32, 280));+ for (int r = 0; r < corr.size(); ++r) {+ const auto row = corr[r].toObject();+ ct->setItem(r, 0, new QTableWidgetItem(row.value("asset").toString()));+ for (int c = 0; c < keys.size(); ++c) {+ const double cv = row.value(keys[c]).toDouble();+ auto* it = new QTableWidgetItem(QString::number(cv, 'f', 3));+ it->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ if (r == c) {+ it->setForeground(QColor(ui::colors::TEXT_TERTIARY()));+ } else if (cv > 0.5) {+ it->setForeground(QColor(ui::colors::POSITIVE()));+ } else if (cv < -0.5) {+ it->setForeground(QColor(ui::colors::NEGATIVE()));+ }+ ct->setItem(r, c + 1, it);+ }+ ct->setRowHeight(r, 22);+ }+ auto* clbl = new QLabel("CORRELATION MATRIX");+ clbl->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; padding:4px 0 0 2px;")+ .arg(ui::colors::TEXT_TERTIARY()));+ results_layout_->addWidget(clbl);+ results_layout_->addWidget(ct);+ }++ status_label_->setText(QString("%1 assets | %2 obs | avg ρ = %3")+ .arg(d.value("n_assets").toInt())+ .arg(d.value("n_observations").toInt())+ .arg(avg_corr, 0, 'f', 4));+ return;+ }++ // ── 4. MV / CVaR OPTIMIZATION (shared display path) ─────────────────────+ if (command == "mean_variance_optimize" || command == "mean_cvar_optimize") {+ const QString objective = d.value("objective").toString();+ const double sharpe = d.value("sharpe_ratio").toDouble();+ const double ann_ret = d.value("annualized_return").toDouble();+ const double ann_vol = d.value("annualized_volatility").toDouble();+ const double var = d.value("var").toDouble();+ const double cvar = d.value("cvar").toDouble();+ const double hhi = d.value("concentration_hhi").toDouble();++ auto* hdr = new QLabel(QString("OBJECTIVE: %1 | LONG-ONLY: %2")+ .arg(objective.toUpper().replace('_', ' '))+ .arg(d.value("long_only").toBool() ? "YES" : "NO"));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(), accent));+ results_layout_->addWidget(hdr);++ QList<QWidget*> top = {+ gs_make_card("ANN. RETURN", QString::number(ann_ret * 100, 'f', 2) + "%", this,+ gs_pos_neg_color(ann_ret)),+ gs_make_card("ANN. VOLATILITY", QString::number(ann_vol * 100, 'f', 2) + "%", this),+ gs_make_card("SHARPE RATIO", gs_fmt_num(sharpe, 4), this,+ sharpe >= 1.0 ? ui::colors::POSITIVE()+ : sharpe >= 0 ? ui::colors::TEXT_PRIMARY()+ : ui::colors::NEGATIVE()),+ gs_make_card("CONCENTRATION (HHI)", gs_fmt_num(hhi, 4), this,+ hhi > 0.4 ? ui::colors::WARNING() : ui::colors::POSITIVE()),+ };+ results_layout_->addWidget(gs_card_row(top, this));++ if (command == "mean_cvar_optimize") {+ QList<QWidget*> tail = {+ gs_make_card("CVaR @ α", QString::number(cvar * 100, 'f', 4) + "%", this,+ ui::colors::NEGATIVE()),+ gs_make_card("VaR @ α", QString::number(var * 100, 'f', 4) + "%", this,+ ui::colors::WARNING()),+ gs_make_card("ALPHA",+ QString::number(d.value("alpha").toDouble() * 100, 'f', 1) + "%",+ this, ui::colors::INFO()),+ gs_make_card("MAX WEIGHT",+ QString::number(d.value("max_weight").toDouble() * 100, 'f', 2) + "%", this),+ };+ results_layout_->addWidget(gs_card_row(tail, this));+ } else {+ QList<QWidget*> mv_extra = {+ gs_make_card("VARIANCE", gs_fmt_num(d.value("variance").toDouble(), 6), this),+ gs_make_card("DAILY RETURN",+ QString::number(d.value("expected_return").toDouble() * 100, 'f', 4) + "%",+ this),+ gs_make_card("MAX WEIGHT",+ QString::number(d.value("max_weight").toDouble() * 100, 'f', 2) + "%", this),+ gs_make_card("MIN WEIGHT",+ QString::number(d.value("min_weight").toDouble() * 100, 'f', 2) + "%", this),+ };+ results_layout_->addWidget(gs_card_row(mv_extra, this));+ }++ const QJsonArray weights = d.value("weights").toArray();+ if (!weights.isEmpty()) {+ auto* wlbl = new QLabel("OPTIMAL WEIGHTS");+ wlbl->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; padding:4px 0 0 2px;")+ .arg(ui::colors::TEXT_TERTIARY()));+ results_layout_->addWidget(wlbl);+ results_layout_->addWidget(fort_weights_table(weights, this));+ }++ status_label_->setText(QString("%1 — Sharpe %2 | Ann. Ret %3% | Ann. Vol %4%")+ .arg(objective)+ .arg(sharpe, 0, 'f', 3)+ .arg(ann_ret * 100, 0, 'f', 2)+ .arg(ann_vol * 100, 0, 'f', 2));+ return;+ }++ // ── 5. EFFICIENT FRONTIER ───────────────────────────────────────────────+ if (command == "efficient_frontier") {+ const int n = d.value("n_points").toInt();+ const int max_sharpe_idx = d.value("max_sharpe_index").toInt();+ const int min_var_idx = d.value("min_var_index").toInt();+ const double best_sharpe = d.value("best_sharpe").toDouble();++ auto* hdr = new QLabel(QString("FRONTIER: %1 POINTS | ASSETS: %2 | LONG-ONLY: %3")+ .arg(n).arg(d.value("n_assets").toInt())+ .arg(d.value("long_only").toBool() ? "YES" : "NO"));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(), accent));+ results_layout_->addWidget(hdr);++ QList<QWidget*> top = {+ gs_make_card("BEST SHARPE", gs_fmt_num(best_sharpe, 4), this,+ best_sharpe >= 1.0 ? ui::colors::POSITIVE()+ : best_sharpe >= 0 ? ui::colors::TEXT_PRIMARY()+ : ui::colors::NEGATIVE()),+ gs_make_card("MAX SHARPE @", QString("Point #%1").arg(max_sharpe_idx + 1),+ this, ui::colors::POSITIVE()),+ gs_make_card("MIN VARIANCE @", QString("Point #%1").arg(min_var_idx + 1),+ this, ui::colors::INFO()),+ gs_make_card("RANGE", QString::number(d.value("min_volatility").toDouble() * 100, 'f', 2) ++ "% → " ++ QString::number(d.value("max_volatility").toDouble() * 100, 'f', 2) + "%",+ this),+ };+ results_layout_->addWidget(gs_card_row(top, this));++ // Frontier table — every point with annualized stats+ const QJsonArray frontier = d.value("frontier").toArray();+ if (!frontier.isEmpty()) {+ auto* table = new QTableWidget(frontier.size(), 5, this);+ table->setHorizontalHeaderLabels({"#", "Daily Vol", "Daily Ret", "Sharpe", "Ann. Vol → Ret"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->setSelectionMode(QAbstractItemView::SingleSelection);+ table->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents);+ table->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents);+ table->horizontalHeader()->setSectionResizeMode(2, QHeaderView::ResizeToContents);+ table->horizontalHeader()->setSectionResizeMode(3, QHeaderView::ResizeToContents);+ table->horizontalHeader()->setSectionResizeMode(4, QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(frontier.size() * 24 + 32, 380));+ for (int i = 0; i < frontier.size(); ++i) {+ const auto p = frontier[i].toObject();+ const double vol = p.value("volatility").toDouble();+ const double ret = p.value("expected_return").toDouble();+ const double sh = p.value("sharpe_ratio").toDouble();+ const double avol = p.value("annualized_volatility").toDouble();+ const double aret = p.value("annualized_return").toDouble();++ QString tag = QString::number(i + 1);+ if (i == max_sharpe_idx) tag += " ★";+ if (i == min_var_idx) tag += " ◆";+ auto* ti = new QTableWidgetItem(tag);+ if (i == max_sharpe_idx) ti->setForeground(QColor(ui::colors::POSITIVE()));+ else if (i == min_var_idx) ti->setForeground(QColor(ui::colors::INFO()));+ table->setItem(i, 0, ti);++ auto add_num = [&](int col, const QString& s, const QString& col_color = {}) {+ auto* it = new QTableWidgetItem(s);+ it->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ if (!col_color.isEmpty()) it->setForeground(QColor(col_color));+ table->setItem(i, col, it);+ };+ add_num(1, QString::number(vol * 100, 'f', 4) + "%");+ add_num(2, QString::number(ret * 100, 'f', 4) + "%", gs_pos_neg_color(ret));+ add_num(3, QString::number(sh, 'f', 4),+ sh >= 1.0 ? ui::colors::POSITIVE()+ : sh >= 0 ? ui::colors::TEXT_PRIMARY()+ : ui::colors::NEGATIVE());+ add_num(4, QString::number(avol * 100, 'f', 2) + "% → " ++ QString::number(aret * 100, 'f', 2) + "%",+ gs_pos_neg_color(aret));+ table->setRowHeight(i, 24);+ }+ results_layout_->addWidget(table);++ // Show the max-sharpe portfolio's weights below the table+ if (max_sharpe_idx >= 0 && max_sharpe_idx < frontier.size()) {+ const auto best = frontier[max_sharpe_idx].toObject();+ const auto best_weights = best.value("weights").toArray();+ if (!best_weights.isEmpty()) {+ QJsonArray with_pct;+ for (const auto& v : best_weights) {+ auto o = v.toObject();+ o["weight_pct"] = o.value("weight").toDouble() * 100.0;+ with_pct.append(o);+ }+ auto* lbl = new QLabel(QString("MAX-SHARPE PORTFOLIO WEIGHTS (★ Point #%1)")+ .arg(max_sharpe_idx + 1));+ lbl->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; padding:6px 0 0 2px;")+ .arg(ui::colors::POSITIVE()));+ results_layout_->addWidget(lbl);+ results_layout_->addWidget(fort_weights_table(with_pct, this));+ }+ }+ }++ status_label_->setText(QString("%1 frontier points | best Sharpe %2 @ point %3")+ .arg(n).arg(best_sharpe, 0, 'f', 3).arg(max_sharpe_idx + 1));+ return;+ }++ // ── 6. EXPONENTIAL DECAY PROBABILITIES ──────────────────────────────────+ if (command == "exp_decay_probabilities") {+ const int n = d.value("n_scenarios").toInt();+ const int hl = d.value("half_life").toInt();+ const double ess = d.value("effective_sample_size").toDouble();+ const double ess_pct = d.value("ess_pct_of_n").toDouble();+ const double ratio = d.value("weight_ratio_last_to_first").toDouble();++ QList<QWidget*> top = {+ gs_make_card("HALF-LIFE", QString("%1 obs").arg(hl), this, ui::colors::INFO()),+ gs_make_card("EFFECTIVE SAMPLE", gs_fmt_num(ess, 1), this,+ ess_pct > 50 ? ui::colors::POSITIVE()+ : ess_pct > 25 ? ui::colors::WARNING()+ : ui::colors::NEGATIVE()),+ gs_make_card("ESS % OF N", QString::number(ess_pct, 'f', 1) + "%", this,+ ess_pct > 50 ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ gs_make_card("LAST/FIRST RATIO", QString("%1×").arg(ratio, 0, 'f', 2),+ this, ui::colors::INFO()),+ };+ results_layout_->addWidget(gs_card_row(top, this));++ QList<QWidget*> bounds = {+ gs_make_card("FIRST WEIGHT", gs_fmt_num(d.value("first_weight").toDouble(), 6), this),+ gs_make_card("LAST WEIGHT", gs_fmt_num(d.value("last_weight").toDouble(), 6), this,+ ui::colors::POSITIVE()),+ gs_make_card("MIN WEIGHT", gs_fmt_num(d.value("min_weight").toDouble(), 6), this),+ gs_make_card("MAX WEIGHT", gs_fmt_num(d.value("max_weight").toDouble(), 6), this),+ };+ results_layout_->addWidget(gs_card_row(bounds, this));++ // Sampled weights curve+ const QJsonArray weights = d.value("weights").toArray();+ if (!weights.isEmpty()) {+ auto* table = new QTableWidget(weights.size(), 2, this);+ table->setHorizontalHeaderLabels({"Date / Index", "Weight"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->setSelectionMode(QAbstractItemView::NoSelection);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(weights.size() * 22 + 32, 360));+ for (int i = 0; i < weights.size(); ++i) {+ const auto o = weights[i].toObject();+ const QString label = o.contains("date") ? o.value("date").toString()+ : QString::number(o.value("index").toInt());+ table->setItem(i, 0, new QTableWidgetItem(label));+ auto* wi = new QTableWidgetItem(+ QString::number(o.value("weight").toDouble(), 'f', 6));+ wi->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ // Color gradient: bigger weight → more saturated+ const double w = o.value("weight").toDouble();+ if (w > d.value("max_weight").toDouble() * 0.7) {+ wi->setForeground(QColor(ui::colors::POSITIVE()));+ } else if (w < d.value("max_weight").toDouble() * 0.1) {+ wi->setForeground(QColor(ui::colors::TEXT_TERTIARY()));+ }+ table->setItem(i, 1, wi);+ table->setRowHeight(i, 22);+ }+ results_layout_->addWidget(table);+ }++ status_label_->setText(QString("Half-life %1 obs | ESS %2 (%3%%) | last/first %4×")+ .arg(hl).arg(ess, 0, 'f', 1).arg(ess_pct, 0, 'f', 1)+ .arg(ratio, 0, 'f', 1));+ return;+ }++ // ── Fallback ─────────────────────────────────────────────────────────────+ display_result(d);+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Functime.cpp b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Functime.cppnew file mode 100644index 000000000..d735b617c--- /dev/null+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Functime.cpp@@ -0,0 +1,919 @@+// src/screens/ai_quant_lab/QuantModulePanel_Functime.cpp+//+// Functime panel — 6 analysis modes (forecast, anomaly, seasonality, metrics,+// confidence intervals, stationarity). Mirrors the GS Quant pattern. Extracted+// from QuantModulePanel.cpp to keep that file maintainable.+#include "screens/ai_quant_lab/QuantModulePanel.h"+#include "screens/ai_quant_lab/QuantModulePanel_Common.h"+#include "screens/ai_quant_lab/QuantModulePanel_GsHelpers.h"+#include "screens/ai_quant_lab/QuantModulePanel_Styles.h"++#include "services/ai_quant_lab/AIQuantLabService.h"+#include "ui/theme/Theme.h"++#include <QAbstractItemView>+#include <QColor>+#include <QComboBox>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QJsonArray>+#include <QJsonObject>+#include <QLabel>+#include <QLineEdit>+#include <QList>+#include <QPointer>+#include <QPushButton>+#include <QSpinBox>+#include <QString>+#include <QStringList>+#include <QTabWidget>+#include <QTableWidget>+#include <QTableWidgetItem>+#include <QVBoxLayout>+#include <QWidget>++#include <algorithm>+#include <cmath>++namespace fincept::screens {++using namespace fincept::services::quant;+using namespace fincept::screens::quant_styles;+using namespace fincept::screens::quant_common;+using namespace fincept::screens::quant_gs_helpers;++// ═══════════════════════════════════════════════════════════════════════════════+// FUNCTIME PANEL — 6 analysis modes (forecast, anomaly, seasonality, metrics,+// confidence intervals, stationarity). Mirrors the GS Quant pattern.+// ═══════════════════════════════════════════════════════════════════════════════++QWidget* QuantModulePanel::build_functime_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ // Local sample-button helper — same shape as gs_quant's+ auto add_sample_btn = [this](QLineEdit* edit, QWidget* parent, unsigned seed,+ const QString& tip, bool walk = false) -> QPushButton* {+ auto* btn = new QPushButton("LOAD SAMPLE", parent);+ btn->setCursor(Qt::PointingHandCursor);+ btn->setFixedHeight(22);+ btn->setToolTip(tip);+ btn->setStyleSheet(QString("QPushButton { color:%1; background:transparent; border:1px solid %2;"+ "padding:0 8px; font-size:9px; font-weight:700; letter-spacing:0.5px; border-radius:2px; }"+ "QPushButton:hover { color:%3; border-color:%3; background:rgba(255,255,255,0.04); }")+ .arg(ui::colors::TEXT_TERTIARY(), ui::colors::BORDER_DIM(), module_.color.name()));+ QPointer<QLineEdit> guard(edit);+ connect(btn, &QPushButton::clicked, this, [guard, seed, walk]() {+ if (guard) guard->setText(walk ? sample_random_walk(seed) : sample_series(seed));+ });+ return btn;+ };++ // ── Forecast ─────────────────────────────────────────────────────────────+ auto* fc = new QWidget(this);+ auto* fcl = new QVBoxLayout(fc);+ fcl->setContentsMargins(12, 12, 12, 12);+ fcl->setSpacing(8);++ auto* fc_vals = new QLineEdit(fc);+ fc_vals->setPlaceholderText("Time series values (>= 30). CSV, space, or newline separated.");+ fc_vals->setStyleSheet(input_ss());+ text_inputs_["fn_fc_values"] = fc_vals;+ fcl->addWidget(build_input_row("Series Values", fc_vals, fc));+ fcl->addWidget(add_sample_btn(fc_vals, fc, 11,+ "200-pt synthetic series: trend + 30-pt seasonal cycle + noise"));++ auto* fc_model = new QComboBox(fc);+ fc_model->addItems({"linear", "ridge", "lasso", "elasticnet", "knn", "naive", "drift",+ "holt_winters", "arima"});+ fc_model->setStyleSheet(combo_ss());+ combo_inputs_["fn_fc_model"] = fc_model;+ fcl->addWidget(build_input_row("Model", fc_model, fc));++ auto* fc_horizon = new QSpinBox(fc);+ fc_horizon->setRange(1, 365);+ fc_horizon->setValue(14);+ fc_horizon->setStyleSheet(spinbox_ss());+ int_inputs_["fn_fc_horizon"] = fc_horizon;+ fcl->addWidget(build_input_row("Forecast Horizon (steps)", fc_horizon, fc));++ auto* fc_lags = new QSpinBox(fc);+ fc_lags->setRange(1, 60);+ fc_lags->setValue(7);+ fc_lags->setStyleSheet(spinbox_ss());+ int_inputs_["fn_fc_lags"] = fc_lags;+ fcl->addWidget(build_input_row("Lag Window (ML models)", fc_lags, fc));++ auto* fc_season = new QSpinBox(fc);+ fc_season->setRange(0, 365);+ fc_season->setValue(0);+ fc_season->setSpecialValueText("none");+ fc_season->setStyleSheet(spinbox_ss());+ int_inputs_["fn_fc_season"] = fc_season;+ fcl->addWidget(build_input_row("Seasonal Period (HW/ARIMA)", fc_season, fc));++ auto* fc_alpha = make_double_spin(0.0001, 100, 1.0, 4, "", fc);+ double_inputs_["fn_fc_alpha"] = fc_alpha;+ fcl->addWidget(build_input_row("Regularization α (Ridge/Lasso/EN)", fc_alpha, fc));++ auto* fc_run = make_run_button("RUN FORECAST", fc);+ connect(fc_run, &QPushButton::clicked, this, [this]() {+ QJsonArray vals;+ QString bad;+ if (!parse_doubles(text_inputs_["fn_fc_values"]->text(), vals, &bad)) {+ display_error(QString("Series Values: '%1' is not numeric.").arg(bad));+ return;+ }+ if (vals.size() < 30) {+ display_error(QString("Need at least 30 observations; you provided %1. "+ "Click LOAD SAMPLE for 200.")+ .arg(vals.size()));+ return;+ }+ const QString model = combo_inputs_["fn_fc_model"]->currentText();+ show_loading(QString("Fitting %1 on %2 obs and projecting %3 steps...")+ .arg(model).arg(vals.size()).arg(int_inputs_["fn_fc_horizon"]->value()));+ QJsonObject params;+ params["values"] = vals;+ params["model"] = model;+ params["horizon"] = int_inputs_["fn_fc_horizon"]->value();+ params["lags"] = int_inputs_["fn_fc_lags"]->value();+ params["season"] = int_inputs_["fn_fc_season"]->value();+ params["alpha"] = double_inputs_["fn_fc_alpha"]->value();+ AIQuantLabService::instance().functime_forecast(params);+ });+ fcl->addWidget(fc_run);+ fcl->addStretch();+ tabs->addTab(fc, "Forecast");++ // ── Anomaly Detection ────────────────────────────────────────────────────+ auto* an = new QWidget(this);+ auto* anl = new QVBoxLayout(an);+ anl->setContentsMargins(12, 12, 12, 12);+ anl->setSpacing(8);++ auto* an_vals = new QLineEdit(an);+ an_vals->setPlaceholderText("Time series values (>= 20)");+ an_vals->setStyleSheet(input_ss());+ text_inputs_["fn_an_values"] = an_vals;+ anl->addWidget(build_input_row("Series Values", an_vals, an));+ anl->addWidget(add_sample_btn(an_vals, an, 21,+ "200-pt series — paste in your own outliers to test detection"));++ auto* an_method = new QComboBox(an);+ an_method->addItems({"zscore", "iqr", "isolation_forest", "residual"});+ an_method->setStyleSheet(combo_ss());+ combo_inputs_["fn_an_method"] = an_method;+ anl->addWidget(build_input_row("Detection Method", an_method, an));++ auto* an_thr = make_double_spin(0.5, 10.0, 3.0, 2, " σ", an);+ double_inputs_["fn_an_threshold"] = an_thr;+ anl->addWidget(build_input_row("Z-Score / Residual Threshold", an_thr, an));++ auto* an_iqr = make_double_spin(0.5, 5.0, 1.5, 2, "×", an);+ double_inputs_["fn_an_iqr_k"] = an_iqr;+ anl->addWidget(build_input_row("IQR Multiplier (IQR method)", an_iqr, an));++ auto* an_cont = make_double_spin(0.001, 0.5, 0.05, 3, "", an);+ double_inputs_["fn_an_contamination"] = an_cont;+ anl->addWidget(build_input_row("Expected Anomaly Fraction (Isolation Forest)", an_cont, an));++ auto* an_run = make_run_button("DETECT ANOMALIES", an);+ connect(an_run, &QPushButton::clicked, this, [this]() {+ QJsonArray vals;+ QString bad;+ if (!parse_doubles(text_inputs_["fn_an_values"]->text(), vals, &bad)) {+ display_error(QString("Series Values: '%1' is not numeric.").arg(bad));+ return;+ }+ if (vals.size() < 20) {+ display_error(QString("Need at least 20 observations; you provided %1.").arg(vals.size()));+ return;+ }+ const QString method = combo_inputs_["fn_an_method"]->currentText();+ show_loading(QString("Scanning %1 obs with %2...").arg(vals.size()).arg(method));+ QJsonObject params;+ params["values"] = vals;+ params["method"] = method;+ params["threshold"] = double_inputs_["fn_an_threshold"]->value();+ params["iqr_k"] = double_inputs_["fn_an_iqr_k"]->value();+ params["contamination"] = double_inputs_["fn_an_contamination"]->value();+ AIQuantLabService::instance().functime_anomaly_detection(params);+ });+ anl->addWidget(an_run);+ anl->addStretch();+ tabs->addTab(an, "Anomalies");++ // ── Seasonality ──────────────────────────────────────────────────────────+ auto* se = new QWidget(this);+ auto* sel = new QVBoxLayout(se);+ sel->setContentsMargins(12, 12, 12, 12);+ sel->setSpacing(8);++ auto* se_vals = new QLineEdit(se);+ se_vals->setPlaceholderText("Time series values (>= 24). Period auto-detected if left at 0.");+ se_vals->setStyleSheet(input_ss());+ text_inputs_["fn_se_values"] = se_vals;+ sel->addWidget(build_input_row("Series Values", se_vals, se));+ sel->addWidget(add_sample_btn(se_vals, se, 31,+ "200-pt series with embedded period-30 seasonality"));++ auto* se_period = new QSpinBox(se);+ se_period->setRange(0, 365);+ se_period->setValue(0);+ se_period->setSpecialValueText("auto");+ se_period->setStyleSheet(spinbox_ss());+ int_inputs_["fn_se_period"] = se_period;+ sel->addWidget(build_input_row("Period (0 = auto-detect)", se_period, se));++ auto* se_robust = new QComboBox(se);+ se_robust->addItems({"true", "false"});+ se_robust->setStyleSheet(combo_ss());+ combo_inputs_["fn_se_robust"] = se_robust;+ sel->addWidget(build_input_row("Robust STL", se_robust, se));++ auto* se_run = make_run_button("DECOMPOSE SEASONALITY", se);+ connect(se_run, &QPushButton::clicked, this, [this]() {+ QJsonArray vals;+ QString bad;+ if (!parse_doubles(text_inputs_["fn_se_values"]->text(), vals, &bad)) {+ display_error(QString("Series Values: '%1' is not numeric.").arg(bad));+ return;+ }+ if (vals.size() < 24) {+ display_error(QString("Need at least 24 observations; you provided %1.").arg(vals.size()));+ return;+ }+ show_loading(QString("Running STL decomposition on %1 obs...").arg(vals.size()));+ QJsonObject params;+ params["values"] = vals;+ params["period"] = int_inputs_["fn_se_period"]->value();+ params["robust"] = combo_inputs_["fn_se_robust"]->currentText() == "true";+ AIQuantLabService::instance().functime_seasonality(params);+ });+ sel->addWidget(se_run);+ sel->addStretch();+ tabs->addTab(se, "Seasonality");++ // ── Metrics ──────────────────────────────────────────────────────────────+ auto* me = new QWidget(this);+ auto* mel = new QVBoxLayout(me);+ mel->setContentsMargins(12, 12, 12, 12);+ mel->setSpacing(8);++ auto* me_act = new QLineEdit(me);+ me_act->setPlaceholderText("Actual values (must match predicted length)");+ me_act->setStyleSheet(input_ss());+ text_inputs_["fn_me_actual"] = me_act;+ mel->addWidget(build_input_row("Actual", me_act, me));+ mel->addWidget(add_sample_btn(me_act, me, 41,+ "100-pt synthetic 'actual' series (level ~50)"));++ auto* me_pred = new QLineEdit(me);+ me_pred->setPlaceholderText("Predicted values (same length as actual)");+ me_pred->setStyleSheet(input_ss());+ text_inputs_["fn_me_pred"] = me_pred;+ mel->addWidget(build_input_row("Predicted", me_pred, me));+ mel->addWidget(add_sample_btn(me_pred, me, 42,+ "100-pt synthetic 'predicted' series (similar shape, mild noise)"));++ auto* me_run = make_run_button("CALCULATE METRICS", me);+ connect(me_run, &QPushButton::clicked, this, [this]() {+ QJsonArray a, p;+ QString bad;+ if (!parse_doubles(text_inputs_["fn_me_actual"]->text(), a, &bad)) {+ display_error(QString("Actual: '%1' is not numeric.").arg(bad));+ return;+ }+ if (!parse_doubles(text_inputs_["fn_me_pred"]->text(), p, &bad)) {+ display_error(QString("Predicted: '%1' is not numeric.").arg(bad));+ return;+ }+ if (a.size() < 2 || p.size() < 2) {+ display_error("Need at least 2 observations in both actual and predicted.");+ return;+ }+ if (a.size() != p.size()) {+ display_error(QString("Actual (%1) and Predicted (%2) must have the same length.")+ .arg(a.size()).arg(p.size()));+ return;+ }+ show_loading(QString("Computing forecast accuracy on %1 pairs...").arg(a.size()));+ QJsonObject params;+ params["actual"] = a;+ params["predicted"] = p;+ AIQuantLabService::instance().functime_metrics(params);+ });+ mel->addWidget(me_run);+ mel->addStretch();+ tabs->addTab(me, "Metrics");++ // ── Confidence Intervals ─────────────────────────────────────────────────+ auto* ci = new QWidget(this);+ auto* cil = new QVBoxLayout(ci);+ cil->setContentsMargins(12, 12, 12, 12);+ cil->setSpacing(8);++ auto* ci_vals = new QLineEdit(ci);+ ci_vals->setPlaceholderText("Series values (training history, >= 30)");+ ci_vals->setStyleSheet(input_ss());+ text_inputs_["fn_ci_values"] = ci_vals;+ cil->addWidget(build_input_row("Series Values", ci_vals, ci));+ cil->addWidget(add_sample_btn(ci_vals, ci, 51,+ "200-pt synthetic series with seasonality"));++ auto* ci_method = new QComboBox(ci);+ ci_method->addItems({"bootstrap", "residual"});+ ci_method->setStyleSheet(combo_ss());+ combo_inputs_["fn_ci_method"] = ci_method;+ cil->addWidget(build_input_row("Interval Method", ci_method, ci));++ auto* ci_horizon = new QSpinBox(ci);+ ci_horizon->setRange(1, 90);+ ci_horizon->setValue(14);+ ci_horizon->setStyleSheet(spinbox_ss());+ int_inputs_["fn_ci_horizon"] = ci_horizon;+ cil->addWidget(build_input_row("Forecast Horizon", ci_horizon, ci));++ auto* ci_lags = new QSpinBox(ci);+ ci_lags->setRange(1, 60);+ ci_lags->setValue(7);+ ci_lags->setStyleSheet(spinbox_ss());+ int_inputs_["fn_ci_lags"] = ci_lags;+ cil->addWidget(build_input_row("Lag Window", ci_lags, ci));++ auto* ci_boot = new QSpinBox(ci);+ ci_boot->setRange(50, 1000);+ ci_boot->setValue(200);+ ci_boot->setStyleSheet(spinbox_ss());+ int_inputs_["fn_ci_n_boot"] = ci_boot;+ cil->addWidget(build_input_row("Bootstrap Iterations", ci_boot, ci));++ auto* ci_conf = make_double_spin(0.50, 0.999, 0.95, 3, "", ci);+ double_inputs_["fn_ci_confidence"] = ci_conf;+ cil->addWidget(build_input_row("Confidence Level", ci_conf, ci));++ auto* ci_run = make_run_button("BUILD INTERVALS", ci);+ connect(ci_run, &QPushButton::clicked, this, [this]() {+ QJsonArray vals;+ QString bad;+ if (!parse_doubles(text_inputs_["fn_ci_values"]->text(), vals, &bad)) {+ display_error(QString("Series Values: '%1' is not numeric.").arg(bad));+ return;+ }+ if (vals.size() < 30) {+ display_error(QString("Need at least 30 observations; you provided %1.").arg(vals.size()));+ return;+ }+ const QString method = combo_inputs_["fn_ci_method"]->currentText();+ show_loading(QString("Building %1 prediction intervals...").arg(method));+ QJsonObject params;+ params["values"] = vals;+ params["method"] = method;+ params["horizon"] = int_inputs_["fn_ci_horizon"]->value();+ params["lags"] = int_inputs_["fn_ci_lags"]->value();+ params["n_boot"] = int_inputs_["fn_ci_n_boot"]->value();+ params["confidence"] = double_inputs_["fn_ci_confidence"]->value();+ AIQuantLabService::instance().functime_confidence_intervals(params);+ });+ cil->addWidget(ci_run);+ cil->addStretch();+ tabs->addTab(ci, "Confidence Intervals");++ // ── Stationarity ─────────────────────────────────────────────────────────+ auto* st = new QWidget(this);+ auto* stl = new QVBoxLayout(st);+ stl->setContentsMargins(12, 12, 12, 12);+ stl->setSpacing(8);++ auto* st_vals = new QLineEdit(st);+ st_vals->setPlaceholderText("Series values (>= 30) — runs ADF + KPSS at each differencing order");+ st_vals->setStyleSheet(input_ss());+ text_inputs_["fn_st_values"] = st_vals;+ stl->addWidget(build_input_row("Series Values", st_vals, st));+ stl->addWidget(add_sample_btn(st_vals, st, 61,+ "150-pt random walk with drift — should require d=1", true));++ auto* st_max = new QSpinBox(st);+ st_max->setRange(0, 3);+ st_max->setValue(2);+ st_max->setStyleSheet(spinbox_ss());+ int_inputs_["fn_st_max_d"] = st_max;+ stl->addWidget(build_input_row("Max Differencing Order to Test", st_max, st));++ auto* st_run = make_run_button("RUN STATIONARITY TESTS", st);+ connect(st_run, &QPushButton::clicked, this, [this]() {+ QJsonArray vals;+ QString bad;+ if (!parse_doubles(text_inputs_["fn_st_values"]->text(), vals, &bad)) {+ display_error(QString("Series Values: '%1' is not numeric.").arg(bad));+ return;+ }+ if (vals.size() < 30) {+ display_error(QString("Need at least 30 observations; you provided %1.").arg(vals.size()));+ return;+ }+ show_loading(QString("Running ADF + KPSS up to d=%1...").arg(int_inputs_["fn_st_max_d"]->value()));+ QJsonObject params;+ params["values"] = vals;+ params["max_d"] = int_inputs_["fn_st_max_d"]->value();+ AIQuantLabService::instance().functime_stationarity(params);+ });+ stl->addWidget(st_run);+ stl->addStretch();+ tabs->addTab(st, "Stationarity");++ vl->addWidget(tabs);++ auto* rc = new QWidget(w);+ results_layout_ = new QVBoxLayout(rc);+ results_layout_->setContentsMargins(0, 8, 0, 0);+ results_layout_->setSpacing(8);+ vl->addWidget(rc);++ return w;+}++// ── FUNCTIME: rich card-based display per command ───────────────────────────++void QuantModulePanel::display_functime_result(const QString& command, const QJsonObject& payload) {+ clear_results();++ if (!payload.value("success").toBool(false)) {+ const QString err = payload.value("error").toString("Unknown error");+ const QString kind = payload.value("error_kind").toString();+ const QString prefix = kind == "validation" ? "Input error: "+ : kind == "runtime" ? "Computation failed: "+ : "";+ display_error(prefix + err);+ return;+ }++ const QJsonObject d = payload.value("data").toObject();+ const QString accent = module_.color.name();++ // Section header strip — shared with GS Quant for visual consistency.+ QString header_text = command.toUpper();+ header_text.replace('_', ' ');+ if (d.contains("n_observations"))+ header_text += QString(" | %1 OBS").arg(d.value("n_observations").toInt());+ results_layout_->addWidget(gs_section_header(header_text, accent));++ // ── 1. CHECK STATUS ──────────────────────────────────────────────────────+ if (command == "check_status") {+ auto bool_card = [this](const QString& label, bool ok) {+ return gs_make_card(label, ok ? "AVAILABLE" : "MISSING", this,+ ok ? ui::colors::POSITIVE() : ui::colors::NEGATIVE());+ };+ QList<QWidget*> deps = {+ bool_card("SKLEARN", d.value("sklearn").toBool()),+ bool_card("STATSMODELS", d.value("statsmodels").toBool()),+ bool_card("SCIPY", d.value("scipy").toBool()),+ gs_make_card("BACKEND", d.value("backend").toString().toUpper(), this),+ };+ results_layout_->addWidget(gs_card_row(deps, this));++ const auto ops = d.value("ops_available").toArray();+ QStringList op_names;+ for (const auto& v : ops) op_names << v.toString();+ auto* lbl = new QLabel(QString("Operations available: %1").arg(op_names.join(", ")));+ lbl->setWordWrap(true);+ lbl->setStyleSheet(QString("color:%1; font-size:10px; font-family:'Courier New';"+ "padding:8px 10px; background:%2; border:1px solid %3;")+ .arg(ui::colors::TEXT_SECONDARY(), ui::colors::BG_SURFACE(),+ ui::colors::BORDER_DIM()));+ results_layout_->addWidget(lbl);+ status_label_->setText("Functime backend ready");+ return;+ }++ // ── 2. FORECAST ──────────────────────────────────────────────────────────+ if (command == "forecast") {+ const QString model = d.value("model").toString();+ const int horizon = d.value("horizon").toInt();+ const int lags = d.value("lags").toInt();+ const double r2 = d.value("in_sample_r2").toDouble();+ const double mae = d.value("in_sample_mae").toDouble();+ const double rmse = d.value("in_sample_rmse").toDouble();+ const double resid_std = d.value("residual_std").toDouble();+ const double last_actual = d.value("last_actual").toDouble();+ const double first_fc = d.value("first_forecast").toDouble();+ const double last_fc = d.value("last_forecast").toDouble();++ auto* hdr = new QLabel(QString("MODEL %1 | HORIZON %2 STEPS | LAGS %3")+ .arg(model.toUpper()).arg(horizon).arg(lags));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border:1px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(),+ ui::colors::BORDER_DIM()));+ results_layout_->addWidget(hdr);++ QList<QWidget*> fit = {+ gs_make_card("IN-SAMPLE R²", gs_fmt_num(r2, 3), this,+ r2 >= 0.7 ? ui::colors::POSITIVE()+ : r2 >= 0.3 ? ui::colors::WARNING()+ : ui::colors::NEGATIVE()),+ gs_make_card("IN-SAMPLE MAE", gs_fmt_num(mae, 4), this),+ gs_make_card("IN-SAMPLE RMSE", gs_fmt_num(rmse, 4), this),+ gs_make_card("RESIDUAL σ", gs_fmt_num(resid_std, 4), this),+ };+ results_layout_->addWidget(gs_card_row(fit, this));++ const double drift = first_fc - last_actual;+ const double horizon_drift = last_fc - last_actual;+ QList<QWidget*> proj = {+ gs_make_card("LAST ACTUAL", gs_fmt_num(last_actual, 4), this),+ gs_make_card("FIRST FORECAST", gs_fmt_num(first_fc, 4), this, gs_pos_neg_color(drift)),+ gs_make_card("LAST FORECAST", gs_fmt_num(last_fc, 4), this, gs_pos_neg_color(horizon_drift)),+ gs_make_card("HORIZON Δ", gs_fmt_num(horizon_drift, 4), this, gs_pos_neg_color(horizon_drift)),+ };+ results_layout_->addWidget(gs_card_row(proj, this));++ QList<QWidget*> bounds = {+ gs_make_card("FORECAST MIN", gs_fmt_num(d.value("forecast_min").toDouble(), 4), this,+ ui::colors::NEGATIVE()),+ gs_make_card("FORECAST MEAN", gs_fmt_num(d.value("forecast_mean").toDouble(), 4), this),+ gs_make_card("FORECAST MAX", gs_fmt_num(d.value("forecast_max").toDouble(), 4), this,+ ui::colors::POSITIVE()),+ gs_make_card("SEASON USED", d.value("season").toInt() > 0+ ? QString::number(d.value("season").toInt())+ : QString("none"), this),+ };+ results_layout_->addWidget(gs_card_row(bounds, this));++ // Forecast table — every step+ const QJsonArray forecast = d.value("forecast").toArray();+ if (!forecast.isEmpty()) {+ auto* table = new QTableWidget(forecast.size(), 3, this);+ table->setHorizontalHeaderLabels({"Step", "Date", "Forecast"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->setSelectionMode(QAbstractItemView::NoSelection);+ table->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents);+ table->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);+ table->horizontalHeader()->setSectionResizeMode(2, QHeaderView::ResizeToContents);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(forecast.size() * 24 + 32, 320));+ for (int i = 0; i < forecast.size(); ++i) {+ const auto o = forecast[i].toObject();+ const double v = o.value("value").toDouble();+ const double delta = v - last_actual;+ table->setItem(i, 0, new QTableWidgetItem(QString::number(i + 1)));+ table->setItem(i, 1, new QTableWidgetItem(o.value("date").toString()));+ auto* val_item = new QTableWidgetItem(QString::number(v, 'f', 4));+ val_item->setForeground(QColor(gs_pos_neg_color(delta)));+ val_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 2, val_item);+ table->setRowHeight(i, 22);+ }+ results_layout_->addWidget(table);+ }++ status_label_->setText(QString("%1 trained — R²=%2 | forecast %3 → %4")+ .arg(model)+ .arg(r2, 0, 'f', 3)+ .arg(first_fc, 0, 'f', 3)+ .arg(last_fc, 0, 'f', 3));+ return;+ }++ // ── 3. ANOMALY DETECTION ────────────────────────────────────────────────+ if (command == "anomaly_detection") {+ const QString method = d.value("method").toString();+ const int n_anom = d.value("n_anomalies").toInt();+ const double rate = d.value("anomaly_rate_pct").toDouble();+ const int n_obs = d.value("n_observations").toInt();++ auto* hdr = new QLabel(QString("METHOD %1 | %2 / %3 ANOMALIES (%4%)")+ .arg(method.toUpper())+ .arg(n_anom).arg(n_obs)+ .arg(rate, 0, 'f', 2));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border:1px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(),+ ui::colors::BORDER_DIM()));+ results_layout_->addWidget(hdr);++ QList<QWidget*> top = {+ gs_make_card("ANOMALIES FOUND", QString::number(n_anom), this,+ n_anom == 0 ? ui::colors::POSITIVE()+ : rate > 5 ? ui::colors::NEGATIVE()+ : ui::colors::WARNING()),+ gs_make_card("ANOMALY RATE", QString::number(rate, 'f', 2) + "%", this,+ rate > 5 ? ui::colors::NEGATIVE()+ : rate > 1 ? ui::colors::WARNING()+ : ui::colors::POSITIVE()),+ gs_make_card("MAX |SCORE|", gs_fmt_num(std::max(std::abs(d.value("score_min").toDouble()),+ std::abs(d.value("score_max").toDouble())), 3),+ this, ui::colors::WARNING()),+ gs_make_card("SCORE σ", gs_fmt_num(d.value("score_std").toDouble(), 3), this),+ };+ results_layout_->addWidget(gs_card_row(top, this));++ QList<QWidget*> dist = {+ gs_make_card("OBSERVATIONS", QString::number(n_obs), this),+ gs_make_card("MIN SCORE", gs_fmt_num(d.value("score_min").toDouble(), 3), this),+ gs_make_card("MAX SCORE", gs_fmt_num(d.value("score_max").toDouble(), 3), this),+ gs_make_card("MEAN SCORE", gs_fmt_num(d.value("score_mean").toDouble(), 3), this),+ };+ results_layout_->addWidget(gs_card_row(dist, this));++ // Anomalies table (top 200, sorted by abs score)+ const QJsonArray anomalies = d.value("anomalies").toArray();+ if (!anomalies.isEmpty()) {+ auto* table = new QTableWidget(anomalies.size(), 4, this);+ table->setHorizontalHeaderLabels({"Index", "Date", "Value", "Score"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->setSelectionMode(QAbstractItemView::SingleSelection);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(anomalies.size() * 24 + 32, 360));+ for (int i = 0; i < anomalies.size(); ++i) {+ const auto o = anomalies[i].toObject();+ const double score = o.value("score").toDouble();+ table->setItem(i, 0, new QTableWidgetItem(QString::number(o.value("index").toInt())));+ table->setItem(i, 1, new QTableWidgetItem(o.value("date").toString()));+ auto* val_item = new QTableWidgetItem(QString::number(o.value("value").toDouble(), 'f', 4));+ val_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 2, val_item);+ auto* sc_item = new QTableWidgetItem(QString::number(score, 'f', 3));+ sc_item->setForeground(QColor(std::abs(score) > 5 ? ui::colors::NEGATIVE()+ : ui::colors::WARNING()));+ sc_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 3, sc_item);+ table->setRowHeight(i, 22);+ }+ results_layout_->addWidget(table);+ } else {+ auto* clean = new QLabel("No anomalies detected at the configured threshold.");+ clean->setStyleSheet(QString("color:%1; font-size:11px; padding:10px;"+ "background:rgba(34,197,94,0.06); border:1px solid rgba(34,197,94,0.25); border-radius:2px;")+ .arg(ui::colors::POSITIVE()));+ results_layout_->addWidget(clean);+ }++ status_label_->setText(QString("%1: %2 anomalies in %3 obs (%4%)")+ .arg(method).arg(n_anom).arg(n_obs).arg(rate, 0, 'f', 2));+ return;+ }++ // ── 4. SEASONALITY ──────────────────────────────────────────────────────+ if (command == "seasonality") {+ const int period = d.value("period").toInt();+ const bool auto_det = d.value("period_auto_detected").toBool();+ const double tstr = d.value("trend_strength").toDouble();+ const double sstr = d.value("seasonal_strength").toDouble();+ const double rstd = d.value("residual_std").toDouble();++ auto* hdr = new QLabel(QString("PERIOD %1%2 | STL DECOMPOSITION")+ .arg(period).arg(auto_det ? " (auto-detected)" : ""));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border:1px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(),+ ui::colors::BORDER_DIM()));+ results_layout_->addWidget(hdr);++ auto strength_color = [](double s) {+ if (s > 0.6) return ui::colors::POSITIVE();+ if (s > 0.3) return ui::colors::WARNING();+ return ui::colors::TEXT_PRIMARY();+ };++ QList<QWidget*> strengths = {+ gs_make_card("PERIOD", QString::number(period), this, ui::colors::INFO()),+ gs_make_card("TREND STRENGTH", gs_fmt_num(tstr, 3), this, strength_color(tstr)),+ gs_make_card("SEASONAL STRENGTH", gs_fmt_num(sstr, 3), this, strength_color(sstr)),+ gs_make_card("RESIDUAL σ", gs_fmt_num(rstd, 4), this),+ };+ results_layout_->addWidget(gs_card_row(strengths, this));++ // Interpretation strip+ QString interp;+ if (sstr > 0.6 && tstr > 0.6) interp = "Strong trend AND strong seasonality detected.";+ else if (sstr > 0.6) interp = "Strong seasonal cycle, weak trend.";+ else if (tstr > 0.6) interp = "Strong trend, weak/no seasonality.";+ else interp = "Weak structure — series is close to noise around its mean.";+ auto* il = new QLabel(interp);+ il->setStyleSheet(QString("color:%1; font-size:10px; font-family:'Courier New';"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_SECONDARY(), ui::colors::BG_SURFACE(), accent));+ results_layout_->addWidget(il);++ // Decomposition table — first/middle/last 5 of trend / seasonal / residual+ const QJsonArray trend = d.value("trend").toArray();+ const QJsonArray seasonal = d.value("seasonal").toArray();+ const QJsonArray residual = d.value("residual").toArray();+ const int rows = std::min<int>(15, trend.size());+ if (rows > 0) {+ auto* table = new QTableWidget(rows, 4, this);+ table->setHorizontalHeaderLabels({"Date", "Trend", "Seasonal", "Residual"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->setSelectionMode(QAbstractItemView::NoSelection);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(rows * 22 + 32);+ const int step = std::max<int>(1, trend.size() / rows);+ for (int i = 0, r = 0; i < trend.size() && r < rows; i += step, ++r) {+ const auto td = trend[i].toObject();+ const auto sd = seasonal.size() > i ? seasonal[i].toObject() : QJsonObject{};+ const auto rd = residual.size() > i ? residual[i].toObject() : QJsonObject{};+ table->setItem(r, 0, new QTableWidgetItem(td.value("date").toString()));+ auto add_num = [&](int col, double v) {+ auto* it = new QTableWidgetItem(QString::number(v, 'f', 4));+ it->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(r, col, it);+ };+ add_num(1, td.value("value").toDouble());+ add_num(2, sd.value("value").toDouble());+ add_num(3, rd.value("value").toDouble());+ table->setRowHeight(r, 22);+ }+ results_layout_->addWidget(table);+ }+ status_label_->setText(QString("STL period=%1 | trend=%2 seasonal=%3")+ .arg(period).arg(tstr, 0, 'f', 2).arg(sstr, 0, 'f', 2));+ return;+ }++ // ── 5. METRICS ───────────────────────────────────────────────────────────+ if (command == "metrics") {+ const double mae = d.value("mae").toDouble();+ const double rmse = d.value("rmse").toDouble();+ const double r2 = d.value("r_squared").toDouble();+ const double mape = d.value("mape_pct").toDouble();+ const double smape = d.value("smape_pct").toDouble();+ const double bias = d.value("bias").toDouble();+ const double dir_acc = d.value("direction_accuracy_pct").toDouble();++ QList<QWidget*> err_row = {+ gs_make_card("MAE", gs_fmt_num(mae, 4), this),+ gs_make_card("RMSE", gs_fmt_num(rmse, 4), this),+ gs_make_card("MSE", gs_fmt_num(d.value("mse").toDouble(), 4), this),+ gs_make_card("BIAS", gs_fmt_num(bias, 4), this, gs_pos_neg_color(-std::abs(bias))),+ };+ results_layout_->addWidget(gs_card_row(err_row, this));++ QList<QWidget*> pct_row = {+ gs_make_card("MAPE", QString::number(mape, 'f', 2) + "%", this,+ mape < 10 ? ui::colors::POSITIVE()+ : mape < 30 ? ui::colors::WARNING()+ : ui::colors::NEGATIVE()),+ gs_make_card("SMAPE", QString::number(smape, 'f', 2) + "%", this,+ smape < 10 ? ui::colors::POSITIVE()+ : smape < 30 ? ui::colors::WARNING()+ : ui::colors::NEGATIVE()),+ gs_make_card("R²", gs_fmt_num(r2, 4), this,+ r2 > 0.7 ? ui::colors::POSITIVE()+ : r2 > 0.3 ? ui::colors::WARNING()+ : ui::colors::NEGATIVE()),+ gs_make_card("DIRECTION ACC", QString::number(dir_acc, 'f', 1) + "%", this,+ dir_acc > 60 ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ };+ results_layout_->addWidget(gs_card_row(pct_row, this));++ status_label_->setText(QString("MAE %1 | RMSE %2 | R² %3 | MAPE %4%")+ .arg(mae, 0, 'f', 3).arg(rmse, 0, 'f', 3)+ .arg(r2, 0, 'f', 3).arg(mape, 0, 'f', 2));+ return;+ }++ // ── 6. CONFIDENCE INTERVALS ──────────────────────────────────────────────+ if (command == "confidence_intervals") {+ const QString method = d.value("method").toString();+ const int horizon = d.value("horizon").toInt();+ const double conf = d.value("confidence").toDouble();+ const double mean_w = d.value("mean_width").toDouble();++ auto* hdr = new QLabel(QString("METHOD %1 | CONFIDENCE %2% | HORIZON %3")+ .arg(method.toUpper()).arg(conf * 100, 0, 'f', 1).arg(horizon));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border:1px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(),+ ui::colors::BORDER_DIM()));+ results_layout_->addWidget(hdr);++ QList<QWidget*> top = {+ gs_make_card("RESIDUAL σ", gs_fmt_num(d.value("residual_std").toDouble(), 4), this),+ gs_make_card("MEAN WIDTH", gs_fmt_num(mean_w, 4), this, ui::colors::WARNING()),+ gs_make_card("FIRST LOWER", gs_fmt_num(d.value("first_lower").toDouble(), 4), this,+ ui::colors::NEGATIVE()),+ gs_make_card("FIRST UPPER", gs_fmt_num(d.value("first_upper").toDouble(), 4), this,+ ui::colors::POSITIVE()),+ };+ results_layout_->addWidget(gs_card_row(top, this));++ QList<QWidget*> wide = {+ gs_make_card("LAST LOWER", gs_fmt_num(d.value("last_lower").toDouble(), 4), this,+ ui::colors::NEGATIVE()),+ gs_make_card("LAST UPPER", gs_fmt_num(d.value("last_upper").toDouble(), 4), this,+ ui::colors::POSITIVE()),+ gs_make_card("LAGS", QString::number(d.value("lags").toInt()), this),+ gs_make_card("BOOT N",+ d.value("n_boot").isNull() ? QString("n/a")+ : QString::number(d.value("n_boot").toInt()),+ this),+ };+ results_layout_->addWidget(gs_card_row(wide, this));++ const QJsonArray intervals = d.value("intervals").toArray();+ if (!intervals.isEmpty()) {+ auto* table = new QTableWidget(intervals.size(), 5, this);+ table->setHorizontalHeaderLabels({"Step", "Date", "Lower", "Point", "Upper"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->setSelectionMode(QAbstractItemView::NoSelection);+ table->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents);+ table->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);+ table->horizontalHeader()->setSectionResizeMode(2, QHeaderView::ResizeToContents);+ table->horizontalHeader()->setSectionResizeMode(3, QHeaderView::ResizeToContents);+ table->horizontalHeader()->setSectionResizeMode(4, QHeaderView::ResizeToContents);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(intervals.size() * 24 + 32, 320));+ for (int i = 0; i < intervals.size(); ++i) {+ const auto o = intervals[i].toObject();+ table->setItem(i, 0, new QTableWidgetItem(QString::number(i + 1)));+ table->setItem(i, 1, new QTableWidgetItem(o.value("date").toString()));+ auto* lo = new QTableWidgetItem(QString::number(o.value("lower").toDouble(), 'f', 4));+ lo->setForeground(QColor(ui::colors::NEGATIVE()));+ lo->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 2, lo);+ auto* pt = new QTableWidgetItem(QString::number(o.value("point").toDouble(), 'f', 4));+ pt->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 3, pt);+ auto* up = new QTableWidgetItem(QString::number(o.value("upper").toDouble(), 'f', 4));+ up->setForeground(QColor(ui::colors::POSITIVE()));+ up->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 4, up);+ table->setRowHeight(i, 22);+ }+ results_layout_->addWidget(table);+ }++ status_label_->setText(QString("%1 intervals @ %2% | mean width %3")+ .arg(intervals.size()).arg(conf * 100, 0, 'f', 1)+ .arg(mean_w, 0, 'f', 3));+ return;+ }++ // ── 7. STATIONARITY ──────────────────────────────────────────────────────+ if (command == "stationarity") {+ const int rec_d = d.value("recommended_d").toInt();+ const int max_d = d.value("max_d_tested").toInt();+ const QJsonArray tests = d.value("tests").toArray();++ auto* hdr = new QLabel(QString("RECOMMENDED DIFFERENCING ORDER: d = %1 (tested 0..%2)")+ .arg(rec_d).arg(max_d));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(), accent));+ results_layout_->addWidget(hdr);++ // One card row per tested d+ for (const auto& v : tests) {+ const auto t = v.toObject();+ const int dval = t.value("differencing_order").toInt();+ const bool both_stat = t.value("both_stationary").toBool();+ const QString label = QString("d = %1").arg(dval);+ const QString verdict = both_stat ? "STATIONARY" : "NON-STATIONARY";+ const QString verdict_col = both_stat ? ui::colors::POSITIVE() : ui::colors::NEGATIVE();++ QList<QWidget*> row = {+ gs_make_card(label.toUpper(), verdict, this, verdict_col),+ gs_make_card("ADF p", gs_fmt_num(t.value("adf_p_value").toDouble(), 4), this,+ t.value("adf_stationary").toBool() ? ui::colors::POSITIVE()+ : ui::colors::WARNING()),+ gs_make_card("KPSS p", gs_fmt_num(t.value("kpss_p_value").toDouble(), 4), this,+ t.value("kpss_stationary").toBool() ? ui::colors::POSITIVE()+ : ui::colors::WARNING()),+ gs_make_card("OBS USED", QString::number(t.value("n_observations").toInt()), this),+ };+ results_layout_->addWidget(gs_card_row(row, this));+ }++ // Test legend+ auto* legend = new QLabel(+ "ADF: H₀ = unit root (non-stationary). p < 0.05 ⇒ stationary.\n"+ "KPSS: H₀ = stationary. p ≥ 0.05 ⇒ stationary.\n"+ "Verdict requires BOTH tests to agree.");+ legend->setStyleSheet(QString("color:%1; font-size:9px; font-family:'Courier New';"+ "padding:6px 10px; background:%2;")+ .arg(ui::colors::TEXT_TERTIARY(), ui::colors::BG_RAISED()));+ results_layout_->addWidget(legend);++ status_label_->setText(QString("Recommended d = %1 (tested %2 orders)")+ .arg(rec_d).arg(tests.size()));+ return;+ }++ // ── Fallback ─────────────────────────────────────────────────────────────+ display_result(d);+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_GS.cpp b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_GS.cppnew file mode 100644index 000000000..3b257d14f--- /dev/null+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_GS.cpp@@ -0,0 +1,954 @@+// src/screens/ai_quant_lab/QuantModulePanel_GS.cpp+//+// GS Quant panel — 7 analysis modes (risk metrics, portfolio analytics, greeks,+// VaR, stress test, backtest, statistics). Extracted from QuantModulePanel.cpp+// to keep that file maintainable.+#include "screens/ai_quant_lab/QuantModulePanel.h"+#include "screens/ai_quant_lab/QuantModulePanel_Common.h"+#include "screens/ai_quant_lab/QuantModulePanel_GsHelpers.h"+#include "screens/ai_quant_lab/QuantModulePanel_Styles.h"++#include "services/ai_quant_lab/AIQuantLabService.h"+#include "ui/theme/Theme.h"++#include <QAbstractItemView>+#include <QColor>+#include <QComboBox>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QJsonArray>+#include <QJsonObject>+#include <QLabel>+#include <QLineEdit>+#include <QList>+#include <QPair>+#include <QPointer>+#include <QPushButton>+#include <QSpinBox>+#include <QString>+#include <QStringList>+#include <QTabWidget>+#include <QTableWidget>+#include <QTableWidgetItem>+#include <QVBoxLayout>+#include <QWidget>++#include <algorithm>+#include <cmath>++namespace fincept::screens {++using namespace fincept::services::quant;+using namespace fincept::screens::quant_styles;+using namespace fincept::screens::quant_common;+using namespace fincept::screens::quant_gs_helpers;++// ═══════════════════════════════════════════════════════════════════════════════+// GS QUANT PANEL — 7 analysis modes+// ═══════════════════════════════════════════════════════════════════════════════++QWidget* QuantModulePanel::build_gs_quant_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ // Helper: small "load sample" link button next to a CSV input+ auto add_sample_btn = [this](QLineEdit* edit, QWidget* parent, unsigned seed,+ const QString& tip) -> QPushButton* {+ auto* btn = new QPushButton("LOAD SAMPLE", parent);+ btn->setCursor(Qt::PointingHandCursor);+ btn->setFixedHeight(22);+ btn->setToolTip(tip);+ btn->setStyleSheet(QString("QPushButton { color:%1; background:transparent; border:1px solid %2;"+ "padding:0 8px; font-size:9px; font-weight:700; letter-spacing:0.5px; border-radius:2px; }"+ "QPushButton:hover { color:%3; border-color:%3; background:rgba(255,255,255,0.04); }")+ .arg(ui::colors::TEXT_TERTIARY(), ui::colors::BORDER_DIM(), module_.color.name()));+ QPointer<QLineEdit> guard(edit);+ connect(btn, &QPushButton::clicked, this, [guard, seed]() {+ if (guard) guard->setText(sample_returns(seed));+ });+ return btn;+ };++ // ── Risk Metrics ──+ auto* risk = new QWidget(this);+ auto* rvl = new QVBoxLayout(risk);+ rvl->setContentsMargins(12, 12, 12, 12);+ rvl->setSpacing(8);+ auto* risk_returns = new QLineEdit(risk);+ risk_returns->setPlaceholderText("Daily returns: comma-, space-, or newline-separated. Need at least 5 values.");+ risk_returns->setStyleSheet(input_ss());+ text_inputs_["gs_risk_returns"] = risk_returns;+ rvl->addWidget(build_input_row("Daily Returns", risk_returns, risk));+ rvl->addWidget(add_sample_btn(risk_returns, risk, 11,+ "Inserts 252 synthetic daily returns (mu=0.05%, sigma=1.2%)"));+ auto* risk_rf = make_double_spin(0, 20, 4.5, 2, "%", risk);+ double_inputs_["gs_risk_rf"] = risk_rf;+ rvl->addWidget(build_input_row("Risk-Free Rate", risk_rf, risk));+ auto* risk_run = make_run_button("CALCULATE RISK METRICS", risk);+ connect(risk_run, &QPushButton::clicked, this, [this]() {+ QJsonArray rets;+ QString bad;+ if (!parse_doubles(text_inputs_["gs_risk_returns"]->text(), rets, &bad)) {+ display_error(QString("Daily Returns: '%1' is not a number. "+ "Use comma-, space-, or newline-separated decimals (e.g. 0.01, -0.02, 0.005).")+ .arg(bad));+ return;+ }+ if (rets.size() < 5) {+ display_error(QString("Need at least 5 daily returns; you provided %1. "+ "Click LOAD SAMPLE to insert 252 synthetic values.")+ .arg(rets.size()));+ return;+ }+ show_loading(QString("Calculating risk metrics on %1 observations...").arg(rets.size()));+ QJsonObject params;+ params["returns"] = rets;+ params["risk_free_rate"] = double_inputs_["gs_risk_rf"]->value() / 100.0;+ AIQuantLabService::instance().gs_risk_metrics(params);+ });+ rvl->addWidget(risk_run);+ rvl->addStretch();+ tabs->addTab(risk, "Risk Metrics");++ // ── Portfolio Analytics ──+ auto* port = new QWidget(this);+ auto* pvl = new QVBoxLayout(port);+ pvl->setContentsMargins(12, 12, 12, 12);+ pvl->setSpacing(8);+ auto* port_ret = new QLineEdit(port);+ port_ret->setPlaceholderText("Portfolio daily returns (decimals, same length as benchmark)");+ port_ret->setStyleSheet(input_ss());+ text_inputs_["gs_port_returns"] = port_ret;+ pvl->addWidget(build_input_row("Portfolio Returns", port_ret, port));+ pvl->addWidget(add_sample_btn(port_ret, port, 21,+ "Inserts 252 synthetic portfolio returns (slight outperformance)"));+ auto* bench_ret = new QLineEdit(port);+ bench_ret->setPlaceholderText("Benchmark daily returns (decimals)");+ bench_ret->setStyleSheet(input_ss());+ text_inputs_["gs_bench_returns"] = bench_ret;+ pvl->addWidget(build_input_row("Benchmark Returns", bench_ret, port));+ pvl->addWidget(add_sample_btn(bench_ret, port, 22,+ "Inserts 252 synthetic benchmark returns"));+ auto* port_rf = make_double_spin(0, 20, 4.5, 2, "%", port);+ double_inputs_["gs_port_rf"] = port_rf;+ pvl->addWidget(build_input_row("Risk-Free Rate", port_rf, port));+ auto* port_run = make_run_button("ANALYZE PORTFOLIO", port);+ connect(port_run, &QPushButton::clicked, this, [this]() {+ QJsonArray prets, brets;+ QString bad;+ if (!parse_doubles(text_inputs_["gs_port_returns"]->text(), prets, &bad)) {+ display_error(QString("Portfolio Returns: '%1' is not numeric.").arg(bad));+ return;+ }+ if (!parse_doubles(text_inputs_["gs_bench_returns"]->text(), brets, &bad)) {+ display_error(QString("Benchmark Returns: '%1' is not numeric.").arg(bad));+ return;+ }+ if (prets.size() < 5 || brets.size() < 5) {+ display_error("Need at least 5 observations for both portfolio and benchmark returns.");+ return;+ }+ if (prets.size() != brets.size()) {+ display_error(QString("Portfolio (%1) and benchmark (%2) must have the same length.")+ .arg(prets.size()).arg(brets.size()));+ return;+ }+ show_loading(QString("Analyzing portfolio vs benchmark on %1 observations...").arg(prets.size()));+ QJsonObject params;+ params["returns"] = prets;+ params["benchmark_returns"] = brets;+ params["risk_free_rate"] = double_inputs_["gs_port_rf"]->value() / 100.0;+ AIQuantLabService::instance().gs_portfolio_analytics(params);+ });+ pvl->addWidget(port_run);+ pvl->addStretch();+ tabs->addTab(port, "Portfolio");++ // ── Options Greeks ──+ auto* greeks = new QWidget(this);+ auto* gvl = new QVBoxLayout(greeks);+ gvl->setContentsMargins(12, 12, 12, 12);+ gvl->setSpacing(8);+ auto* g_spot = make_double_spin(0.01, 1e6, 100, 2, "", greeks);+ double_inputs_["gs_spot"] = g_spot;+ gvl->addWidget(build_input_row("Spot Price ($)", g_spot, greeks));+ auto* g_strike = make_double_spin(0.01, 1e6, 100, 2, "", greeks);+ double_inputs_["gs_strike"] = g_strike;+ gvl->addWidget(build_input_row("Strike Price ($)", g_strike, greeks));+ auto* g_expiry = make_double_spin(0.1, 120, 6, 1, " mo", greeks);+ double_inputs_["gs_expiry"] = g_expiry;+ gvl->addWidget(build_input_row("Expiry (months)", g_expiry, greeks));+ auto* g_rate = make_double_spin(0, 30, 5, 2, "%", greeks);+ double_inputs_["gs_rate"] = g_rate;+ gvl->addWidget(build_input_row("Risk-Free Rate", g_rate, greeks));+ auto* g_vol = make_double_spin(0.1, 200, 25, 1, "%", greeks);+ double_inputs_["gs_vol"] = g_vol;+ gvl->addWidget(build_input_row("Volatility", g_vol, greeks));+ auto* g_type = new QComboBox(greeks);+ g_type->addItems({"call", "put"});+ g_type->setStyleSheet(combo_ss());+ combo_inputs_["gs_option_type"] = g_type;+ gvl->addWidget(build_input_row("Option Type", g_type, greeks));+ auto* greeks_run = make_run_button("CALCULATE GREEKS", greeks);+ connect(greeks_run, &QPushButton::clicked, this, [this]() {+ show_loading("Calculating Black-Scholes Greeks...");+ QJsonObject params;+ params["spot"] = double_inputs_["gs_spot"]->value();+ params["strike"] = double_inputs_["gs_strike"]->value();+ params["expiry"] = double_inputs_["gs_expiry"]->value() / 12.0;+ params["rate"] = double_inputs_["gs_rate"]->value() / 100.0;+ params["vol"] = double_inputs_["gs_vol"]->value() / 100.0;+ params["option_type"] = combo_inputs_["gs_option_type"]->currentText();+ AIQuantLabService::instance().gs_greeks(params);+ });+ gvl->addWidget(greeks_run);+ gvl->addStretch();+ tabs->addTab(greeks, "Greeks");++ // ── VaR Analysis ──+ auto* var = new QWidget(this);+ auto* vvl = new QVBoxLayout(var);+ vvl->setContentsMargins(12, 12, 12, 12);+ vvl->setSpacing(8);+ auto* var_ret = new QLineEdit(var);+ var_ret->setPlaceholderText("Daily returns (decimals). Need at least 30 values for stable VaR.");+ var_ret->setStyleSheet(input_ss());+ text_inputs_["gs_var_returns"] = var_ret;+ vvl->addWidget(build_input_row("Daily Returns", var_ret, var));+ vvl->addWidget(add_sample_btn(var_ret, var, 31, "Inserts 252 synthetic daily returns"));+ auto* var_pos = make_double_spin(1, 1e12, 1e6, 0, "", var);+ double_inputs_["gs_var_position"] = var_pos;+ vvl->addWidget(build_input_row("Position Value ($)", var_pos, var));+ auto* var_conf = make_double_spin(0.80, 0.999, 0.95, 3, "", var);+ double_inputs_["gs_var_confidence"] = var_conf;+ vvl->addWidget(build_input_row("Confidence Level", var_conf, var));+ auto* var_run = make_run_button("CALCULATE VaR", var);+ connect(var_run, &QPushButton::clicked, this, [this]() {+ QJsonArray rets;+ QString bad;+ if (!parse_doubles(text_inputs_["gs_var_returns"]->text(), rets, &bad)) {+ display_error(QString("Daily Returns: '%1' is not numeric.").arg(bad));+ return;+ }+ if (rets.size() < 30) {+ display_error(QString("VaR needs at least 30 observations for a stable estimate; you provided %1.")+ .arg(rets.size()));+ return;+ }+ show_loading(QString("Computing parametric, historical, MC and CVaR on %1 observations...").arg(rets.size()));+ QJsonObject params;+ params["returns"] = rets;+ params["position_value"] = double_inputs_["gs_var_position"]->value();+ params["confidence"] = double_inputs_["gs_var_confidence"]->value();+ AIQuantLabService::instance().gs_var_analysis(params);+ });+ vvl->addWidget(var_run);+ vvl->addStretch();+ tabs->addTab(var, "VaR");++ // ── Stress Test ──+ auto* stress = new QWidget(this);+ auto* svl = new QVBoxLayout(stress);+ svl->setContentsMargins(12, 12, 12, 12);+ svl->setSpacing(8);+ auto* st_pos = make_double_spin(1, 1e12, 1e6, 0, "", stress);+ double_inputs_["gs_stress_position"] = st_pos;+ svl->addWidget(build_input_row("Portfolio Value ($)", st_pos, stress));+ auto* st_eq = make_double_spin(0, 100, 60, 1, "%", stress);+ double_inputs_["gs_stress_eq"] = st_eq;+ svl->addWidget(build_input_row("Equity Allocation", st_eq, stress));+ auto* st_bd = make_double_spin(0, 100, 30, 1, "%", stress);+ double_inputs_["gs_stress_bd"] = st_bd;+ svl->addWidget(build_input_row("Bond Allocation", st_bd, stress));+ auto* st_cm = make_double_spin(0, 100, 10, 1, "%", stress);+ double_inputs_["gs_stress_cm"] = st_cm;+ svl->addWidget(build_input_row("Commodity Allocation", st_cm, stress));+ auto* st_hint = new QLabel(+ "Applies 9 historical crisis scenarios (2008, COVID-19, Dot-Com, etc.) to the "+ "weighted portfolio. Allocations need not sum to 100% — they will be normalized.", stress);+ st_hint->setWordWrap(true);+ st_hint->setStyleSheet(QString("color:%1; font-size:10px;").arg(ui::colors::TEXT_TERTIARY()));+ svl->addWidget(st_hint);+ auto* stress_run = make_run_button("RUN STRESS TEST", stress);+ connect(stress_run, &QPushButton::clicked, this, [this]() {+ const double eq = double_inputs_["gs_stress_eq"]->value();+ const double bd = double_inputs_["gs_stress_bd"]->value();+ const double cm = double_inputs_["gs_stress_cm"]->value();+ if (eq + bd + cm <= 0) {+ display_error("At least one allocation must be greater than zero.");+ return;+ }+ show_loading("Running 9 historical crisis scenarios...");+ QJsonObject params;+ params["position_value"] = double_inputs_["gs_stress_position"]->value();+ QJsonObject mix;+ mix["equity"] = eq;+ mix["bond"] = bd;+ mix["commodity"] = cm;+ params["mix"] = mix;+ AIQuantLabService::instance().gs_stress_test(params);+ });+ svl->addWidget(stress_run);+ svl->addStretch();+ tabs->addTab(stress, "Stress Test");++ // ── Backtest ──+ auto* bt = new QWidget(this);+ auto* bvl = new QVBoxLayout(bt);+ bvl->setContentsMargins(12, 12, 12, 12);+ bvl->setSpacing(8);+ auto* bt_strat = new QComboBox(bt);+ bt_strat->addItems({"buy_and_hold", "momentum", "mean_reversion", "rebalancing"});+ bt_strat->setStyleSheet(combo_ss());+ combo_inputs_["gs_bt_strategy"] = bt_strat;+ bvl->addWidget(build_input_row("Strategy", bt_strat, bt));+ auto* bt_ticker = new QLineEdit(bt);+ bt_ticker->setPlaceholderText("e.g. AAPL — fetched from Yahoo Finance");+ bt_ticker->setStyleSheet(input_ss());+ text_inputs_["gs_bt_ticker"] = bt_ticker;+ bvl->addWidget(build_input_row("Ticker", bt_ticker, bt));+ auto* bt_period = new QComboBox(bt);+ bt_period->addItems({"1y", "2y", "3y", "5y", "10y", "max"});+ bt_period->setCurrentText("2y");+ bt_period->setStyleSheet(combo_ss());+ combo_inputs_["gs_bt_period"] = bt_period;+ bvl->addWidget(build_input_row("History Period", bt_period, bt));+ auto* bt_capital = make_double_spin(1000, 1e12, 100000, 0, "", bt);+ double_inputs_["gs_bt_capital"] = bt_capital;+ bvl->addWidget(build_input_row("Initial Capital ($)", bt_capital, bt));+ auto* bt_lookback = new QSpinBox(bt);+ bt_lookback->setRange(5, 252);+ bt_lookback->setValue(20);+ bt_lookback->setStyleSheet(spinbox_ss());+ int_inputs_["gs_bt_lookback"] = bt_lookback;+ bvl->addWidget(build_input_row("Lookback Period (days)", bt_lookback, bt));+ auto* bt_comm = make_double_spin(0, 5, 0.10, 3, "%", bt);+ double_inputs_["gs_bt_comm"] = bt_comm;+ bvl->addWidget(build_input_row("Commission per Trade", bt_comm, bt));+ auto* bt_run = make_run_button("RUN BACKTEST", bt);+ connect(bt_run, &QPushButton::clicked, this, [this]() {+ const QString tk = text_inputs_["gs_bt_ticker"]->text().trimmed();+ if (tk.isEmpty()) {+ display_error("Enter a ticker (e.g. AAPL, SPY, MSFT) to fetch price history.");+ return;+ }+ show_loading(QString("Fetching %1 history from yfinance and running %2 backtest...")+ .arg(tk, combo_inputs_["gs_bt_strategy"]->currentText()));+ QJsonObject params;+ params["strategy"] = combo_inputs_["gs_bt_strategy"]->currentText();+ params["ticker"] = tk.toUpper();+ params["period"] = combo_inputs_["gs_bt_period"]->currentText();+ params["initial_capital"] = double_inputs_["gs_bt_capital"]->value();+ params["lookback"] = int_inputs_["gs_bt_lookback"]->value();+ params["commission"] = double_inputs_["gs_bt_comm"]->value() / 100.0;+ AIQuantLabService::instance().gs_backtest(params);+ });+ bvl->addWidget(bt_run);+ bvl->addStretch();+ tabs->addTab(bt, "Backtest");++ // ── Statistics ──+ auto* stats = new QWidget(this);+ auto* stvl = new QVBoxLayout(stats);+ stvl->setContentsMargins(12, 12, 12, 12);+ stvl->setSpacing(8);+ auto* st_vals = new QLineEdit(stats);+ st_vals->setPlaceholderText("Numeric values (e.g. 10.5, 11.2, 9.8, 12.1, ...). Need at least 2.");+ st_vals->setStyleSheet(input_ss());+ text_inputs_["gs_stats_values"] = st_vals;+ stvl->addWidget(build_input_row("Values", st_vals, stats));+ stvl->addWidget(add_sample_btn(st_vals, stats, 41,+ "Inserts 100 synthetic observations (mean ~50, sd ~5)"));+ auto* stats_run = make_run_button("CALCULATE STATISTICS", stats);+ connect(stats_run, &QPushButton::clicked, this, [this]() {+ QJsonArray vals;+ QString bad;+ if (!parse_doubles(text_inputs_["gs_stats_values"]->text(), vals, &bad)) {+ display_error(QString("Values: '%1' is not numeric.").arg(bad));+ return;+ }+ if (vals.size() < 2) {+ display_error(QString("Need at least 2 values; you provided %1.").arg(vals.size()));+ return;+ }+ show_loading(QString("Computing descriptive statistics on %1 values...").arg(vals.size()));+ QJsonObject params;+ params["values"] = vals;+ AIQuantLabService::instance().gs_statistics(params);+ });+ stvl->addWidget(stats_run);+ stvl->addStretch();+ tabs->addTab(stats, "Statistics");++ vl->addWidget(tabs);++ auto* rc = new QWidget(w);+ results_layout_ = new QVBoxLayout(rc);+ results_layout_->setContentsMargins(0, 8, 0, 0);+ results_layout_->setSpacing(8);+ vl->addWidget(rc);++ return w;+}++// ═══════════════════════════════════════════════════════════════════════════════+// GS QUANT — display_gs_result: rich card-based display per command+// ═══════════════════════════════════════════════════════════════════════════════++void QuantModulePanel::display_gs_result(const QString& command, const QJsonObject& payload) {+ clear_results();++ // Unified error path+ if (!payload.value("success").toBool(false)) {+ const QString err = payload.value("error").toString("Unknown error");+ const QString kind = payload.value("error_kind").toString();+ const QString prefix = kind == "validation" ? "Input error: "+ : kind == "runtime" ? "Computation failed: "+ : "";+ display_error(prefix + err);+ return;+ }++ const QJsonObject d = payload.value("data").toObject();+ const QString accent = module_.color.name();++ // Header strip — operation name + observation count when available+ QString header_text = command.toUpper();+ header_text.replace('_', ' ');+ if (d.contains("n_observations"))+ header_text += QString(" | %1 OBS").arg(d.value("n_observations").toInt());+ else if (d.contains("n_scenarios"))+ header_text += QString(" | %1 SCENARIOS").arg(d.value("n_scenarios").toInt());+ results_layout_->addWidget(gs_section_header(header_text, accent));++ // ── 1. RISK METRICS ──────────────────────────────────────────────────────+ if (command == "risk_metrics") {+ const double sharpe = d.value("sharpe_ratio").toDouble();+ const double sortino = d.value("sortino_ratio").toDouble();+ const double calmar = d.value("calmar_ratio").toDouble();+ const double mdd = d.value("max_drawdown").toDouble();++ QList<QWidget*> ratios = {+ gs_make_card("SHARPE", gs_fmt_num(sharpe, 3), this,+ sharpe >= 1.0 ? ui::colors::POSITIVE()+ : sharpe >= 0 ? ui::colors::TEXT_PRIMARY()+ : ui::colors::NEGATIVE()),+ gs_make_card("SORTINO", gs_fmt_num(sortino, 3), this, gs_pos_neg_color(sortino)),+ gs_make_card("CALMAR", gs_fmt_num(calmar, 3), this, gs_pos_neg_color(calmar)),+ gs_make_card("OMEGA", gs_fmt_num(d.value("omega_ratio").toDouble(), 3), this),+ };+ results_layout_->addWidget(gs_card_row(ratios, this));++ QList<QWidget*> vol = {+ gs_make_card("VOLATILITY (ANN)", gs_fmt_pct(d.value("volatility_annualized").toDouble()), this),+ gs_make_card("DAILY RISK", gs_fmt_pct(d.value("daily_risk").toDouble(), 3), this),+ gs_make_card("DOWNSIDE RISK", gs_fmt_pct(d.value("downside_risk").toDouble()), this,+ ui::colors::WARNING()),+ gs_make_card("MAX DRAWDOWN", gs_fmt_pct(mdd), this,+ mdd <= -0.20 ? ui::colors::NEGATIVE() : ui::colors::WARNING()),+ };+ results_layout_->addWidget(gs_card_row(vol, this));++ QList<QWidget*> var_cards = {+ gs_make_card("VaR 95%", gs_fmt_pct(d.value("var_95").toDouble(), 3), this, ui::colors::WARNING()),+ gs_make_card("VaR 99%", gs_fmt_pct(d.value("var_99").toDouble(), 3), this, ui::colors::NEGATIVE()),+ gs_make_card("DD LENGTH", QString("%1 days").arg(d.value("max_drawdown_length").toInt()), this),+ gs_make_card("RECOVERY", QString("%1 days").arg(d.value("max_recovery_period").toInt()), this),+ };+ results_layout_->addWidget(gs_card_row(var_cards, this));++ // Drawdown timeline strip+ const QString peak = d.value("peak_date").toString().left(10);+ const QString trough = d.value("trough_date").toString().left(10);+ const QString recov = d.value("recovery_date").toString().left(10);+ if (!peak.isEmpty() && peak != "None") {+ auto* dd_lbl = new QLabel(QString("Drawdown: peak %1 → trough %2 → recovery %3")+ .arg(peak, trough, recov.isEmpty() || recov == "None" ? "—" : recov));+ dd_lbl->setStyleSheet(QString("color:%1; font-size:10px; font-family:'Courier New';"+ "padding:6px 10px; background:%2; border:1px solid %3;")+ .arg(ui::colors::TEXT_SECONDARY(), ui::colors::BG_SURFACE(),+ ui::colors::BORDER_DIM()));+ results_layout_->addWidget(dd_lbl);+ }+ status_label_->setText(QString("Sharpe %1 | MaxDD %2 | Vol %3")+ .arg(sharpe, 0, 'f', 2).arg(mdd * 100, 0, 'f', 1)+ .arg(d.value("volatility_annualized").toDouble() * 100, 0, 'f', 1));+ return;+ }++ // ── 2. PORTFOLIO ANALYTICS ───────────────────────────────────────────────+ if (command == "portfolio_analytics") {+ const double alpha = d.value("alpha").toDouble();+ const double sharpe = d.value("sharpe_ratio").toDouble();+ const double info = d.value("information_ratio").toDouble();+ const double te = d.value("tracking_error").toDouble();+ const double r2 = d.value("r_squared").toDouble();+ const double hit = d.value("hit_rate").toDouble();++ QList<QWidget*> top = {+ gs_make_card("ALPHA", gs_fmt_pct(alpha, 2), this, gs_pos_neg_color(alpha)),+ gs_make_card("SHARPE", gs_fmt_num(sharpe, 3), this, gs_pos_neg_color(sharpe)),+ gs_make_card("SORTINO", gs_fmt_num(d.value("sortino_ratio").toDouble(), 3), this),+ gs_make_card("INFO RATIO", gs_fmt_num(info, 3), this, gs_pos_neg_color(info)),+ };+ results_layout_->addWidget(gs_card_row(top, this));++ QList<QWidget*> vsBench = {+ gs_make_card("TRACKING ERROR", gs_fmt_pct(te), this),+ gs_make_card("R²", gs_fmt_num(r2, 4), this),+ gs_make_card("HIT RATE", QString::number(hit, 'f', 1) + "%", this,+ hit > 50 ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ gs_make_card("MAX DRAWDOWN", gs_fmt_pct(d.value("max_drawdown").toDouble()), this,+ ui::colors::NEGATIVE()),+ };+ results_layout_->addWidget(gs_card_row(vsBench, this));++ QList<QWidget*> capture = {+ gs_make_card("UP CAPTURE", QString::number(d.value("up_capture").toDouble(), 'f', 1) + "%", this),+ gs_make_card("DOWN CAPTURE", QString::number(d.value("down_capture").toDouble(), 'f', 1) + "%", this),+ gs_make_card("CAPTURE RATIO", gs_fmt_num(d.value("capture_ratio").toDouble(), 3), this),+ gs_make_card("ANNUAL RISK", gs_fmt_pct(d.value("annual_risk").toDouble()), this),+ };+ results_layout_->addWidget(gs_card_row(capture, this));++ QList<QWidget*> jensen = {+ gs_make_card("JENSEN ALPHA", gs_fmt_pct(d.value("jensen_alpha").toDouble()), this,+ gs_pos_neg_color(d.value("jensen_alpha").toDouble())),+ gs_make_card("JENSEN BULL", gs_fmt_pct(d.value("jensen_alpha_bull").toDouble()), this),+ gs_make_card("JENSEN BEAR", gs_fmt_pct(d.value("jensen_alpha_bear").toDouble()), this),+ gs_make_card("TREYNOR", gs_fmt_num(d.value("treynor_measure").toDouble(), 3), this),+ };+ results_layout_->addWidget(gs_card_row(jensen, this));++ QList<QWidget*> moments = {+ gs_make_card("SKEWNESS", gs_fmt_num(d.value("skewness").toDouble(), 3), this),+ gs_make_card("KURTOSIS", gs_fmt_num(d.value("kurtosis").toDouble(), 3), this),+ gs_make_card("CALMAR", gs_fmt_num(d.value("calmar_ratio").toDouble(), 3), this),+ gs_make_card("MODIGLIANI", gs_fmt_pct(d.value("modigliani_ratio").toDouble()), this),+ };+ results_layout_->addWidget(gs_card_row(moments, this));++ status_label_->setText(QString("Alpha %1% | IR %2 | R² %3")+ .arg(alpha * 100, 0, 'f', 2).arg(info, 0, 'f', 2)+ .arg(r2, 0, 'f', 3));+ return;+ }++ // ── 3. GREEKS ────────────────────────────────────────────────────────────+ if (command == "greeks") {+ const QJsonObject g = d.value("greeks").toObject();+ const double spot = d.value("spot").toDouble();+ const double strike = d.value("strike").toDouble();+ const QString opt = d.value("option_type").toString().toUpper();+ const double moneyness = d.value("moneyness").toDouble();+ const QString moneyness_label = moneyness > 1.02 ? "ITM" : moneyness < 0.98 ? "OTM" : "ATM";++ // Contract summary strip+ auto* summary = new QLabel(QString("%1 | Spot %2 → Strike %3 | %4 (%5) | Vol %6% | T %7y")+ .arg(opt)+ .arg(spot, 0, 'f', 2).arg(strike, 0, 'f', 2)+ .arg(moneyness_label).arg(moneyness, 0, 'f', 3)+ .arg(d.value("vol").toDouble() * 100, 0, 'f', 1)+ .arg(d.value("expiry_years").toDouble(), 0, 'f', 3));+ summary->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border:1px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(),+ ui::colors::BORDER_DIM()));+ results_layout_->addWidget(summary);++ // First-order Greeks (the four every desk watches)+ QList<QWidget*> first = {+ gs_make_card("DELTA", gs_fmt_num(g.value("delta").toDouble(), 4), this,+ opt == "CALL" ? ui::colors::POSITIVE() : ui::colors::NEGATIVE()),+ gs_make_card("GAMMA", gs_fmt_num(g.value("gamma").toDouble(), 4), this),+ gs_make_card("VEGA", gs_fmt_num(g.value("vega").toDouble(), 4), this),+ gs_make_card("THETA", gs_fmt_num(g.value("theta").toDouble(), 4), this,+ ui::colors::WARNING()),+ };+ results_layout_->addWidget(gs_card_row(first, this));++ QList<QWidget*> second = {+ gs_make_card("RHO", gs_fmt_num(g.value("rho").toDouble(), 4), this),+ gs_make_card("VANNA", gs_fmt_num(g.value("vanna").toDouble(), 4), this),+ gs_make_card("VOLGA", gs_fmt_num(g.value("volga").toDouble(), 4), this),+ gs_make_card("CHARM", gs_fmt_num(g.value("charm").toDouble(), 4), this),+ };+ results_layout_->addWidget(gs_card_row(second, this));++ QList<QWidget*> higher = {+ gs_make_card("SPEED", gs_fmt_num(g.value("speed").toDouble(), 6), this),+ gs_make_card("ZOMMA", gs_fmt_num(g.value("zomma").toDouble(), 6), this),+ gs_make_card("COLOR", gs_fmt_num(g.value("color").toDouble(), 6), this),+ gs_make_card("ULTIMA", gs_fmt_num(g.value("ultima").toDouble(), 6), this),+ };+ results_layout_->addWidget(gs_card_row(higher, this));++ status_label_->setText(QString("%1 %2 / %3 | Δ=%4 Γ=%5 ν=%6")+ .arg(opt).arg(spot, 0, 'f', 2).arg(strike, 0, 'f', 2)+ .arg(g.value("delta").toDouble(), 0, 'f', 3)+ .arg(g.value("gamma").toDouble(), 0, 'f', 4)+ .arg(g.value("vega").toDouble(), 0, 'f', 3));+ return;+ }++ // ── 4. VaR ANALYSIS ──────────────────────────────────────────────────────+ if (command == "var_analysis") {+ const double pos = d.value("position_value").toDouble();+ const double conf = d.value("confidence").toDouble();+ const QJsonObject parm = d.value("parametric_var").toObject();+ const QJsonObject hist = d.value("historical_var").toObject();+ const QJsonObject mc = d.value("monte_carlo_var").toObject();+ const QJsonObject cv = d.value("cvar").toObject();++ // Header strip with position + confidence+ auto* hdr = new QLabel(QString("Position %1 | Confidence %2% | 1-day horizon")+ .arg(gs_fmt_money(pos)).arg(conf * 100, 0, 'f', 1));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border:1px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(),+ ui::colors::BORDER_DIM()));+ results_layout_->addWidget(hdr);++ // VaR amount cards (loss in $) — color escalates with size+ auto var_color = [pos](double amt) {+ const double pct = pos > 0 ? std::abs(amt) / pos : 0;+ if (pct > 0.05) return QString(ui::colors::NEGATIVE());+ if (pct > 0.02) return QString(ui::colors::WARNING());+ return QString(ui::colors::TEXT_PRIMARY());+ };++ QList<QWidget*> amounts = {+ gs_make_card("PARAMETRIC VaR", gs_fmt_money(parm.value("var_amount").toDouble()), this,+ var_color(parm.value("var_amount").toDouble())),+ gs_make_card("HISTORICAL VaR", gs_fmt_money(hist.value("var_amount").toDouble()), this,+ var_color(hist.value("var_amount").toDouble())),+ gs_make_card("MONTE CARLO VaR", gs_fmt_money(mc.value("var_amount").toDouble()), this,+ var_color(mc.value("var_amount").toDouble())),+ gs_make_card("CVaR (EXP. SHORT.)", gs_fmt_money(cv.value("var_amount").toDouble()), this,+ ui::colors::NEGATIVE()),+ };+ results_layout_->addWidget(gs_card_row(amounts, this));++ // VaR as % of position+ QList<QWidget*> pcts = {+ gs_make_card("PARAMETRIC %", gs_fmt_num(parm.value("var_percentage").toDouble(), 2) + "%", this),+ gs_make_card("HISTORICAL %", gs_fmt_num(hist.value("var_percentage").toDouble(), 2) + "%", this),+ gs_make_card("MONTE CARLO %", gs_fmt_num(mc.value("var_percentage").toDouble(), 2) + "%", this),+ gs_make_card("CVaR %", gs_fmt_num(std::abs(cv.value("var_percentage").toDouble()), 2) + "%", this,+ ui::colors::NEGATIVE()),+ };+ results_layout_->addWidget(gs_card_row(pcts, this));++ // Methodology table — each method as a row+ auto* table = new QTableWidget(4, 4, this);+ table->setHorizontalHeaderLabels({"Method", "VaR Amount", "VaR %", "Notes"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->setSelectionMode(QAbstractItemView::NoSelection);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(150);++ const QList<QPair<QString, QJsonObject>> rows = {+ {"Parametric (Variance-Covariance)", parm},+ {"Historical Simulation", hist},+ {"Monte Carlo Simulation", mc},+ {"CVaR / Expected Shortfall", cv},+ };+ for (int r = 0; r < rows.size(); ++r) {+ const auto& obj = rows[r].second;+ table->setItem(r, 0, new QTableWidgetItem(rows[r].first));+ auto* amt_item = new QTableWidgetItem(gs_fmt_money(obj.value("var_amount").toDouble()));+ amt_item->setForeground(QColor(ui::colors::NEGATIVE()));+ amt_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(r, 1, amt_item);+ auto* pct_item = new QTableWidgetItem(QString::number(obj.value("var_percentage").toDouble(), 'f', 3) + "%");+ pct_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(r, 2, pct_item);+ table->setItem(r, 3, new QTableWidgetItem(obj.value("method").toString()));+ table->setRowHeight(r, 24);+ }+ results_layout_->addWidget(table);++ status_label_->setText(QString("VaR(%1%) param=%2 hist=%3 mc=%4 cvar=%5")+ .arg(conf * 100, 0, 'f', 0)+ .arg(gs_fmt_money(parm.value("var_amount").toDouble()))+ .arg(gs_fmt_money(hist.value("var_amount").toDouble()))+ .arg(gs_fmt_money(mc.value("var_amount").toDouble()))+ .arg(gs_fmt_money(cv.value("var_amount").toDouble())));+ return;+ }++ // ── 5. STRESS TEST ───────────────────────────────────────────────────────+ if (command == "stress_test") {+ const double pos = d.value("position_value").toDouble();+ const QJsonArray scenarios = d.value("scenarios").toArray();+ const QJsonObject positions = d.value("positions").toObject();++ // Allocation summary strip+ QStringList parts;+ for (auto it = positions.begin(); it != positions.end(); ++it)+ parts << QString("%1: %2").arg(it.key(), gs_fmt_money(it.value().toDouble()));+ auto* alloc = new QLabel(QString("Portfolio %1 | %2").arg(gs_fmt_money(pos), parts.join(" • ")));+ alloc->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New';"+ "padding:8px 10px; background:%2; border:1px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(),+ ui::colors::BORDER_DIM()));+ results_layout_->addWidget(alloc);++ if (scenarios.isEmpty()) {+ display_error("Stress test returned no scenarios.");+ return;+ }++ // Worst / best summary cards+ double worst_pnl = scenarios[0].toObject().value("pnl").toDouble();+ double best_pnl = worst_pnl;+ QString worst_name = scenarios[0].toObject().value("scenario_name").toString();+ QString best_name = worst_name;+ for (const auto& v : scenarios) {+ const auto o = v.toObject();+ const double p = o.value("pnl").toDouble();+ if (p < worst_pnl) { worst_pnl = p; worst_name = o.value("scenario_name").toString(); }+ if (p > best_pnl) { best_pnl = p; best_name = o.value("scenario_name").toString(); }+ }+ QList<QWidget*> summary_cards = {+ gs_make_card("WORST CASE PnL", gs_fmt_signed_money(worst_pnl), this, ui::colors::NEGATIVE()),+ gs_make_card("WORST CASE %", QString("%1%").arg(worst_pnl / pos * 100, 0, 'f', 2), this,+ ui::colors::NEGATIVE()),+ gs_make_card("BEST CASE PnL", gs_fmt_signed_money(best_pnl), this,+ best_pnl > 0 ? ui::colors::POSITIVE() : ui::colors::TEXT_PRIMARY()),+ gs_make_card("SCENARIOS RUN", QString::number(scenarios.size()), this),+ };+ results_layout_->addWidget(gs_card_row(summary_cards, this));++ // Worst/best name strip+ auto* wb = new QLabel(QString("Worst: %1 | Best: %2").arg(worst_name, best_name));+ wb->setStyleSheet(QString("color:%1; font-size:10px; font-family:'Courier New';"+ "padding:6px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_SECONDARY(), ui::colors::BG_SURFACE(),+ ui::colors::WARNING()));+ results_layout_->addWidget(wb);++ // Full scenario table+ auto* table = new QTableWidget(scenarios.size(), 4, this);+ table->setHorizontalHeaderLabels({"Scenario", "PnL", "PnL %", "Shocked Value"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->setSelectionMode(QAbstractItemView::SingleSelection);+ table->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);+ table->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents);+ table->horizontalHeader()->setSectionResizeMode(2, QHeaderView::ResizeToContents);+ table->horizontalHeader()->setSectionResizeMode(3, QHeaderView::ResizeToContents);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(scenarios.size() * 26 + 32, 320));++ for (int i = 0; i < scenarios.size(); ++i) {+ const auto o = scenarios[i].toObject();+ const double pnl = o.value("pnl").toDouble();+ const double pnl_pct = o.value("pnl_percentage").toDouble();+ const double shocked = o.value("shocked_value").toDouble();+ table->setItem(i, 0, new QTableWidgetItem(o.value("scenario_name").toString()));+ auto* pnl_item = new QTableWidgetItem(gs_fmt_signed_money(pnl));+ pnl_item->setForeground(QColor(gs_pos_neg_color(pnl)));+ pnl_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 1, pnl_item);+ auto* pct_item = new QTableWidgetItem(QString::number(pnl_pct, 'f', 2) + "%");+ pct_item->setForeground(QColor(gs_pos_neg_color(pnl_pct)));+ pct_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 2, pct_item);+ auto* sv_item = new QTableWidgetItem(gs_fmt_money(shocked));+ sv_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 3, sv_item);+ table->setRowHeight(i, 24);+ }+ results_layout_->addWidget(table);++ status_label_->setText(QString("Worst: %1 (%2) | %3 scenarios")+ .arg(gs_fmt_signed_money(worst_pnl), worst_name).arg(scenarios.size()));+ return;+ }++ // ── 6. BACKTEST ──────────────────────────────────────────────────────────+ if (command == "backtest") {+ const QString strategy = d.value("strategy").toString();+ const QString ticker = d.value("ticker").toString();+ const QString start = d.value("start_date").toString();+ const QString end = d.value("end_date").toString();+ const double init_cap = d.value("initial_capital").toDouble();+ const QJsonObject m = d.value("metrics").toObject();+ const QJsonArray curve = d.value("equity_curve").toArray();++ const double total_ret = m.value("total_return").toDouble();+ const double ann_ret = m.value("annualized_return").toDouble();+ const double sharpe = m.value("sharpe_ratio").toDouble();+ const double mdd = m.value("max_drawdown").toDouble();+ const double final_val = m.value("final_value").toDouble();+ const int trades = m.value("num_trades").toInt();++ // Header strip+ auto* hdr = new QLabel(QString("%1 | %2 | %3 → %4 | Initial %5")+ .arg(strategy.toUpper().replace('_', ' '), ticker, start, end,+ gs_fmt_money(init_cap)));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border:1px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(),+ ui::colors::BORDER_DIM()));+ results_layout_->addWidget(hdr);++ QList<QWidget*> top = {+ gs_make_card("FINAL VALUE", gs_fmt_money(final_val), this, gs_pos_neg_color(final_val - init_cap)),+ gs_make_card("TOTAL RETURN", gs_fmt_pct(total_ret), this, gs_pos_neg_color(total_ret)),+ gs_make_card("ANN. RETURN", gs_fmt_pct(ann_ret), this, gs_pos_neg_color(ann_ret)),+ gs_make_card("SHARPE", gs_fmt_num(sharpe, 3), this,+ sharpe >= 1.0 ? ui::colors::POSITIVE()+ : sharpe >= 0 ? ui::colors::TEXT_PRIMARY()+ : ui::colors::NEGATIVE()),+ };+ results_layout_->addWidget(gs_card_row(top, this));++ QList<QWidget*> risk_row = {+ gs_make_card("VOLATILITY", gs_fmt_pct(m.value("volatility").toDouble()), this),+ gs_make_card("MAX DRAWDOWN", gs_fmt_pct(mdd), this,+ mdd <= -0.20 ? ui::colors::NEGATIVE() : ui::colors::WARNING()),+ gs_make_card("BEST DAY", gs_fmt_pct(m.value("best_day").toDouble()), this, ui::colors::POSITIVE()),+ gs_make_card("WORST DAY", gs_fmt_pct(m.value("worst_day").toDouble()), this, ui::colors::NEGATIVE()),+ };+ results_layout_->addWidget(gs_card_row(risk_row, this));++ QList<QWidget*> activity = {+ gs_make_card("TRADES", QString::number(trades), this),+ gs_make_card("WIN RATE", QString::number(m.value("win_rate_pct").toDouble(), 'f', 1) + "%", this,+ m.value("win_rate_pct").toDouble() > 50 ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ gs_make_card("DAYS", QString::number(m.value("n_days").toInt()), this),+ gs_make_card("PROFIT", gs_fmt_signed_money(final_val - init_cap), this,+ gs_pos_neg_color(final_val - init_cap)),+ };+ results_layout_->addWidget(gs_card_row(activity, this));++ // Equity curve preview — show first/middle/last sample as ASCII strip + min/max+ if (curve.size() >= 2) {+ double curve_min = init_cap, curve_max = init_cap;+ for (const auto& v : curve) {+ const double val = v.toObject().value("value").toDouble();+ curve_min = std::min(curve_min, val);+ curve_max = std::max(curve_max, val);+ }+ auto* curve_lbl = new QLabel(+ QString("Equity curve: %1 samples | Range %2 → %3")+ .arg(curve.size()).arg(gs_fmt_money(curve_min), gs_fmt_money(curve_max)));+ curve_lbl->setStyleSheet(QString("color:%1; font-size:10px; font-family:'Courier New';"+ "padding:6px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_SECONDARY(), ui::colors::BG_SURFACE(),+ accent));+ results_layout_->addWidget(curve_lbl);++ // Sampled equity table — show 10 evenly-spaced points+ const int n_show = std::min<int>(10, curve.size());+ const int step = std::max<int>(1, curve.size() / n_show);+ auto* eq_table = new QTableWidget(0, 3, this);+ eq_table->setHorizontalHeaderLabels({"Date", "Portfolio Value", "Return"});+ eq_table->verticalHeader()->setVisible(false);+ eq_table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ eq_table->setSelectionMode(QAbstractItemView::NoSelection);+ eq_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ eq_table->setStyleSheet(table_ss());+ eq_table->setMaximumHeight(280);+ int row = 0;+ for (int i = 0; i < curve.size(); i += step) {+ const auto o = curve[i].toObject();+ const double val = o.value("value").toDouble();+ const double ret = init_cap > 0 ? (val / init_cap - 1.0) : 0.0;+ eq_table->insertRow(row);+ eq_table->setItem(row, 0, new QTableWidgetItem(o.value("date").toString()));+ auto* val_item = new QTableWidgetItem(gs_fmt_money(val));+ val_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ eq_table->setItem(row, 1, val_item);+ auto* ret_item = new QTableWidgetItem(gs_fmt_pct(ret));+ ret_item->setForeground(QColor(gs_pos_neg_color(ret)));+ ret_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ eq_table->setItem(row, 2, ret_item);+ eq_table->setRowHeight(row, 22);+ ++row;+ }+ results_layout_->addWidget(eq_table);+ }++ status_label_->setText(QString("%1 on %2: %3 over %4 trades (Sharpe %5)")+ .arg(strategy, ticker).arg(gs_fmt_pct(total_ret)).arg(trades)+ .arg(sharpe, 0, 'f', 2));+ return;+ }++ // ── 7. STATISTICS ────────────────────────────────────────────────────────+ if (command == "statistics") {+ QList<QWidget*> central = {+ gs_make_card("MEAN", gs_fmt_num(d.value("mean").toDouble(), 4), this),+ gs_make_card("MEDIAN", gs_fmt_num(d.value("median").toDouble(), 4), this),+ gs_make_card("STD DEV", gs_fmt_num(d.value("std").toDouble(), 4), this),+ gs_make_card("VARIANCE", gs_fmt_num(d.value("variance").toDouble(), 4), this),+ };+ results_layout_->addWidget(gs_card_row(central, this));++ QList<QWidget*> spread = {+ gs_make_card("MIN", gs_fmt_num(d.value("min").toDouble(), 4), this, ui::colors::NEGATIVE()),+ gs_make_card("MAX", gs_fmt_num(d.value("max").toDouble(), 4), this, ui::colors::POSITIVE()),+ gs_make_card("RANGE", gs_fmt_num(d.value("range").toDouble(), 4), this),+ gs_make_card("SUM", gs_fmt_num(d.value("sum").toDouble(), 2), this),+ };+ results_layout_->addWidget(gs_card_row(spread, this));++ QList<QWidget*> shape = {+ gs_make_card("SKEWNESS", gs_fmt_num(d.value("skewness").toDouble(), 3), this,+ gs_pos_neg_color(d.value("skewness").toDouble())),+ gs_make_card("KURTOSIS", gs_fmt_num(d.value("kurtosis").toDouble(), 3), this),+ gs_make_card("SEMI-VAR", gs_fmt_num(d.value("semi_variance").toDouble(), 4), this),+ gs_make_card("REALIZED VAR", gs_fmt_num(d.value("realized_variance").toDouble(), 2), this),+ };+ results_layout_->addWidget(gs_card_row(shape, this));++ // Percentile table+ const QJsonObject pcts = d.value("percentiles").toObject();+ if (!pcts.isEmpty()) {+ // Order keys numerically+ QList<int> ordered_keys;+ for (auto it = pcts.begin(); it != pcts.end(); ++it)+ ordered_keys.append(it.key().toInt());+ std::sort(ordered_keys.begin(), ordered_keys.end());++ auto* table = new QTableWidget(ordered_keys.size(), 2, this);+ table->setHorizontalHeaderLabels({"Percentile", "Value"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->setSelectionMode(QAbstractItemView::NoSelection);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(ordered_keys.size() * 24 + 32, 280));+ for (int i = 0; i < ordered_keys.size(); ++i) {+ const int k = ordered_keys[i];+ table->setItem(i, 0, new QTableWidgetItem(QString("p%1").arg(k)));+ auto* v_item = new QTableWidgetItem(gs_fmt_num(pcts.value(QString::number(k)).toDouble(), 4));+ v_item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 1, v_item);+ table->setRowHeight(i, 22);+ }+ results_layout_->addWidget(table);+ }++ status_label_->setText(QString("μ=%1 σ=%2 n=%3")+ .arg(d.value("mean").toDouble(), 0, 'f', 3)+ .arg(d.value("std").toDouble(), 0, 'f', 3)+ .arg(d.value("count").toInt()));+ return;+ }++ // ── Fallback for any unknown command — generic table ─────────────────────+ display_result(d);+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Gluonts.cpp b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Gluonts.cppnew file mode 100644index 000000000..4627f55e2--- /dev/null+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Gluonts.cpp@@ -0,0 +1,903 @@+// src/screens/ai_quant_lab/QuantModulePanel_Gluonts.cpp+//+// Gluonts panel — 5 probabilistic-forecasting modes (probabilistic forecast,+// quantile forecast, distribution fit, evaluate forecast, seasonal naive).+// Mirrors GS Quant / Functime / Statsmodels / Fortitudo / Quant Reporting.+// Extracted from QuantModulePanel.cpp to keep that file maintainable.+#include "screens/ai_quant_lab/QuantModulePanel.h"+#include "screens/ai_quant_lab/QuantModulePanel_Common.h"+#include "screens/ai_quant_lab/QuantModulePanel_GsHelpers.h"+#include "screens/ai_quant_lab/QuantModulePanel_Styles.h"++#include "services/ai_quant_lab/AIQuantLabService.h"+#include "ui/theme/Theme.h"++#include <QAbstractItemView>+#include <QColor>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QJsonArray>+#include <QJsonObject>+#include <QJsonValue>+#include <QLabel>+#include <QLineEdit>+#include <QList>+#include <QPointer>+#include <QPushButton>+#include <QSpinBox>+#include <QString>+#include <QStringList>+#include <QTabWidget>+#include <QTableWidget>+#include <QTableWidgetItem>+#include <QVBoxLayout>+#include <QWidget>++#include <algorithm>+#include <cmath>+#include <limits>++namespace fincept::screens {++using namespace fincept::services::quant;+using namespace fincept::screens::quant_styles;+using namespace fincept::screens::quant_common;+using namespace fincept::screens::quant_gs_helpers;++// ═══════════════════════════════════════════════════════════════════════════════+// GLUONTS PANEL — 5 probabilistic-forecasting modes (probabilistic forecast,+// quantile forecast, distribution fit, evaluate forecast, seasonal naive).+// Mirrors GS Quant / Functime / Statsmodels / Fortitudo / Quant Reporting.+// ═══════════════════════════════════════════════════════════════════════════════+QWidget* QuantModulePanel::build_gluonts_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ auto add_sample_btn = [this](QLineEdit* edit, QWidget* parent, unsigned seed,+ const QString& tip) -> QPushButton* {+ auto* btn = new QPushButton("LOAD SAMPLE", parent);+ btn->setCursor(Qt::PointingHandCursor);+ btn->setFixedHeight(22);+ btn->setToolTip(tip);+ btn->setStyleSheet(QString("QPushButton { color:%1; background:transparent; border:1px solid %2;"+ "padding:0 8px; font-size:9px; font-weight:700; letter-spacing:0.5px; border-radius:2px; }"+ "QPushButton:hover { color:%3; border-color:%3; background:rgba(255,255,255,0.04); }")+ .arg(ui::colors::TEXT_TERTIARY(), ui::colors::BORDER_DIM(), module_.color.name()));+ QPointer<QLineEdit> guard(edit);+ connect(btn, &QPushButton::clicked, this, [guard, seed]() {+ if (guard) guard->setText(sample_series(seed));+ });+ return btn;+ };++ // ── Probabilistic Forecast ───────────────────────────────────────────────+ auto* pf = new QWidget(this);+ auto* pfl = new QVBoxLayout(pf);+ pfl->setContentsMargins(12, 12, 12, 12);+ pfl->setSpacing(8);++ auto* pf_vals = new QLineEdit(pf);+ pf_vals->setPlaceholderText("Series values (>= 30). Bootstrap residual ensemble forecasts the next H steps with quantile bands.");+ pf_vals->setStyleSheet(input_ss());+ text_inputs_["gn_pf_values"] = pf_vals;+ pfl->addWidget(build_input_row("Series Values", pf_vals, pf));+ pfl->addWidget(add_sample_btn(pf_vals, pf, 311, "200-pt synthetic series with seasonality"));++ auto* pf_horizon = new QSpinBox(pf);+ pf_horizon->setRange(1, 365);+ pf_horizon->setValue(14);+ pf_horizon->setStyleSheet(spinbox_ss());+ int_inputs_["gn_pf_horizon"] = pf_horizon;+ pfl->addWidget(build_input_row("Forecast Horizon", pf_horizon, pf));++ auto* pf_lags = new QSpinBox(pf);+ pf_lags->setRange(1, 60);+ pf_lags->setValue(7);+ pf_lags->setStyleSheet(spinbox_ss());+ int_inputs_["gn_pf_lags"] = pf_lags;+ pfl->addWidget(build_input_row("AR Lag Window", pf_lags, pf));++ auto* pf_npaths = new QSpinBox(pf);+ pf_npaths->setRange(100, 5000);+ pf_npaths->setSingleStep(100);+ pf_npaths->setValue(500);+ pf_npaths->setStyleSheet(spinbox_ss());+ int_inputs_["gn_pf_n_paths"] = pf_npaths;+ pfl->addWidget(build_input_row("Bootstrap Paths", pf_npaths, pf));++ auto* pf_run = make_run_button("RUN PROBABILISTIC FORECAST", pf);+ connect(pf_run, &QPushButton::clicked, this, [this]() {+ QJsonArray vals;+ QString bad;+ if (!parse_doubles(text_inputs_["gn_pf_values"]->text(), vals, &bad)) {+ display_error(QString("Series Values: '%1' is not numeric.").arg(bad));+ return;+ }+ if (vals.size() < 30) {+ display_error(QString("Need at least 30 obs; you provided %1.").arg(vals.size()));+ return;+ }+ show_loading(QString("Bootstrapping %1 paths over %2 steps...")+ .arg(int_inputs_["gn_pf_n_paths"]->value())+ .arg(int_inputs_["gn_pf_horizon"]->value()));+ QJsonObject params;+ params["values"] = vals;+ params["horizon"] = int_inputs_["gn_pf_horizon"]->value();+ params["lags"] = int_inputs_["gn_pf_lags"]->value();+ params["n_paths"] = int_inputs_["gn_pf_n_paths"]->value();+ AIQuantLabService::instance().gluon_probabilistic_forecast(params);+ });+ pfl->addWidget(pf_run);+ pfl->addStretch();+ tabs->addTab(pf, "Probabilistic Forecast");++ // ── Quantile Forecast ────────────────────────────────────────────────────+ auto* qf = new QWidget(this);+ auto* qfl = new QVBoxLayout(qf);+ qfl->setContentsMargins(12, 12, 12, 12);+ qfl->setSpacing(8);++ auto* qf_vals = new QLineEdit(qf);+ qf_vals->setPlaceholderText("Series values (>= 30)");+ qf_vals->setStyleSheet(input_ss());+ text_inputs_["gn_qf_values"] = qf_vals;+ qfl->addWidget(build_input_row("Series Values", qf_vals, qf));+ qfl->addWidget(add_sample_btn(qf_vals, qf, 321, "200-pt synthetic series"));++ auto* qf_quantiles = new QLineEdit(qf);+ qf_quantiles->setPlaceholderText("Quantiles in (0, 1) — e.g. 0.05, 0.5, 0.95");+ qf_quantiles->setText("0.05, 0.25, 0.5, 0.75, 0.95");+ qf_quantiles->setStyleSheet(input_ss());+ text_inputs_["gn_qf_quantiles"] = qf_quantiles;+ qfl->addWidget(build_input_row("Quantile List", qf_quantiles, qf));++ auto* qf_horizon = new QSpinBox(qf);+ qf_horizon->setRange(1, 365);+ qf_horizon->setValue(14);+ qf_horizon->setStyleSheet(spinbox_ss());+ int_inputs_["gn_qf_horizon"] = qf_horizon;+ qfl->addWidget(build_input_row("Forecast Horizon", qf_horizon, qf));++ auto* qf_lags = new QSpinBox(qf);+ qf_lags->setRange(1, 60);+ qf_lags->setValue(7);+ qf_lags->setStyleSheet(spinbox_ss());+ int_inputs_["gn_qf_lags"] = qf_lags;+ qfl->addWidget(build_input_row("AR Lag Window", qf_lags, qf));++ auto* qf_npaths = new QSpinBox(qf);+ qf_npaths->setRange(100, 5000);+ qf_npaths->setSingleStep(100);+ qf_npaths->setValue(500);+ qf_npaths->setStyleSheet(spinbox_ss());+ int_inputs_["gn_qf_n_paths"] = qf_npaths;+ qfl->addWidget(build_input_row("Bootstrap Paths", qf_npaths, qf));++ auto* qf_run = make_run_button("RUN QUANTILE FORECAST", qf);+ connect(qf_run, &QPushButton::clicked, this, [this]() {+ QJsonArray vals, quants;+ QString bad;+ if (!parse_doubles(text_inputs_["gn_qf_values"]->text(), vals, &bad)) {+ display_error(QString("Series Values: '%1' is not numeric.").arg(bad));+ return;+ }+ if (vals.size() < 30) {+ display_error(QString("Need at least 30 obs; you provided %1.").arg(vals.size()));+ return;+ }+ if (!parse_doubles(text_inputs_["gn_qf_quantiles"]->text(), quants, &bad)) {+ display_error(QString("Quantiles: '%1' is not numeric.").arg(bad));+ return;+ }+ if (quants.isEmpty()) {+ display_error("Provide at least one quantile in (0, 1).");+ return;+ }+ for (const auto& v : quants) {+ const double q = v.toDouble();+ if (!(0.0 < q && q < 1.0)) {+ display_error(QString("Quantile %1 must be in (0, 1).").arg(q));+ return;+ }+ }+ show_loading(QString("Bootstrapping %1 paths and computing %2 quantiles...")+ .arg(int_inputs_["gn_qf_n_paths"]->value()).arg(quants.size()));+ QJsonObject params;+ params["values"] = vals;+ params["quantiles"] = quants;+ params["horizon"] = int_inputs_["gn_qf_horizon"]->value();+ params["lags"] = int_inputs_["gn_qf_lags"]->value();+ params["n_paths"] = int_inputs_["gn_qf_n_paths"]->value();+ AIQuantLabService::instance().gluon_quantile_forecast(params);+ });+ qfl->addWidget(qf_run);+ qfl->addStretch();+ tabs->addTab(qf, "Quantile Forecast");++ // ── Distribution Fit ─────────────────────────────────────────────────────+ auto* df = new QWidget(this);+ auto* dfl = new QVBoxLayout(df);+ dfl->setContentsMargins(12, 12, 12, 12);+ dfl->setSpacing(8);++ auto* df_vals = new QLineEdit(df);+ df_vals->setPlaceholderText("Numeric values (>= 30). Fits normal, student-t, lognormal (positive only), skewnormal.");+ df_vals->setStyleSheet(input_ss());+ text_inputs_["gn_df_values"] = df_vals;+ dfl->addWidget(build_input_row("Values", df_vals, df));+ dfl->addWidget(add_sample_btn(df_vals, df, 331, "200-pt synthetic series"));++ auto* df_hint = new QLabel(+ "Fits 4 candidate distributions and ranks them by AIC + BIC. KS test reports whether each "+ "fit can be rejected at the 5% level — useful for picking the right tail model.", df);+ df_hint->setWordWrap(true);+ df_hint->setStyleSheet(QString("color:%1; font-size:10px;").arg(ui::colors::TEXT_TERTIARY()));+ dfl->addWidget(df_hint);++ auto* df_run = make_run_button("FIT DISTRIBUTIONS", df);+ connect(df_run, &QPushButton::clicked, this, [this]() {+ QJsonArray vals;+ QString bad;+ if (!parse_doubles(text_inputs_["gn_df_values"]->text(), vals, &bad)) {+ display_error(QString("Values: '%1' is not numeric.").arg(bad));+ return;+ }+ if (vals.size() < 30) {+ display_error(QString("Need at least 30 values; you provided %1.").arg(vals.size()));+ return;+ }+ show_loading(QString("Fitting 4 distributions to %1 values...").arg(vals.size()));+ QJsonObject params;+ params["values"] = vals;+ AIQuantLabService::instance().gluon_distribution_fit(params);+ });+ dfl->addWidget(df_run);+ dfl->addStretch();+ tabs->addTab(df, "Distribution Fit");++ // ── Evaluate Forecast ────────────────────────────────────────────────────+ auto* ef = new QWidget(this);+ auto* efl = new QVBoxLayout(ef);+ efl->setContentsMargins(12, 12, 12, 12);+ efl->setSpacing(8);++ auto* ef_actuals = new QLineEdit(ef);+ ef_actuals->setPlaceholderText("Realized actuals (>= 5 values)");+ ef_actuals->setStyleSheet(input_ss());+ text_inputs_["gn_ef_actuals"] = ef_actuals;+ efl->addWidget(build_input_row("Actuals", ef_actuals, ef));+ efl->addWidget(add_sample_btn(ef_actuals, ef, 341, "100-pt synthetic actuals"));++ auto* ef_point = new QLineEdit(ef);+ ef_point->setPlaceholderText("Point forecast (same length as actuals)");+ ef_point->setStyleSheet(input_ss());+ text_inputs_["gn_ef_point"] = ef_point;+ efl->addWidget(build_input_row("Point Forecast", ef_point, ef));+ efl->addWidget(add_sample_btn(ef_point, ef, 342, "100-pt synthetic point forecast"));++ auto* ef_lower = new QLineEdit(ef);+ ef_lower->setPlaceholderText("Lower band (optional, same length as actuals)");+ ef_lower->setStyleSheet(input_ss());+ text_inputs_["gn_ef_lower"] = ef_lower;+ efl->addWidget(build_input_row("Lower Band (optional)", ef_lower, ef));++ auto* ef_upper = new QLineEdit(ef);+ ef_upper->setPlaceholderText("Upper band (optional, same length as actuals)");+ ef_upper->setStyleSheet(input_ss());+ text_inputs_["gn_ef_upper"] = ef_upper;+ efl->addWidget(build_input_row("Upper Band (optional)", ef_upper, ef));++ auto* ef_training = new QLineEdit(ef);+ ef_training->setPlaceholderText("Training history (optional; enables MASE)");+ ef_training->setStyleSheet(input_ss());+ text_inputs_["gn_ef_training"] = ef_training;+ efl->addWidget(build_input_row("Training History (optional)", ef_training, ef));+ efl->addWidget(add_sample_btn(ef_training, ef, 343, "200-pt synthetic training history"));++ auto* ef_season = new QSpinBox(ef);+ ef_season->setRange(1, 365);+ ef_season->setValue(1);+ ef_season->setStyleSheet(spinbox_ss());+ int_inputs_["gn_ef_season"] = ef_season;+ efl->addWidget(build_input_row("MASE Seasonal Period", ef_season, ef));++ auto* ef_target = make_double_spin(50.0, 99.9, 80.0, 1, "%", ef);+ double_inputs_["gn_ef_target"] = ef_target;+ efl->addWidget(build_input_row("Coverage Target", ef_target, ef));++ auto* ef_run = make_run_button("EVALUATE FORECAST", ef);+ connect(ef_run, &QPushButton::clicked, this, [this]() {+ QJsonArray actuals, point;+ QString bad;+ if (!parse_doubles(text_inputs_["gn_ef_actuals"]->text(), actuals, &bad)) {+ display_error(QString("Actuals: '%1' is not numeric.").arg(bad));+ return;+ }+ if (!parse_doubles(text_inputs_["gn_ef_point"]->text(), point, &bad)) {+ display_error(QString("Point: '%1' is not numeric.").arg(bad));+ return;+ }+ if (actuals.size() < 5) {+ display_error(QString("Need at least 5 actuals; you provided %1.").arg(actuals.size()));+ return;+ }+ if (actuals.size() != point.size()) {+ display_error(QString("Actuals (%1) and point (%2) must have the same length.")+ .arg(actuals.size()).arg(point.size()));+ return;+ }+ QJsonObject params;+ params["actuals"] = actuals;+ params["point"] = point;+ params["coverage_target_pct"] = double_inputs_["gn_ef_target"]->value();++ const QString lo_text = text_inputs_["gn_ef_lower"]->text().trimmed();+ const QString hi_text = text_inputs_["gn_ef_upper"]->text().trimmed();+ if (!lo_text.isEmpty() || !hi_text.isEmpty()) {+ QJsonArray lower, upper;+ if (!parse_doubles(lo_text, lower, &bad)) {+ display_error(QString("Lower band: '%1' is not numeric.").arg(bad));+ return;+ }+ if (!parse_doubles(hi_text, upper, &bad)) {+ display_error(QString("Upper band: '%1' is not numeric.").arg(bad));+ return;+ }+ if (lower.size() != actuals.size() || upper.size() != actuals.size()) {+ display_error("Lower and upper bands must match actuals length.");+ return;+ }+ params["lower"] = lower;+ params["upper"] = upper;+ }++ const QString train_text = text_inputs_["gn_ef_training"]->text().trimmed();+ if (!train_text.isEmpty()) {+ QJsonArray training;+ if (!parse_doubles(train_text, training, &bad)) {+ display_error(QString("Training: '%1' is not numeric.").arg(bad));+ return;+ }+ params["training"] = training;+ params["season"] = int_inputs_["gn_ef_season"]->value();+ }++ show_loading(QString("Evaluating forecast on %1 obs...").arg(actuals.size()));+ AIQuantLabService::instance().gluon_evaluate_forecast(params);+ });+ efl->addWidget(ef_run);+ efl->addStretch();+ tabs->addTab(ef, "Evaluate Forecast");++ // ── Seasonal Naive ───────────────────────────────────────────────────────+ auto* sn = new QWidget(this);+ auto* snl = new QVBoxLayout(sn);+ snl->setContentsMargins(12, 12, 12, 12);+ snl->setSpacing(8);++ auto* sn_vals = new QLineEdit(sn);+ sn_vals->setPlaceholderText("Series values (>= 1). Forecast = repeat last `season_length` observations.");+ sn_vals->setStyleSheet(input_ss());+ text_inputs_["gn_sn_values"] = sn_vals;+ snl->addWidget(build_input_row("Series Values", sn_vals, sn));+ snl->addWidget(add_sample_btn(sn_vals, sn, 351, "200-pt synthetic series"));++ auto* sn_horizon = new QSpinBox(sn);+ sn_horizon->setRange(1, 365);+ sn_horizon->setValue(14);+ sn_horizon->setStyleSheet(spinbox_ss());+ int_inputs_["gn_sn_horizon"] = sn_horizon;+ snl->addWidget(build_input_row("Forecast Horizon", sn_horizon, sn));++ auto* sn_season = new QSpinBox(sn);+ sn_season->setRange(1, 365);+ sn_season->setValue(1);+ sn_season->setStyleSheet(spinbox_ss());+ int_inputs_["gn_sn_season"] = sn_season;+ snl->addWidget(build_input_row("Season Length (1 = pure naive)", sn_season, sn));++ auto* sn_hint = new QLabel(+ "Baseline forecaster everyone compares against. season_length=1 is the pure naive 'repeat last value'. "+ "Larger values cycle through the most recent N observations.", sn);+ sn_hint->setWordWrap(true);+ sn_hint->setStyleSheet(QString("color:%1; font-size:10px;").arg(ui::colors::TEXT_TERTIARY()));+ snl->addWidget(sn_hint);++ auto* sn_run = make_run_button("RUN SEASONAL NAIVE", sn);+ connect(sn_run, &QPushButton::clicked, this, [this]() {+ QJsonArray vals;+ QString bad;+ if (!parse_doubles(text_inputs_["gn_sn_values"]->text(), vals, &bad)) {+ display_error(QString("Series Values: '%1' is not numeric.").arg(bad));+ return;+ }+ if (vals.isEmpty()) {+ display_error("Provide at least 1 observation.");+ return;+ }+ const int season = int_inputs_["gn_sn_season"]->value();+ if (season > vals.size()) {+ display_error(QString("Season length (%1) exceeds series length (%2).")+ .arg(season).arg(vals.size()));+ return;+ }+ show_loading(QString("Repeating last %1 obs forward over %2 steps...")+ .arg(season).arg(int_inputs_["gn_sn_horizon"]->value()));+ QJsonObject params;+ params["values"] = vals;+ params["horizon"] = int_inputs_["gn_sn_horizon"]->value();+ params["season_length"] = season;+ AIQuantLabService::instance().gluon_seasonal_naive(params);+ });+ snl->addWidget(sn_run);+ snl->addStretch();+ tabs->addTab(sn, "Seasonal Naive");++ vl->addWidget(tabs);++ auto* rc = new QWidget(w);+ results_layout_ = new QVBoxLayout(rc);+ results_layout_->setContentsMargins(0, 8, 0, 0);+ results_layout_->setSpacing(8);+ vl->addWidget(rc);++ return w;+}++// ── GLUONTS: rich card-based display per command ────────────────────────────++void QuantModulePanel::display_gluonts_result(const QString& command, const QJsonObject& payload) {+ clear_results();++ if (!payload.value("success").toBool(false)) {+ const QString err = payload.value("error").toString("Unknown error");+ const QString kind = payload.value("error_kind").toString();+ const QString prefix = kind == "validation" ? "Input error: "+ : kind == "runtime" ? "Computation failed: "+ : "";+ display_error(prefix + err);+ return;+ }++ const QJsonObject d = payload.value("data").toObject();+ const QString accent = module_.color.name();++ QString header_text = command.toUpper();+ header_text.replace('_', ' ');+ if (d.contains("n_observations"))+ header_text += QString(" | %1 OBS").arg(d.value("n_observations").toInt());+ results_layout_->addWidget(gs_section_header(header_text, accent));++ // ── 1. CHECK STATUS ──────────────────────────────────────────────────────+ if (command == "check_status") {+ auto bool_card = [this](const QString& label, bool ok) {+ return gs_make_card(label, ok ? "AVAILABLE" : "MISSING", this,+ ok ? ui::colors::POSITIVE() : ui::colors::NEGATIVE());+ };+ QList<QWidget*> deps = {+ bool_card("SCIPY", d.value("scipy").toBool()),+ bool_card("SKLEARN", d.value("sklearn").toBool()),+ gs_make_card("BACKEND", d.value("backend").toString().toUpper(), this),+ gs_make_card("OPS", QString::number(d.value("ops_available").toArray().size()),+ this, ui::colors::INFO()),+ };+ results_layout_->addWidget(gs_card_row(deps, this));++ const auto note = d.value("note").toString();+ if (!note.isEmpty()) {+ auto* lbl = new QLabel(note);+ lbl->setWordWrap(true);+ lbl->setStyleSheet(QString("color:%1; font-size:10px; font-family:'Courier New';"+ "padding:8px 10px; background:%2; border:1px solid %3;")+ .arg(ui::colors::TEXT_SECONDARY(), ui::colors::BG_SURFACE(),+ ui::colors::BORDER_DIM()));+ results_layout_->addWidget(lbl);+ }+ status_label_->setText("GluonTS backend ready");+ return;+ }++ // ── 2. PROBABILISTIC FORECAST ───────────────────────────────────────────+ if (command == "probabilistic_forecast") {+ const int horizon = d.value("horizon").toInt();+ const int n_paths = d.value("n_paths").toInt();+ const double last_actual = d.value("last_actual").toDouble();+ const double first_p50 = d.value("first_forecast_p50").toDouble();+ const double last_p50 = d.value("last_forecast_p50").toDouble();+ const double drift = d.value("horizon_drift").toDouble();+ const double avg_w = d.value("mean_p80_width").toDouble();+ const double first_w = d.value("first_p80_width").toDouble();+ const double last_w = d.value("last_p80_width").toDouble();++ auto* hdr = new QLabel(QString("HORIZON %1 STEPS | %2 BOOTSTRAP PATHS | LAGS %3")+ .arg(horizon).arg(n_paths).arg(d.value("lags").toInt()));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(), accent));+ results_layout_->addWidget(hdr);++ QList<QWidget*> top = {+ gs_make_card("LAST ACTUAL", gs_fmt_num(last_actual, 4), this),+ gs_make_card("FIRST P50", gs_fmt_num(first_p50, 4), this,+ gs_pos_neg_color(first_p50 - last_actual)),+ gs_make_card("LAST P50", gs_fmt_num(last_p50, 4), this, gs_pos_neg_color(drift)),+ gs_make_card("HORIZON Δ", gs_fmt_num(drift, 4), this, gs_pos_neg_color(drift)),+ };+ results_layout_->addWidget(gs_card_row(top, this));++ QList<QWidget*> width = {+ gs_make_card("AVG P80 WIDTH", gs_fmt_num(avg_w, 4), this, ui::colors::WARNING()),+ gs_make_card("FIRST P80 WIDTH", gs_fmt_num(first_w, 4), this),+ gs_make_card("LAST P80 WIDTH", gs_fmt_num(last_w, 4), this,+ last_w > first_w * 2 ? ui::colors::NEGATIVE() : ui::colors::WARNING()),+ gs_make_card("RESIDUAL σ", gs_fmt_num(d.value("residual_std").toDouble(), 4), this),+ };+ results_layout_->addWidget(gs_card_row(width, this));++ // Forecast table — every step with all 5 quantiles+ const QJsonArray forecast = d.value("forecast").toArray();+ if (!forecast.isEmpty()) {+ auto* table = new QTableWidget(forecast.size(), 8, this);+ table->setHorizontalHeaderLabels({"Step", "P10", "P25", "P50", "Mean", "P75", "P90", "P80 Width"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->setSelectionMode(QAbstractItemView::NoSelection);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(forecast.size() * 22 + 32, 320));+ for (int i = 0; i < forecast.size(); ++i) {+ const auto o = forecast[i].toObject();+ table->setItem(i, 0, new QTableWidgetItem(QString::number(o.value("step").toInt())));+ auto add = [&](int col, double v, const QString& col_color = {}) {+ auto* it = new QTableWidgetItem(QString::number(v, 'f', 4));+ it->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ if (!col_color.isEmpty()) it->setForeground(QColor(col_color));+ table->setItem(i, col, it);+ };+ add(1, o.value("p10").toDouble(), ui::colors::NEGATIVE());+ add(2, o.value("p25").toDouble(), ui::colors::WARNING());+ add(3, o.value("p50").toDouble());+ add(4, o.value("mean").toDouble(), ui::colors::INFO());+ add(5, o.value("p75").toDouble(), ui::colors::WARNING());+ add(6, o.value("p90").toDouble(), ui::colors::POSITIVE());+ add(7, o.value("width_80").toDouble());+ table->setRowHeight(i, 22);+ }+ results_layout_->addWidget(table);+ }++ status_label_->setText(QString("Forecast: P50 %1 → %2 | P80 width %3 → %4")+ .arg(first_p50, 0, 'f', 3).arg(last_p50, 0, 'f', 3)+ .arg(first_w, 0, 'f', 3).arg(last_w, 0, 'f', 3));+ return;+ }++ // ── 3. QUANTILE FORECAST ────────────────────────────────────────────────+ if (command == "quantile_forecast") {+ const int horizon = d.value("horizon").toInt();+ const int n_q = d.value("n_quantiles").toInt();++ auto* hdr = new QLabel(QString("HORIZON %1 STEPS | %2 QUANTILES | %3 BOOTSTRAP PATHS")+ .arg(horizon).arg(n_q).arg(d.value("n_paths").toInt()));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(), accent));+ results_layout_->addWidget(hdr);++ QList<QWidget*> top = {+ gs_make_card("LAST ACTUAL", gs_fmt_num(d.value("last_actual").toDouble(), 4), this),+ gs_make_card("LAGS", QString::number(d.value("lags").toInt()), this),+ gs_make_card("RESIDUAL σ", gs_fmt_num(d.value("residual_std").toDouble(), 4), this),+ gs_make_card("OBSERVATIONS", QString::number(d.value("n_observations").toInt()), this),+ };+ results_layout_->addWidget(gs_card_row(top, this));++ // Per-quantile summary cards (up to 4 at a time)+ const QJsonArray q_summary = d.value("quantile_summary").toArray();+ if (!q_summary.isEmpty()) {+ auto* lbl = new QLabel("PER-QUANTILE SUMMARY");+ lbl->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; padding:4px 0 0 2px;")+ .arg(ui::colors::TEXT_TERTIARY()));+ results_layout_->addWidget(lbl);+ auto* table = new QTableWidget(q_summary.size(), 6, this);+ table->setHorizontalHeaderLabels({"Quantile", "Mean", "Min", "Max", "First", "Last"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(q_summary.size() * 24 + 32, 240));+ for (int i = 0; i < q_summary.size(); ++i) {+ const auto q = q_summary[i].toObject();+ table->setItem(i, 0, new QTableWidgetItem(q.value("label").toString()));+ auto add = [&](int col, double v) {+ auto* it = new QTableWidgetItem(QString::number(v, 'f', 4));+ it->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, col, it);+ };+ add(1, q.value("mean").toDouble());+ add(2, q.value("min").toDouble());+ add(3, q.value("max").toDouble());+ add(4, q.value("first").toDouble());+ add(5, q.value("last").toDouble());+ table->setRowHeight(i, 24);+ }+ results_layout_->addWidget(table);+ }++ // Per-step forecast table — show first quantile row to derive headers+ const QJsonArray forecast = d.value("forecast").toArray();+ if (!forecast.isEmpty()) {+ const auto first = forecast[0].toObject();+ QStringList headers = {"Step"};+ QStringList keys;+ for (auto it = first.begin(); it != first.end(); ++it) {+ if (it.key() == "step") continue;+ keys << it.key();+ headers << it.key().toUpper();+ }+ auto* lbl = new QLabel("FORECAST BY STEP");+ lbl->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; padding:4px 0 0 2px;")+ .arg(ui::colors::TEXT_TERTIARY()));+ results_layout_->addWidget(lbl);+ auto* table = new QTableWidget(forecast.size(), headers.size(), this);+ table->setHorizontalHeaderLabels(headers);+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(forecast.size() * 22 + 32, 280));+ for (int i = 0; i < forecast.size(); ++i) {+ const auto o = forecast[i].toObject();+ table->setItem(i, 0, new QTableWidgetItem(QString::number(o.value("step").toInt())));+ for (int c = 0; c < keys.size(); ++c) {+ auto* it = new QTableWidgetItem(+ QString::number(o.value(keys[c]).toDouble(), 'f', 4));+ it->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, c + 1, it);+ }+ table->setRowHeight(i, 22);+ }+ results_layout_->addWidget(table);+ }+ status_label_->setText(QString("%1 quantiles over %2 steps").arg(n_q).arg(horizon));+ return;+ }++ // ── 4. DISTRIBUTION FIT ─────────────────────────────────────────────────+ if (command == "distribution_fit") {+ const QString best_aic = d.value("best_by_aic").toString();+ const QString best_bic = d.value("best_by_bic").toString();++ auto* hdr = new QLabel(QString("BEST BY AIC: %1 | BEST BY BIC: %2")+ .arg(best_aic.toUpper()).arg(best_bic.toUpper()));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(),+ ui::colors::POSITIVE()));+ results_layout_->addWidget(hdr);++ QList<QWidget*> stats = {+ gs_make_card("MEAN", gs_fmt_num(d.value("data_mean").toDouble(), 4), this),+ gs_make_card("STD", gs_fmt_num(d.value("data_std").toDouble(), 4), this),+ gs_make_card("SKEW", gs_fmt_num(d.value("data_skew").toDouble(), 3), this,+ gs_pos_neg_color(d.value("data_skew").toDouble())),+ gs_make_card("KURT", gs_fmt_num(d.value("data_kurtosis").toDouble(), 3), this),+ };+ results_layout_->addWidget(gs_card_row(stats, this));++ // Fits table+ const QJsonArray fits = d.value("fits").toArray();+ if (!fits.isEmpty()) {+ auto* table = new QTableWidget(fits.size(), 6, this);+ table->setHorizontalHeaderLabels({"Distribution", "Params", "Log-Lik", "AIC", "BIC", "KS p"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(fits.size() * 26 + 32, 240));++ // Find min AIC for highlighting+ double min_aic = std::numeric_limits<double>::infinity();+ for (const auto& v : fits) {+ const auto f = v.toObject();+ if (!f.value("aic").isNull()) {+ const double a = f.value("aic").toDouble();+ if (a < min_aic) min_aic = a;+ }+ }++ for (int i = 0; i < fits.size(); ++i) {+ const auto f = fits[i].toObject();+ const QString name = f.value("distribution").toString();+ const bool is_best = (!f.value("aic").isNull() &&+ std::abs(f.value("aic").toDouble() - min_aic) < 1e-9);+ auto* nm = new QTableWidgetItem(is_best ? name + " ★" : name);+ if (is_best) nm->setForeground(QColor(ui::colors::POSITIVE()));+ table->setItem(i, 0, nm);+ table->setItem(i, 1, new QTableWidgetItem(QString::number(f.value("n_params").toInt())));+ auto add = [&](int col, const QJsonValue& v, int dec) {+ auto* it = v.isNull()+ ? new QTableWidgetItem("—")+ : new QTableWidgetItem(QString::number(v.toDouble(), 'f', dec));+ it->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, col, it);+ };+ add(2, f.value("log_likelihood"), 2);+ add(3, f.value("aic"), 2);+ add(4, f.value("bic"), 2);+ const double ks_p = f.value("ks_p_value").toDouble();+ auto* ksi = new QTableWidgetItem(QString::number(ks_p, 'f', 4));+ ksi->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ ksi->setForeground(QColor(f.value("cannot_reject_at_5pct").toBool()+ ? ui::colors::POSITIVE()+ : ui::colors::WARNING()));+ table->setItem(i, 5, ksi);+ table->setRowHeight(i, 26);+ }+ results_layout_->addWidget(table);+ }++ status_label_->setText(QString("Best fit: %1 (AIC) / %2 (BIC)").arg(best_aic).arg(best_bic));+ return;+ }++ // ── 5. EVALUATE FORECAST ────────────────────────────────────────────────+ if (command == "evaluate_forecast") {+ const double mae = d.value("mae").toDouble();+ const double rmse = d.value("rmse").toDouble();+ const double mape = d.value("mape_pct").toDouble();+ const double smape = d.value("smape_pct").toDouble();+ const double bias = d.value("bias").toDouble();+ const double dir_acc = d.value("direction_accuracy_pct").toDouble();+ const bool has_ci = d.value("has_intervals").toBool();++ QList<QWidget*> err_row = {+ gs_make_card("MAE", gs_fmt_num(mae, 4), this),+ gs_make_card("RMSE", gs_fmt_num(rmse, 4), this),+ gs_make_card("MSE", gs_fmt_num(d.value("mse").toDouble(), 4), this),+ gs_make_card("BIAS", gs_fmt_num(bias, 4), this, gs_pos_neg_color(-std::abs(bias))),+ };+ results_layout_->addWidget(gs_card_row(err_row, this));++ QList<QWidget*> pct_row = {+ gs_make_card("MAPE", QString::number(mape, 'f', 2) + "%", this,+ mape < 10 ? ui::colors::POSITIVE()+ : mape < 30 ? ui::colors::WARNING()+ : ui::colors::NEGATIVE()),+ gs_make_card("SMAPE", QString::number(smape, 'f', 2) + "%", this,+ smape < 10 ? ui::colors::POSITIVE()+ : smape < 30 ? ui::colors::WARNING()+ : ui::colors::NEGATIVE()),+ gs_make_card("MASE",+ d.value("mase").isNull() ? QString("—")+ : gs_fmt_num(d.value("mase").toDouble(), 3),+ this,+ d.value("mase").isNull() ? ui::colors::TEXT_PRIMARY()+ : (d.value("mase").toDouble() < 1.0 ? ui::colors::POSITIVE()+ : ui::colors::WARNING())),+ gs_make_card("DIRECTION ACC", QString::number(dir_acc, 'f', 1) + "%", this,+ dir_acc > 60 ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ };+ results_layout_->addWidget(gs_card_row(pct_row, this));++ if (has_ci) {+ const double cov = d.value("coverage_pct").toDouble();+ const double target = d.value("coverage_target_pct").toDouble();+ const double cov_gap = cov - target;+ QList<QWidget*> ci_row = {+ gs_make_card("COVERAGE", QString::number(cov, 'f', 1) + "%", this,+ std::abs(cov_gap) < 5.0 ? ui::colors::POSITIVE()+ : ui::colors::WARNING()),+ gs_make_card("TARGET", QString::number(target, 'f', 1) + "%", this, ui::colors::INFO()),+ gs_make_card("AVG WIDTH", gs_fmt_num(d.value("avg_interval_width").toDouble(), 4), this),+ gs_make_card("INTERVAL SCORE",+ gs_fmt_num(d.value("interval_score").toDouble(), 4), this,+ ui::colors::INFO()),+ };+ results_layout_->addWidget(gs_card_row(ci_row, this));++ // Interpretation+ QString verdict;+ QString verdict_col = ui::colors::TEXT_PRIMARY();+ if (std::abs(cov_gap) < 5.0) {+ verdict = "Coverage on target — intervals are well-calibrated.";+ verdict_col = ui::colors::POSITIVE();+ } else if (cov_gap > 5.0) {+ verdict = QString("Over-covered by %1pp — intervals are too wide (conservative).").arg(cov_gap, 0, 'f', 1);+ verdict_col = ui::colors::WARNING();+ } else {+ verdict = QString("Under-covered by %1pp — intervals are too narrow (overconfident).").arg(-cov_gap, 0, 'f', 1);+ verdict_col = ui::colors::NEGATIVE();+ }+ auto* il = new QLabel(verdict);+ il->setStyleSheet(QString("color:%1; font-size:10px; font-family:'Courier New';"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(), verdict_col));+ results_layout_->addWidget(il);+ }++ status_label_->setText(+ has_ci+ ? QString("MAE %1 RMSE %2 MAPE %3%% Coverage %4%%")+ .arg(mae, 0, 'f', 3).arg(rmse, 0, 'f', 3).arg(mape, 0, 'f', 2)+ .arg(d.value("coverage_pct").toDouble(), 0, 'f', 1)+ : QString("MAE %1 RMSE %2 MAPE %3%% Bias %4")+ .arg(mae, 0, 'f', 3).arg(rmse, 0, 'f', 3).arg(mape, 0, 'f', 2).arg(bias, 0, 'f', 4));+ return;+ }++ // ── 6. SEASONAL NAIVE ───────────────────────────────────────────────────+ if (command == "seasonal_naive") {+ const int horizon = d.value("horizon").toInt();+ const int season = d.value("season_length").toInt();++ auto* hdr = new QLabel(QString("METHOD: %1 | HORIZON %2 STEPS")+ .arg(d.value("method").toString().toUpper()).arg(horizon));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(), accent));+ results_layout_->addWidget(hdr);++ const double last_actual = d.value("last_actual").toDouble();+ const double first_fc = d.value("first_forecast").toDouble();+ const double last_fc = d.value("last_forecast").toDouble();++ QList<QWidget*> top = {+ gs_make_card("LAST ACTUAL", gs_fmt_num(last_actual, 4), this),+ gs_make_card("FIRST FORECAST", gs_fmt_num(first_fc, 4), this,+ gs_pos_neg_color(first_fc - last_actual)),+ gs_make_card("LAST FORECAST", gs_fmt_num(last_fc, 4), this,+ gs_pos_neg_color(last_fc - last_actual)),+ gs_make_card("SEASON", QString("%1 obs").arg(season), this, ui::colors::INFO()),+ };+ results_layout_->addWidget(gs_card_row(top, this));++ QList<QWidget*> bounds = {+ gs_make_card("FORECAST MIN", gs_fmt_num(d.value("forecast_min").toDouble(), 4), this,+ ui::colors::NEGATIVE()),+ gs_make_card("FORECAST MEAN", gs_fmt_num(d.value("forecast_mean").toDouble(), 4), this),+ gs_make_card("FORECAST MAX", gs_fmt_num(d.value("forecast_max").toDouble(), 4), this,+ ui::colors::POSITIVE()),+ gs_make_card("OBSERVATIONS", QString::number(d.value("n_observations").toInt()), this),+ };+ results_layout_->addWidget(gs_card_row(bounds, this));++ // Forecast table — every step+ const QJsonArray forecast = d.value("forecast").toArray();+ if (!forecast.isEmpty()) {+ auto* table = new QTableWidget(forecast.size(), 2, this);+ table->setHorizontalHeaderLabels({"Step", "Value"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(forecast.size() * 22 + 32, 320));+ for (int i = 0; i < forecast.size(); ++i) {+ const auto o = forecast[i].toObject();+ const double v = o.value("value").toDouble();+ table->setItem(i, 0, new QTableWidgetItem(QString::number(o.value("step").toInt())));+ auto* vi = new QTableWidgetItem(QString::number(v, 'f', 4));+ vi->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ vi->setForeground(QColor(gs_pos_neg_color(v - last_actual)));+ table->setItem(i, 1, vi);+ table->setRowHeight(i, 22);+ }+ results_layout_->addWidget(table);+ }+ status_label_->setText(QString("%1 — last %2 → forecast %3")+ .arg(d.value("method").toString())+ .arg(last_actual, 0, 'f', 3)+ .arg(first_fc, 0, 'f', 3));+ return;+ }++ // ── Fallback ─────────────────────────────────────────────────────────────+ display_result(d);+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_GsHelpers.h b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_GsHelpers.hnew file mode 100644index 000000000..6121db50f--- /dev/null+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_GsHelpers.h@@ -0,0 +1,111 @@+// src/screens/ai_quant_lab/QuantModulePanel_GsHelpers.h+//+// Private header — included only by QuantModulePanel*.cpp translation units.+// Provides the GS-Quant-style card / section / formatting helpers that were+// originally file-static in QuantModulePanel.cpp. Multiple display TUs+// (Functime, Statsmodels, Fortitudo, Gluonts, CFA, Backtesting, Quant Reporting)+// share these — and the original GS Quant TU still uses them too — so they+// live in a shared inline-namespace header.+#pragma once++#include "ui/theme/Theme.h"++#include <QHBoxLayout>+#include <QJsonValue>+#include <QLabel>+#include <QList>+#include <QString>+#include <QVBoxLayout>+#include <QWidget>++#include <cmath>++namespace fincept::screens::quant_gs_helpers {++// One labeled metric card in the same visual style as the HFT panel.+inline QWidget* gs_make_card(const QString& label, const QString& value, QWidget* parent,+ const QString& value_color = {}) {+ auto* card = new QWidget(parent);+ card->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:3px;")+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));+ auto* cvl = new QVBoxLayout(card);+ cvl->setContentsMargins(10, 6, 10, 6);+ cvl->setSpacing(2);+ auto* l = new QLabel(label, card);+ l->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; letter-spacing:0.5px; background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ auto* v = new QLabel(value, card);+ v->setStyleSheet(QString("color:%1; font-size:13px; font-weight:700; font-family:'Courier New'; background:transparent;")+ .arg(value_color.isEmpty() ? QString(ui::colors::TEXT_PRIMARY()) : value_color));+ cvl->addWidget(l);+ cvl->addWidget(v);+ return card;+}++// A row of cards, evenly stretched.+inline QWidget* gs_card_row(const QList<QWidget*>& cards, QWidget* parent) {+ auto* row = new QWidget(parent);+ auto* hl = new QHBoxLayout(row);+ hl->setContentsMargins(0, 0, 0, 0);+ hl->setSpacing(6);+ for (auto* c : cards)+ hl->addWidget(c, 1);+ return row;+}++inline QString gs_fmt_pct(double v, int decimals = 2) {+ return QString("%1%").arg(v * 100.0, 0, 'f', decimals);+}++inline QString gs_fmt_money(double v) {+ const double a = std::abs(v);+ if (a >= 1e9) return QString("$%1B").arg(v / 1e9, 0, 'f', 2);+ if (a >= 1e6) return QString("$%1M").arg(v / 1e6, 0, 'f', 2);+ if (a >= 1e3) return QString("$%1K").arg(v / 1e3, 0, 'f', 2);+ return QString("$%1").arg(v, 0, 'f', 2);+}++inline QString gs_fmt_signed_money(double v) {+ return (v >= 0 ? QString("+") : QString("")) + gs_fmt_money(v);+}++inline QString gs_fmt_num(double v, int decimals = 4) {+ return QString::number(v, 'f', decimals);+}++inline QString gs_pos_neg_color(double v) {+ if (v > 0) return ui::colors::POSITIVE();+ if (v < 0) return ui::colors::NEGATIVE();+ return ui::colors::TEXT_PRIMARY();+}++// Format a JSON value as a human-friendly metric string. Used by the CFA Quant+// and generic display helpers to render flat scalar metrics tables.+inline QString format_val(const QJsonValue& val) {+ if (val.isDouble()) {+ double v = val.toDouble();+ if (std::abs(v) >= 1e9)+ return QString("$%1B").arg(v / 1e9, 0, 'f', 1);+ if (std::abs(v) >= 1e6)+ return QString("$%1M").arg(v / 1e6, 0, 'f', 1);+ if (std::abs(v) < 1.0 && std::abs(v) > 0.0001)+ return QString("%1%").arg(v * 100, 0, 'f', 2);+ return QString::number(v, 'f', 4);+ }+ if (val.isBool())+ return val.toBool() ? "YES" : "NO";+ if (val.isString())+ return val.toString();+ return QString::fromUtf8("—");+}++// Build a section header strip ("RISK METRICS | 252 obs").+inline QLabel* gs_section_header(const QString& text, const QString& accent) {+ auto* lbl = new QLabel(text);+ lbl->setStyleSheet(QString("color:%1; font-weight:700; font-size:10px; letter-spacing:1px;"+ "padding:6px 10px; background:%2; border-left:3px solid %1;")+ .arg(accent, ui::colors::BG_RAISED()));+ return lbl;+}++} // namespace fincept::screens::quant_gs_helpersdiff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Misc.cpp b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Misc.cppnew file mode 100644index 000000000..3850084d0--- /dev/null+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Misc.cpp@@ -0,0 +1,2085 @@+// src/screens/ai_quant_lab/QuantModulePanel_Misc.cpp+//+// Miscellaneous panel builders — Advanced Models, Feature Engineering,+// Portfolio Opt, Factor Evaluation, Strategy Builder, Data Processors, Factor+// Discovery, Model Library, Live Signals, Online Learning, Meta Learning, HFT,+// Rolling Retraining. Extracted from QuantModulePanel.cpp to keep that file+// maintainable.+#include "screens/ai_quant_lab/QuantModulePanel.h"+#include "screens/ai_quant_lab/QuantModulePanel_Common.h"+#include "screens/ai_quant_lab/QuantModulePanel_GsHelpers.h"+#include "screens/ai_quant_lab/QuantModulePanel_Styles.h"++#include "core/logging/Logger.h"+#include "services/ai_quant_lab/AIQuantLabService.h"+#include "services/file_manager/FileManagerService.h"+#include "ui/theme/Theme.h"++#include <QAbstractItemView>+#include <QColor>+#include <QComboBox>+#include <QDate>+#include <QDateEdit>+#include <QDateTime>+#include <QFile>+#include <QFileInfo>+#include <QFrame>+#include <QGridLayout>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QJsonArray>+#include <QJsonDocument>+#include <QJsonObject>+#include <QJsonValue>+#include <QLabel>+#include <QLineEdit>+#include <QList>+#include <QPlainTextEdit>+#include <QPointer>+#include <QProgressBar>+#include <QPushButton>+#include <QRegularExpression>+#include <QScrollArea>+#include <QSpinBox>+#include <QStackedWidget>+#include <QString>+#include <QStringList>+#include <QTabWidget>+#include <QTableWidget>+#include <QTableWidgetItem>+#include <QTextEdit>+#include <QUrl>+#include <QDesktopServices>+#include <QVBoxLayout>+#include <QWidget>++#include <algorithm>+#include <cmath>++namespace fincept::screens {++using namespace fincept::services::quant;+using namespace fincept::screens::quant_styles;+using namespace fincept::screens::quant_common;+using namespace fincept::screens::quant_gs_helpers;++// ═══════════════════════════════════════════════════════════════════════════════+// ADVANCED MODELS PANEL+// ═══════════════════════════════════════════════════════════════════════════════++QWidget* QuantModulePanel::build_advanced_models_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* model_type = new QComboBox(w);+ model_type->addItems(+ {"LSTM", "GRU", "Transformer", "Localformer", "HIST", "GAT", "LightGBM", "XGBoost", "CatBoost"});+ model_type->setStyleSheet(combo_ss());+ combo_inputs_["adv_model"] = model_type;+ vl->addWidget(build_input_row("Model Type", model_type, w));++ auto* hidden = new QSpinBox(w);+ hidden->setRange(16, 1024);+ hidden->setValue(64);+ hidden->setStyleSheet(spinbox_ss());+ int_inputs_["adv_hidden"] = hidden;+ vl->addWidget(build_input_row("Hidden Size", hidden, w));++ auto* layers = new QSpinBox(w);+ layers->setRange(1, 12);+ layers->setValue(2);+ layers->setStyleSheet(hidden->styleSheet());+ int_inputs_["adv_layers"] = layers;+ vl->addWidget(build_input_row("Num Layers", layers, w));++ auto* dropout = make_double_spin(0, 0.9, 0.1, 2, "", w);+ double_inputs_["adv_dropout"] = dropout;+ vl->addWidget(build_input_row("Dropout", dropout, w));++ auto* epochs = new QSpinBox(w);+ epochs->setRange(1, 1000);+ epochs->setValue(50);+ epochs->setStyleSheet(hidden->styleSheet());+ int_inputs_["adv_epochs"] = epochs;+ vl->addWidget(build_input_row("Epochs", epochs, w));++ auto* run = make_run_button("CREATE & TRAIN MODEL", w);+ connect(run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Training...");+ QJsonObject params;+ params["model_type"] = combo_inputs_["adv_model"]->currentText();+ QJsonObject config;+ config["hidden_size"] = int_inputs_["adv_hidden"]->value();+ config["num_layers"] = int_inputs_["adv_layers"]->value();+ config["dropout"] = double_inputs_["adv_dropout"]->value();+ config["epochs"] = int_inputs_["adv_epochs"]->value();+ params["model_config"] = config;+ AIQuantLabService::instance().train_advanced_model(params);+ });+ vl->addWidget(run);++ auto* rc = new QWidget(w);+ results_layout_ = new QVBoxLayout(rc);+ results_layout_->setContentsMargins(0, 8, 0, 0);+ results_layout_->setSpacing(8);+ vl->addWidget(rc);+ vl->addStretch();++ return w;+}+// ═══════════════════════════════════════════════════════════════════════════════+// FEATURE ENGINEERING PANEL+// ═══════════════════════════════════════════════════════════════════════════════+QWidget* QuantModulePanel::build_feature_engineering_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ // ── Indicators tab ──+ auto* ind = new QWidget(this);+ auto* ivl = new QVBoxLayout(ind);+ ivl->setContentsMargins(12, 12, 12, 12);+ ivl->setSpacing(8);++ auto* ind_data = new QLineEdit(ind);+ ind_data->setPlaceholderText("Price data (comma-separated, e.g. 100,102,101,105,108)");+ ind_data->setStyleSheet(input_ss());+ text_inputs_["fe_data"] = ind_data;+ ivl->addWidget(build_input_row("Price Data", ind_data, ind));++ auto* ind_indicator = new QComboBox(ind);+ ind_indicator->addItems({"moving_average", "rsi", "macd", "bollinger_bands", "momentum", "volatility", "returns",+ "log_returns", "drawdown"});+ ind_indicator->setStyleSheet(combo_ss());+ combo_inputs_["fe_indicator"] = ind_indicator;+ ivl->addWidget(build_input_row("Indicator", ind_indicator, ind));++ auto* ind_window = new QSpinBox(ind);+ ind_window->setRange(2, 200);+ ind_window->setValue(14);+ ind_window->setStyleSheet(spinbox_ss());+ int_inputs_["fe_window"] = ind_window;+ ivl->addWidget(build_input_row("Window", ind_window, ind));++ auto* ind_run = make_run_button("COMPUTE INDICATOR", ind);+ connect(ind_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Computing...");+ QJsonObject params;+ params["data"] = text_inputs_["fe_data"]->text();+ params["indicator"] = combo_inputs_["fe_indicator"]->currentText();+ params["window"] = int_inputs_["fe_window"]->value();+ AIQuantLabService::instance().feature_compute(params);+ });+ ivl->addWidget(ind_run);+ ivl->addStretch();+ tabs->addTab(ind, "Indicators");++ // ── Feature Selection tab ──+ auto* sel = new QWidget(this);+ auto* svl = new QVBoxLayout(sel);+ svl->setContentsMargins(12, 12, 12, 12);+ svl->setSpacing(8);++ auto* sel_features = new QLineEdit(sel);+ sel_features->setPlaceholderText("Feature values JSON: {\"rsi\":[...],\"macd\":[...]}");+ sel_features->setStyleSheet(input_ss());+ text_inputs_["fe_sel_features"] = sel_features;+ svl->addWidget(build_input_row("Features (JSON)", sel_features, sel));++ auto* sel_returns = new QLineEdit(sel);+ sel_returns->setPlaceholderText("Target returns (comma-separated)");+ sel_returns->setStyleSheet(input_ss());+ text_inputs_["fe_sel_returns"] = sel_returns;+ svl->addWidget(build_input_row("Returns", sel_returns, sel));++ auto* sel_topk = new QSpinBox(sel);+ sel_topk->setRange(1, 50);+ sel_topk->setValue(5);+ sel_topk->setStyleSheet(spinbox_ss());+ int_inputs_["fe_topk"] = sel_topk;+ svl->addWidget(build_input_row("Top-K Features", sel_topk, sel));++ auto* sel_run = make_run_button("SELECT FEATURES BY IC", sel);+ connect(sel_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Selecting...");+ QJsonObject params;+ auto feat_text = text_inputs_["fe_sel_features"]->text();+ auto doc = QJsonDocument::fromJson(feat_text.toUtf8());+ if (!doc.isNull())+ params["features"] = doc.object();+ params["returns"] = text_inputs_["fe_sel_returns"]->text();+ params["top_k"] = int_inputs_["fe_topk"]->value();+ AIQuantLabService::instance().feature_select_by_ic(params);+ });+ svl->addWidget(sel_run);+ svl->addStretch();+ tabs->addTab(sel, "Feature Selection");++ // ── Expression Engine tab ──+ auto* expr = new QWidget(this);+ auto* evl = new QVBoxLayout(expr);+ evl->setContentsMargins(12, 12, 12, 12);+ evl->setSpacing(8);++ auto* expr_data = new QLineEdit(expr);+ expr_data->setPlaceholderText("{\"close\":[100,102,...],\"volume\":[1000,1200,...]}");+ expr_data->setStyleSheet(input_ss());+ text_inputs_["fe_expr_data"] = expr_data;+ evl->addWidget(build_input_row("OHLCV Data (JSON)", expr_data, expr));++ auto* expr_expr = new QLineEdit(expr);+ expr_expr->setPlaceholderText("e.g. Mean(close, 5) / Std(close, 20)");+ expr_expr->setStyleSheet(input_ss());+ text_inputs_["fe_expression"] = expr_expr;+ evl->addWidget(build_input_row("Expression", expr_expr, expr));++ auto* expr_run = make_run_button("EVALUATE EXPRESSION", expr);+ connect(expr_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Evaluating...");+ QJsonObject params;+ auto data_text = text_inputs_["fe_expr_data"]->text();+ auto doc = QJsonDocument::fromJson(data_text.toUtf8());+ if (!doc.isNull())+ params["data"] = doc.object();+ params["expression"] = text_inputs_["fe_expression"]->text();+ AIQuantLabService::instance().feature_evaluate_expression(params);+ });+ evl->addWidget(expr_run);+ evl->addStretch();+ tabs->addTab(expr, "Expression Engine");++ vl->addWidget(tabs, 1);+ results_layout_ = new QVBoxLayout;+ vl->addLayout(results_layout_);+ return w;+}++// ═══════════════════════════════════════════════════════════════════════════════+// PORTFOLIO OPTIMIZATION PANEL+// ═══════════════════════════════════════════════════════════════════════════════+QWidget* QuantModulePanel::build_portfolio_opt_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ // ── Shared covariance / returns helper ──+ auto make_cov_tab = [&](const QString& method_id, const QString& btn_label, bool needs_returns) -> QWidget* {+ auto* t = new QWidget(this);+ auto* tvl = new QVBoxLayout(t);+ tvl->setContentsMargins(12, 12, 12, 12);+ tvl->setSpacing(8);++ auto* assets_in = new QLineEdit(t);+ assets_in->setPlaceholderText("Asset names (comma-separated, e.g. AAPL,GOOG,MSFT)");+ assets_in->setStyleSheet(input_ss());+ text_inputs_[method_id + "_assets"] = assets_in;+ tvl->addWidget(build_input_row("Assets", assets_in, t));++ auto* cov_in = new QLineEdit(t);+ cov_in->setPlaceholderText("Covariance matrix JSON: [[0.04,0.01],[0.01,0.09]]");+ cov_in->setStyleSheet(input_ss());+ text_inputs_[method_id + "_cov"] = cov_in;+ tvl->addWidget(build_input_row("Covariance Matrix", cov_in, t));++ if (needs_returns) {+ auto* ret_in = new QLineEdit(t);+ ret_in->setPlaceholderText("Expected returns (comma-separated, e.g. 0.10,0.15,0.12)");+ ret_in->setStyleSheet(input_ss());+ text_inputs_[method_id + "_returns"] = ret_in;+ tvl->addWidget(build_input_row("Expected Returns", ret_in, t));+ }++ auto* rf_spin = make_double_spin(0, 20, 2.0, 2, "%", t);+ double_inputs_[method_id + "_rf"] = rf_spin;+ tvl->addWidget(build_input_row("Risk-Free Rate", rf_spin, t));++ auto* run = make_run_button(btn_label, t);+ connect(run, &QPushButton::clicked, this, [this, method_id, needs_returns]() {+ status_label_->setText("Optimizing...");+ QJsonObject params;+ auto assets_str = text_inputs_[method_id + "_assets"]->text().split(',');+ QJsonArray assets_arr;+ for (auto& a : assets_str)+ assets_arr.append(a.trimmed());+ params["assets"] = assets_arr;+ auto cov_doc = QJsonDocument::fromJson(text_inputs_[method_id + "_cov"]->text().toUtf8());+ if (!cov_doc.isNull())+ params["cov_matrix"] = cov_doc.array();+ if (needs_returns) {+ QJsonArray ret_arr;+ for (auto& r : text_inputs_[method_id + "_returns"]->text().split(','))+ ret_arr.append(r.trimmed().toDouble());+ params["expected_returns"] = ret_arr;+ }+ params["risk_free_rate"] = double_inputs_[method_id + "_rf"]->value() / 100.0;+ AIQuantLabService::instance().portopt_run(method_id, params);+ });+ tvl->addWidget(run);+ tvl->addStretch();+ return t;+ };++ tabs->addTab(make_cov_tab("hierarchical_risk_parity", "RUN HRP", false), "HRP");+ tabs->addTab(make_cov_tab("minimum_variance", "MIN VARIANCE", false), "Min Variance");+ tabs->addTab(make_cov_tab("maximum_sharpe", "MAX SHARPE", true), "Max Sharpe");+ tabs->addTab(make_cov_tab("efficient_frontier", "EFFICIENT FRONTIER", true), "Eff. Frontier");++ // ── Black-Litterman ──+ auto* bl = new QWidget(this);+ auto* blvl = new QVBoxLayout(bl);+ blvl->setContentsMargins(12, 12, 12, 12);+ blvl->setSpacing(8);+ auto* bl_assets = new QLineEdit(bl);+ bl_assets->setPlaceholderText("Asset names (comma-separated)");+ bl_assets->setStyleSheet(input_ss());+ text_inputs_["bl_assets"] = bl_assets;+ blvl->addWidget(build_input_row("Assets", bl_assets, bl));+ auto* bl_caps = new QLineEdit(bl);+ bl_caps->setPlaceholderText("Market caps (comma-separated, e.g. 2000,1500,800)");+ bl_caps->setStyleSheet(input_ss());+ text_inputs_["bl_caps"] = bl_caps;+ blvl->addWidget(build_input_row("Market Caps ($B)", bl_caps, bl));+ auto* bl_cov = new QLineEdit(bl);+ bl_cov->setPlaceholderText("Covariance matrix JSON: [[0.04,0.01],[0.01,0.09]]");+ bl_cov->setStyleSheet(input_ss());+ text_inputs_["bl_cov"] = bl_cov;+ blvl->addWidget(build_input_row("Covariance Matrix", bl_cov, bl));+ auto* bl_views = new QLineEdit(bl);+ bl_views->setPlaceholderText("Views (comma-separated, e.g. 0.05,0.10)");+ bl_views->setStyleSheet(input_ss());+ text_inputs_["bl_views"] = bl_views;+ blvl->addWidget(build_input_row("Views", bl_views, bl));+ auto* bl_conf = new QLineEdit(bl);+ bl_conf->setPlaceholderText("View confidences (e.g. 0.8,0.6)");+ bl_conf->setStyleSheet(input_ss());+ text_inputs_["bl_conf"] = bl_conf;+ blvl->addWidget(build_input_row("View Confidences", bl_conf, bl));+ auto* bl_run = make_run_button("RUN BLACK-LITTERMAN", bl);+ connect(bl_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Running BL...");+ QJsonObject params;+ QJsonArray caps, views, confs, assets;+ for (auto& v : text_inputs_["bl_caps"]->text().split(','))+ caps.append(v.trimmed().toDouble());+ for (auto& v : text_inputs_["bl_views"]->text().split(','))+ views.append(v.trimmed().toDouble());+ for (auto& v : text_inputs_["bl_conf"]->text().split(','))+ confs.append(v.trimmed().toDouble());+ for (auto& v : text_inputs_["bl_assets"]->text().split(','))+ assets.append(v.trimmed());+ params["market_caps"] = caps;+ params["views"] = views;+ params["view_confidences"] = confs;+ params["assets"] = assets;+ auto cov_doc = QJsonDocument::fromJson(text_inputs_["bl_cov"]->text().toUtf8());+ if (!cov_doc.isNull())+ params["cov_matrix"] = cov_doc.array();+ AIQuantLabService::instance().portopt_run("black_litterman", params);+ });+ blvl->addWidget(bl_run);+ blvl->addStretch();+ tabs->addTab(bl, "Black-Litterman");++ vl->addWidget(tabs, 1);+ results_layout_ = new QVBoxLayout;+ vl->addLayout(results_layout_);+ return w;+}++// ═══════════════════════════════════════════════════════════════════════════════+// FACTOR EVALUATION PANEL+// ═══════════════════════════════════════════════════════════════════════════════+QWidget* QuantModulePanel::build_factor_evaluation_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ // ── IC Metrics tab ──+ auto* ic = new QWidget(this);+ auto* icvl = new QVBoxLayout(ic);+ icvl->setContentsMargins(12, 12, 12, 12);+ icvl->setSpacing(8);+ auto* ic_preds = new QLineEdit(ic);+ ic_preds->setPlaceholderText("Predictions (comma-separated, e.g. 0.1,0.2,-0.1,0.3)");+ ic_preds->setStyleSheet(input_ss());+ text_inputs_["ev_predictions"] = ic_preds;+ icvl->addWidget(build_input_row("Predictions", ic_preds, ic));+ auto* ic_rets = new QLineEdit(ic);+ ic_rets->setPlaceholderText("Actual returns (comma-separated)");+ ic_rets->setStyleSheet(input_ss());+ text_inputs_["ev_returns"] = ic_rets;+ icvl->addWidget(build_input_row("Returns", ic_rets, ic));+ auto* ic_method = new QComboBox(ic);+ ic_method->addItems({"pearson", "spearman"});+ ic_method->setStyleSheet(combo_ss());+ combo_inputs_["ev_ic_method"] = ic_method;+ icvl->addWidget(build_input_row("Method", ic_method, ic));+ auto* ic_run = make_run_button("CALCULATE IC METRICS", ic);+ connect(ic_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Calculating...");+ QJsonObject params;+ QJsonArray preds, rets;+ for (auto& v : text_inputs_["ev_predictions"]->text().split(','))+ preds.append(v.trimmed().toDouble());+ for (auto& v : text_inputs_["ev_returns"]->text().split(','))+ rets.append(v.trimmed().toDouble());+ params["predictions"] = preds;+ params["returns"] = rets;+ params["method"] = combo_inputs_["ev_ic_method"]->currentText();+ AIQuantLabService::instance().evaluation_ic(params);+ });+ icvl->addWidget(ic_run);+ icvl->addStretch();+ tabs->addTab(ic, "IC Metrics");++ // ── Full Report tab ──+ auto* rep = new QWidget(this);+ auto* repvl = new QVBoxLayout(rep);+ repvl->setContentsMargins(12, 12, 12, 12);+ repvl->setSpacing(8);+ auto* rep_name = new QLineEdit(rep);+ rep_name->setPlaceholderText("Factor name (e.g. momentum)");+ rep_name->setStyleSheet(input_ss());+ text_inputs_["ev_factor_name"] = rep_name;+ repvl->addWidget(build_input_row("Factor Name", rep_name, rep));+ auto* rep_preds = new QLineEdit(rep);+ rep_preds->setPlaceholderText("Predictions (comma-separated)");+ rep_preds->setStyleSheet(input_ss());+ text_inputs_["ev_rep_preds"] = rep_preds;+ repvl->addWidget(build_input_row("Predictions", rep_preds, rep));+ auto* rep_rets = new QLineEdit(rep);+ rep_rets->setPlaceholderText("Returns (comma-separated)");+ rep_rets->setStyleSheet(input_ss());+ text_inputs_["ev_rep_returns"] = rep_rets;+ repvl->addWidget(build_input_row("Returns", rep_rets, rep));+ auto* rep_run = make_run_button("GENERATE EVALUATION REPORT", rep);+ connect(rep_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Generating...");+ QJsonObject params;+ QJsonArray preds, rets;+ for (auto& v : text_inputs_["ev_rep_preds"]->text().split(','))+ preds.append(v.trimmed().toDouble());+ for (auto& v : text_inputs_["ev_rep_returns"]->text().split(','))+ rets.append(v.trimmed().toDouble());+ params["factor_name"] = text_inputs_["ev_factor_name"]->text();+ params["predictions"] = preds;+ params["returns"] = rets;+ AIQuantLabService::instance().evaluation_report(params);+ });+ repvl->addWidget(rep_run);+ repvl->addStretch();+ tabs->addTab(rep, "Full Report");++ // ── Risk Metrics tab ──+ auto* risk = new QWidget(this);+ auto* riskvl = new QVBoxLayout(risk);+ riskvl->setContentsMargins(12, 12, 12, 12);+ riskvl->setSpacing(8);+ auto* risk_rets = new QLineEdit(risk);+ risk_rets->setPlaceholderText("Daily returns (comma-separated)");+ risk_rets->setStyleSheet(input_ss());+ text_inputs_["ev_risk_returns"] = risk_rets;+ riskvl->addWidget(build_input_row("Returns", risk_rets, risk));+ auto* risk_bench = new QLineEdit(risk);+ risk_bench->setPlaceholderText("Benchmark returns (optional, comma-separated)");+ risk_bench->setStyleSheet(input_ss());+ text_inputs_["ev_risk_bench"] = risk_bench;+ riskvl->addWidget(build_input_row("Benchmark (opt.)", risk_bench, risk));+ auto* risk_conf = make_double_spin(0.8, 0.999, 0.95, 3, "", risk);+ double_inputs_["ev_risk_conf"] = risk_conf;+ riskvl->addWidget(build_input_row("Confidence Level", risk_conf, risk));+ auto* risk_run = make_run_button("CALCULATE RISK METRICS", risk);+ connect(risk_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Calculating...");+ QJsonObject params;+ QJsonArray rets;+ for (auto& v : text_inputs_["ev_risk_returns"]->text().split(','))+ rets.append(v.trimmed().toDouble());+ params["returns"] = rets;+ params["confidence_level"] = double_inputs_["ev_risk_conf"]->value();+ auto bench_text = text_inputs_["ev_risk_bench"]->text().trimmed();+ if (!bench_text.isEmpty()) {+ QJsonArray bench;+ for (auto& v : bench_text.split(','))+ bench.append(v.trimmed().toDouble());+ params["benchmark_returns"] = bench;+ }+ AIQuantLabService::instance().evaluation_risk_metrics(params);+ });+ riskvl->addWidget(risk_run);+ riskvl->addStretch();+ tabs->addTab(risk, "Risk Metrics");++ vl->addWidget(tabs, 1);+ results_layout_ = new QVBoxLayout;+ vl->addLayout(results_layout_);+ return w;+}++// ═══════════════════════════════════════════════════════════════════════════════+// STRATEGY BUILDER PANEL+// ═══════════════════════════════════════════════════════════════════════════════+QWidget* QuantModulePanel::build_strategy_builder_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ // ── TopK-Dropout ──+ auto* topk = new QWidget(this);+ auto* tkvl = new QVBoxLayout(topk);+ tkvl->setContentsMargins(12, 12, 12, 12);+ tkvl->setSpacing(8);+ auto* tk_signal = new QLineEdit(topk);+ tk_signal->setPlaceholderText("Signal values (comma-separated)");+ tk_signal->setStyleSheet(input_ss());+ text_inputs_["st_tk_signal"] = tk_signal;+ tkvl->addWidget(build_input_row("Signal", tk_signal, topk));+ auto* tk_topk = new QSpinBox(topk);+ tk_topk->setRange(1, 500);+ tk_topk->setValue(50);+ tk_topk->setStyleSheet(spinbox_ss());+ int_inputs_["st_topk"] = tk_topk;+ tkvl->addWidget(build_input_row("Top-K", tk_topk, topk));+ auto* tk_drop = new QSpinBox(topk);+ tk_drop->setRange(1, 100);+ tk_drop->setValue(5);+ tk_drop->setStyleSheet(tk_topk->styleSheet());+ int_inputs_["st_ndrop"] = tk_drop;+ tkvl->addWidget(build_input_row("N-Drop", tk_drop, topk));+ auto* tk_run = make_run_button("CREATE TOPK-DROPOUT STRATEGY", topk);+ connect(tk_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Creating...");+ QJsonObject params;+ QJsonArray signal;+ for (auto& v : text_inputs_["st_tk_signal"]->text().split(','))+ signal.append(v.trimmed().toDouble());+ params["signal"] = signal;+ params["topk"] = int_inputs_["st_topk"]->value();+ params["n_drop"] = int_inputs_["st_ndrop"]->value();+ AIQuantLabService::instance().strategy_create("create_topk_dropout", params);+ });+ tkvl->addWidget(tk_run);+ tkvl->addStretch();+ tabs->addTab(topk, "TopK-Dropout");++ // ── Risk Parity ──+ auto* rp = new QWidget(this);+ auto* rpvl = new QVBoxLayout(rp);+ rpvl->setContentsMargins(12, 12, 12, 12);+ rpvl->setSpacing(8);+ auto* rp_returns = new QLineEdit(rp);+ rp_returns->setPlaceholderText("Asset returns matrix JSON: [[0.01,-0.02,...],[...]]");+ rp_returns->setStyleSheet(input_ss());+ text_inputs_["st_rp_returns"] = rp_returns;+ rpvl->addWidget(build_input_row("Returns Matrix", rp_returns, rp));+ auto* rp_target = make_double_spin(0.01, 1.0, 0.10, 2, "", rp);+ double_inputs_["st_rp_target"] = rp_target;+ rpvl->addWidget(build_input_row("Target Risk", rp_target, rp));+ auto* rp_freq = new QComboBox(rp);+ rp_freq->addItems({"monthly", "weekly", "daily", "quarterly"});+ rp_freq->setStyleSheet(combo_ss());+ combo_inputs_["st_rp_freq"] = rp_freq;+ rpvl->addWidget(build_input_row("Rebalance", rp_freq, rp));+ auto* rp_run = make_run_button("CREATE RISK PARITY STRATEGY", rp);+ connect(rp_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Creating...");+ QJsonObject params;+ auto ret_doc = QJsonDocument::fromJson(text_inputs_["st_rp_returns"]->text().toUtf8());+ if (!ret_doc.isNull())+ params["returns"] = ret_doc.array();+ params["target_risk"] = double_inputs_["st_rp_target"]->value();+ params["rebalance_frequency"] = combo_inputs_["st_rp_freq"]->currentText();+ AIQuantLabService::instance().strategy_create("create_risk_parity", params);+ });+ rpvl->addWidget(rp_run);+ rpvl->addStretch();+ tabs->addTab(rp, "Risk Parity");++ // ── Portfolio Metrics ──+ auto* pm = new QWidget(this);+ auto* pmvl = new QVBoxLayout(pm);+ pmvl->setContentsMargins(12, 12, 12, 12);+ pmvl->setSpacing(8);+ auto* pm_rets = new QLineEdit(pm);+ pm_rets->setPlaceholderText("Portfolio returns (comma-separated)");+ pm_rets->setStyleSheet(input_ss());+ text_inputs_["st_pm_returns"] = pm_rets;+ pmvl->addWidget(build_input_row("Returns", pm_rets, pm));+ auto* pm_bench = new QLineEdit(pm);+ pm_bench->setPlaceholderText("Benchmark returns (optional)");+ pm_bench->setStyleSheet(input_ss());+ text_inputs_["st_pm_bench"] = pm_bench;+ pmvl->addWidget(build_input_row("Benchmark (opt.)", pm_bench, pm));+ auto* pm_rf = make_double_spin(0, 20, 2.0, 2, "%", pm);+ double_inputs_["st_pm_rf"] = pm_rf;+ pmvl->addWidget(build_input_row("Risk-Free Rate", pm_rf, pm));+ auto* pm_run = make_run_button("CALCULATE PORTFOLIO METRICS", pm);+ connect(pm_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Calculating...");+ QJsonObject params;+ QJsonArray rets;+ for (auto& v : text_inputs_["st_pm_returns"]->text().split(','))+ rets.append(v.trimmed().toDouble());+ params["returns"] = rets;+ params["risk_free_rate"] = double_inputs_["st_pm_rf"]->value() / 100.0;+ auto bench_text = text_inputs_["st_pm_bench"]->text().trimmed();+ if (!bench_text.isEmpty()) {+ QJsonArray bench;+ for (auto& v : bench_text.split(','))+ bench.append(v.trimmed().toDouble());+ params["benchmark_returns"] = bench;+ }+ AIQuantLabService::instance().strategy_portfolio_metrics(params);+ });+ pmvl->addWidget(pm_run);+ pmvl->addStretch();+ tabs->addTab(pm, "Portfolio Metrics");++ vl->addWidget(tabs, 1);+ results_layout_ = new QVBoxLayout;+ vl->addLayout(results_layout_);+ return w;+}++// ═══════════════════════════════════════════════════════════════════════════════+// DATA PROCESSORS PANEL+// ═══════════════════════════════════════════════════════════════════════════════+QWidget* QuantModulePanel::build_data_processors_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ // ── List Processors ──+ auto* list_tab = new QWidget(this);+ auto* ltvl = new QVBoxLayout(list_tab);+ ltvl->setContentsMargins(12, 12, 12, 12);+ ltvl->setSpacing(8);+ auto* lt_info = new QLabel("Browse all available data normalizers and transformation processors.", list_tab);+ lt_info->setWordWrap(true);+ lt_info->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")+ .arg(ui::colors::TEXT_SECONDARY())+ .arg(ui::fonts::SMALL)+ .arg(ui::fonts::DATA_FAMILY));+ ltvl->addWidget(lt_info);+ auto* lt_run = make_run_button("LIST ALL PROCESSORS", list_tab);+ connect(lt_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Loading...");+ AIQuantLabService::instance().dataproc_list_processors();+ });+ ltvl->addWidget(lt_run);+ ltvl->addStretch();+ tabs->addTab(list_tab, "Browse");++ // ── Create Pipeline ──+ auto* pipe_tab = new QWidget(this);+ auto* ptvl = new QVBoxLayout(pipe_tab);+ ptvl->setContentsMargins(12, 12, 12, 12);+ ptvl->setSpacing(8);+ auto* pipe_id = new QLineEdit(pipe_tab);+ pipe_id->setPlaceholderText("Pipeline ID (e.g. my_pipeline)");+ pipe_id->setStyleSheet(input_ss());+ text_inputs_["dp_pipeline_id"] = pipe_id;+ ptvl->addWidget(build_input_row("Pipeline ID", pipe_id, pipe_tab));+ auto* pipe_procs = new QLineEdit(pipe_tab);+ pipe_procs->setPlaceholderText(R"([{"type":"zscore"},{"type":"winsorize","lower":0.01,"upper":0.99}])");+ pipe_procs->setStyleSheet(input_ss());+ text_inputs_["dp_processors"] = pipe_procs;+ ptvl->addWidget(build_input_row("Processors (JSON)", pipe_procs, pipe_tab));+ auto* pipe_run = make_run_button("CREATE PIPELINE", pipe_tab);+ connect(pipe_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Creating...");+ QJsonObject params;+ params["pipeline_id"] = text_inputs_["dp_pipeline_id"]->text();+ auto doc = QJsonDocument::fromJson(text_inputs_["dp_processors"]->text().toUtf8());+ if (!doc.isNull())+ params["processors"] = doc.array();+ AIQuantLabService::instance().dataproc_create_pipeline(params);+ });+ ptvl->addWidget(pipe_run);+ ptvl->addStretch();+ tabs->addTab(pipe_tab, "Create Pipeline");++ // ── Process Data ──+ auto* proc_tab = new QWidget(this);+ auto* procvl = new QVBoxLayout(proc_tab);+ procvl->setContentsMargins(12, 12, 12, 12);+ procvl->setSpacing(8);+ auto* proc_pid = new QLineEdit(proc_tab);+ proc_pid->setPlaceholderText("Pipeline ID (must be created first)");+ proc_pid->setStyleSheet(input_ss());+ text_inputs_["dp_proc_pid"] = proc_pid;+ procvl->addWidget(build_input_row("Pipeline ID", proc_pid, proc_tab));+ auto* proc_data = new QLineEdit(proc_tab);+ proc_data->setPlaceholderText(R"({"feature_close":[100,102,...],"feature_volume":[1000,1200,...]})");+ proc_data->setStyleSheet(input_ss());+ text_inputs_["dp_proc_data"] = proc_data;+ procvl->addWidget(build_input_row("Data (JSON)", proc_data, proc_tab));+ auto* proc_run = make_run_button("PROCESS DATA", proc_tab);+ connect(proc_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Processing...");+ QJsonObject params;+ params["pipeline_id"] = text_inputs_["dp_proc_pid"]->text();+ auto doc = QJsonDocument::fromJson(text_inputs_["dp_proc_data"]->text().toUtf8());+ if (!doc.isNull())+ params["data"] = doc.object();+ AIQuantLabService::instance().dataproc_process_data(params);+ });+ procvl->addWidget(proc_run);+ procvl->addStretch();+ tabs->addTab(proc_tab, "Process Data");++ vl->addWidget(tabs, 1);+ results_layout_ = new QVBoxLayout;+ vl->addLayout(results_layout_);+ return w;+}++// ═══════════════════════════════════════════════════════════════════════════════+// FACTOR DISCOVERY PANEL+// ═══════════════════════════════════════════════════════════════════════════════+QWidget* QuantModulePanel::build_factor_discovery_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ // ── Factor Library ──+ auto* lib_tab = new QWidget(this);+ auto* libvl = new QVBoxLayout(lib_tab);+ libvl->setContentsMargins(12, 12, 12, 12);+ libvl->setSpacing(8);+ auto* lib_info = new QLabel("Browse all built-in Qlib alpha factors and expressions.", lib_tab);+ lib_info->setWordWrap(true);+ lib_info->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")+ .arg(ui::colors::TEXT_SECONDARY())+ .arg(ui::fonts::SMALL)+ .arg(ui::fonts::DATA_FAMILY));+ libvl->addWidget(lib_info);+ auto* lib_run = make_run_button("BROWSE FACTOR LIBRARY", lib_tab);+ connect(lib_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Loading...");+ AIQuantLabService::instance().factor_get_library();+ });+ libvl->addWidget(lib_run);+ auto* inst_run = make_run_button("LIST INSTRUMENTS", lib_tab);+ connect(inst_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Loading...");+ AIQuantLabService::instance().factor_get_instruments();+ });+ libvl->addWidget(inst_run);+ libvl->addStretch();+ tabs->addTab(lib_tab, "Factor Library");++ // ── Fetch Data ──+ auto* data_tab = new QWidget(this);+ auto* datavl = new QVBoxLayout(data_tab);+ datavl->setContentsMargins(12, 12, 12, 12);+ datavl->setSpacing(8);+ auto* fd_instr = new QLineEdit(data_tab);+ fd_instr->setPlaceholderText("Instruments (comma-separated, e.g. aapl,msft)");+ fd_instr->setStyleSheet(input_ss());+ text_inputs_["fd_instruments"] = fd_instr;+ datavl->addWidget(build_input_row("Instruments", fd_instr, data_tab));+ auto* fd_fields = new QLineEdit(data_tab);+ fd_fields->setPlaceholderText("Fields (comma-separated, e.g. $close,$volume,$open)");+ fd_fields->setStyleSheet(input_ss());+ text_inputs_["fd_fields"] = fd_fields;+ datavl->addWidget(build_input_row("Fields", fd_fields, data_tab));+ auto* fd_start = new QLineEdit(data_tab);+ fd_start->setPlaceholderText("Start date (YYYY-MM-DD, e.g. 2019-01-01)");+ fd_start->setStyleSheet(input_ss());+ text_inputs_["fd_start"] = fd_start;+ datavl->addWidget(build_input_row("Start Date", fd_start, data_tab));+ auto* fd_end = new QLineEdit(data_tab);+ fd_end->setPlaceholderText("End date (YYYY-MM-DD, e.g. 2020-11-10)");+ fd_end->setStyleSheet(input_ss());+ text_inputs_["fd_end"] = fd_end;+ datavl->addWidget(build_input_row("End Date", fd_end, data_tab));+ auto* fd_run = make_run_button("FETCH DATA", data_tab);+ connect(fd_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Fetching...");+ QJsonObject params;+ QJsonArray instr;+ for (auto& s : text_inputs_["fd_instruments"]->text().split(','))+ if (!s.trimmed().isEmpty())+ instr.append(s.trimmed().toLower());+ params["instruments"] = instr;+ QJsonArray fields;+ for (auto& s : text_inputs_["fd_fields"]->text().split(','))+ if (!s.trimmed().isEmpty())+ fields.append(s.trimmed());+ params["fields"] = fields;+ if (!text_inputs_["fd_start"]->text().isEmpty())+ params["start_date"] = text_inputs_["fd_start"]->text().trimmed();+ if (!text_inputs_["fd_end"]->text().isEmpty())+ params["end_date"] = text_inputs_["fd_end"]->text().trimmed();+ AIQuantLabService::instance().factor_get_data(params);+ });+ datavl->addWidget(fd_run);+ datavl->addStretch();+ tabs->addTab(data_tab, "Fetch Data");++ // ── Calendar ──+ auto* cal_tab = new QWidget(this);+ auto* calvl = new QVBoxLayout(cal_tab);+ calvl->setContentsMargins(12, 12, 12, 12);+ calvl->setSpacing(8);+ auto* cal_start = new QLineEdit(cal_tab);+ cal_start->setPlaceholderText("Start date (YYYY-MM-DD)");+ cal_start->setStyleSheet(input_ss());+ text_inputs_["fd_cal_start"] = cal_start;+ calvl->addWidget(build_input_row("Start Date", cal_start, cal_tab));+ auto* cal_end = new QLineEdit(cal_tab);+ cal_end->setPlaceholderText("End date (YYYY-MM-DD)");+ cal_end->setStyleSheet(input_ss());+ text_inputs_["fd_cal_end"] = cal_end;+ calvl->addWidget(build_input_row("End Date", cal_end, cal_tab));+ auto* cal_run = make_run_button("GET TRADING CALENDAR", cal_tab);+ connect(cal_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Loading...");+ QJsonObject params;+ if (!text_inputs_["fd_cal_start"]->text().isEmpty())+ params["start_date"] = text_inputs_["fd_cal_start"]->text().trimmed();+ if (!text_inputs_["fd_cal_end"]->text().isEmpty())+ params["end_date"] = text_inputs_["fd_cal_end"]->text().trimmed();+ AIQuantLabService::instance().factor_get_calendar(params);+ });+ calvl->addWidget(cal_run);+ calvl->addStretch();+ tabs->addTab(cal_tab, "Calendar");++ vl->addWidget(tabs, 1);+ results_layout_ = new QVBoxLayout;+ vl->addLayout(results_layout_);+ return w;+}++// ═══════════════════════════════════════════════════════════════════════════════+// MODEL LIBRARY PANEL+// ═══════════════════════════════════════════════════════════════════════════════+QWidget* QuantModulePanel::build_model_library_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ // ── Model Browser ──+ auto* browse_tab = new QWidget(this);+ auto* btvl = new QVBoxLayout(browse_tab);+ btvl->setContentsMargins(12, 12, 12, 12);+ btvl->setSpacing(8);+ auto* bt_info =+ new QLabel("List all available Qlib models (LightGBM, XGBoost, LSTM, Transformer, etc.).", browse_tab);+ bt_info->setWordWrap(true);+ bt_info->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")+ .arg(ui::colors::TEXT_SECONDARY())+ .arg(ui::fonts::SMALL)+ .arg(ui::fonts::DATA_FAMILY));+ btvl->addWidget(bt_info);+ auto* bt_list = make_run_button("LIST ALL MODELS", browse_tab);+ connect(bt_list, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Loading...");+ AIQuantLabService::instance().model_list();+ });+ btvl->addWidget(bt_list);+ auto* bt_status = make_run_button("CHECK QLIB STATUS", browse_tab);+ connect(bt_status, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Checking...");+ AIQuantLabService::instance().model_check_status();+ });+ btvl->addWidget(bt_status);+ btvl->addStretch();+ tabs->addTab(browse_tab, "Browse");++ // ── Train Model ──+ auto* train_tab = new QWidget(this);+ auto* ttvl = new QVBoxLayout(train_tab);+ ttvl->setContentsMargins(12, 12, 12, 12);+ ttvl->setSpacing(8);+ auto* ml_type = new QComboBox(train_tab);+ ml_type->setStyleSheet(combo_ss());+ ml_type->addItems({"lightgbm", "xgboost", "catboost", "linear", "lstm", "gru", "transformer"});+ combo_inputs_["ml_model_type"] = ml_type;+ ttvl->addWidget(build_input_row("Model Type", ml_type, train_tab));+ auto* ml_instr = new QLineEdit(train_tab);+ ml_instr->setPlaceholderText("Instruments (comma-separated, e.g. aapl,msft)");+ ml_instr->setStyleSheet(input_ss());+ text_inputs_["ml_instruments"] = ml_instr;+ ttvl->addWidget(build_input_row("Instruments", ml_instr, train_tab));+ auto* ml_start = new QLineEdit(train_tab);+ ml_start->setPlaceholderText("Train start (YYYY-MM-DD)");+ ml_start->setStyleSheet(input_ss());+ text_inputs_["ml_start"] = ml_start;+ ttvl->addWidget(build_input_row("Start Date", ml_start, train_tab));+ auto* ml_end = new QLineEdit(train_tab);+ ml_end->setPlaceholderText("Train end (YYYY-MM-DD)");+ ml_end->setStyleSheet(input_ss());+ text_inputs_["ml_end"] = ml_end;+ ttvl->addWidget(build_input_row("End Date", ml_end, train_tab));+ auto* ml_run = make_run_button("TRAIN MODEL", train_tab);+ connect(ml_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Training...");+ QJsonObject params;+ params["model_type"] = combo_inputs_["ml_model_type"]->currentText();+ QJsonArray instr;+ for (auto& s : text_inputs_["ml_instruments"]->text().split(','))+ if (!s.trimmed().isEmpty())+ instr.append(s.trimmed().toLower());+ params["instruments"] = instr;+ if (!text_inputs_["ml_start"]->text().isEmpty())+ params["start_date"] = text_inputs_["ml_start"]->text().trimmed();+ if (!text_inputs_["ml_end"]->text().isEmpty())+ params["end_date"] = text_inputs_["ml_end"]->text().trimmed();+ AIQuantLabService::instance().model_train(params);+ });+ ttvl->addWidget(ml_run);+ ttvl->addStretch();+ tabs->addTab(train_tab, "Train Model");++ // ── Backtest ──+ auto* bt_tab = new QWidget(this);+ auto* btvl2 = new QVBoxLayout(bt_tab);+ btvl2->setContentsMargins(12, 12, 12, 12);+ btvl2->setSpacing(8);+ auto* bt_model = new QLineEdit(bt_tab);+ bt_model->setPlaceholderText("Model ID (from training output)");+ bt_model->setStyleSheet(input_ss());+ text_inputs_["ml_bt_model"] = bt_model;+ btvl2->addWidget(build_input_row("Model ID", bt_model, bt_tab));+ auto* bt_instr = new QLineEdit(bt_tab);+ bt_instr->setPlaceholderText("Instruments (comma-separated)");+ bt_instr->setStyleSheet(input_ss());+ text_inputs_["ml_bt_instr"] = bt_instr;+ btvl2->addWidget(build_input_row("Instruments", bt_instr, bt_tab));+ auto* bt_start2 = new QLineEdit(bt_tab);+ bt_start2->setPlaceholderText("Backtest start (YYYY-MM-DD)");+ bt_start2->setStyleSheet(input_ss());+ text_inputs_["ml_bt_start"] = bt_start2;+ btvl2->addWidget(build_input_row("Start Date", bt_start2, bt_tab));+ auto* bt_end2 = new QLineEdit(bt_tab);+ bt_end2->setPlaceholderText("Backtest end (YYYY-MM-DD)");+ bt_end2->setStyleSheet(input_ss());+ text_inputs_["ml_bt_end"] = bt_end2;+ btvl2->addWidget(build_input_row("End Date", bt_end2, bt_tab));+ auto* bt_run2 = make_run_button("RUN BACKTEST", bt_tab);+ connect(bt_run2, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Running backtest...");+ QJsonObject params;+ params["model_id"] = text_inputs_["ml_bt_model"]->text().trimmed();+ QJsonArray instr;+ for (auto& s : text_inputs_["ml_bt_instr"]->text().split(','))+ if (!s.trimmed().isEmpty())+ instr.append(s.trimmed().toLower());+ params["instruments"] = instr;+ if (!text_inputs_["ml_bt_start"]->text().isEmpty())+ params["start_date"] = text_inputs_["ml_bt_start"]->text().trimmed();+ if (!text_inputs_["ml_bt_end"]->text().isEmpty())+ params["end_date"] = text_inputs_["ml_bt_end"]->text().trimmed();+ AIQuantLabService::instance().model_backtest(params);+ });+ btvl2->addWidget(bt_run2);+ btvl2->addStretch();+ tabs->addTab(bt_tab, "Backtest");++ vl->addWidget(tabs, 1);+ results_layout_ = new QVBoxLayout;+ vl->addLayout(results_layout_);+ return w;+}++// ═══════════════════════════════════════════════════════════════════════════════+// LIVE SIGNALS PANEL+// ═══════════════════════════════════════════════════════════════════════════════+QWidget* QuantModulePanel::build_live_signals_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ // ── Signal Data ──+ auto* sig_tab = new QWidget(this);+ auto* sigvl = new QVBoxLayout(sig_tab);+ sigvl->setContentsMargins(12, 12, 12, 12);+ sigvl->setSpacing(8);+ auto* sig_instr = new QLineEdit(sig_tab);+ sig_instr->setPlaceholderText("Instruments (comma-separated, e.g. aapl,msft,goog)");+ sig_instr->setStyleSheet(input_ss());+ text_inputs_["ls_instruments"] = sig_instr;+ sigvl->addWidget(build_input_row("Instruments", sig_instr, sig_tab));+ auto* sig_fields = new QLineEdit(sig_tab);+ sig_fields->setPlaceholderText("Fields (e.g. $close,$open,$high,$low,$volume)");+ sig_fields->setStyleSheet(input_ss());+ text_inputs_["ls_fields"] = sig_fields;+ sigvl->addWidget(build_input_row("Fields", sig_fields, sig_tab));+ auto* sig_start = new QLineEdit(sig_tab);+ sig_start->setPlaceholderText("Start date (YYYY-MM-DD)");+ sig_start->setStyleSheet(input_ss());+ text_inputs_["ls_start"] = sig_start;+ sigvl->addWidget(build_input_row("Start Date", sig_start, sig_tab));+ auto* sig_end = new QLineEdit(sig_tab);+ sig_end->setPlaceholderText("End date (YYYY-MM-DD)");+ sig_end->setStyleSheet(input_ss());+ text_inputs_["ls_end"] = sig_end;+ sigvl->addWidget(build_input_row("End Date", sig_end, sig_tab));+ auto* sig_run = make_run_button("FETCH SIGNALS", sig_tab);+ connect(sig_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Fetching...");+ QJsonObject params;+ QJsonArray instr;+ for (auto& s : text_inputs_["ls_instruments"]->text().split(','))+ if (!s.trimmed().isEmpty())+ instr.append(s.trimmed().toLower());+ params["instruments"] = instr;+ QJsonArray fields;+ for (auto& s : text_inputs_["ls_fields"]->text().split(','))+ if (!s.trimmed().isEmpty())+ fields.append(s.trimmed());+ params["fields"] = fields;+ if (!text_inputs_["ls_start"]->text().isEmpty())+ params["start_date"] = text_inputs_["ls_start"]->text().trimmed();+ if (!text_inputs_["ls_end"]->text().isEmpty())+ params["end_date"] = text_inputs_["ls_end"]->text().trimmed();+ AIQuantLabService::instance().signals_get_data(params);+ });+ sigvl->addWidget(sig_run);+ sigvl->addStretch();+ tabs->addTab(sig_tab, "Signal Data");++ // ── Factor Analysis ──+ auto* fa_tab = new QWidget(this);+ auto* favl = new QVBoxLayout(fa_tab);+ favl->setContentsMargins(12, 12, 12, 12);+ favl->setSpacing(8);+ auto* fa_instr = new QLineEdit(fa_tab);+ fa_instr->setPlaceholderText("Instruments (comma-separated)");+ fa_instr->setStyleSheet(input_ss());+ text_inputs_["ls_fa_instr"] = fa_instr;+ favl->addWidget(build_input_row("Instruments", fa_instr, fa_tab));+ auto* fa_start = new QLineEdit(fa_tab);+ fa_start->setPlaceholderText("Start date (YYYY-MM-DD)");+ fa_start->setStyleSheet(input_ss());+ text_inputs_["ls_fa_start"] = fa_start;+ favl->addWidget(build_input_row("Start Date", fa_start, fa_tab));+ auto* fa_end = new QLineEdit(fa_tab);+ fa_end->setPlaceholderText("End date (YYYY-MM-DD)");+ fa_end->setStyleSheet(input_ss());+ text_inputs_["ls_fa_end"] = fa_end;+ favl->addWidget(build_input_row("End Date", fa_end, fa_tab));+ auto* fa_run = make_run_button("RUN FACTOR ANALYSIS", fa_tab);+ connect(fa_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Analyzing...");+ QJsonObject params;+ QJsonArray instr;+ for (auto& s : text_inputs_["ls_fa_instr"]->text().split(','))+ if (!s.trimmed().isEmpty())+ instr.append(s.trimmed().toLower());+ params["instruments"] = instr;+ if (!text_inputs_["ls_fa_start"]->text().isEmpty())+ params["start_date"] = text_inputs_["ls_fa_start"]->text().trimmed();+ if (!text_inputs_["ls_fa_end"]->text().isEmpty())+ params["end_date"] = text_inputs_["ls_fa_end"]->text().trimmed();+ AIQuantLabService::instance().signals_get_factor_analysis(params);+ });+ favl->addWidget(fa_run);+ favl->addStretch();+ tabs->addTab(fa_tab, "Factor Analysis");++ // ── Feature Importance ──+ auto* fi_tab = new QWidget(this);+ auto* fivl = new QVBoxLayout(fi_tab);+ fivl->setContentsMargins(12, 12, 12, 12);+ fivl->setSpacing(8);+ auto* fi_model = new QLineEdit(fi_tab);+ fi_model->setPlaceholderText("Trained model ID");+ fi_model->setStyleSheet(input_ss());+ text_inputs_["ls_fi_model"] = fi_model;+ fivl->addWidget(build_input_row("Model ID", fi_model, fi_tab));+ auto* fi_run = make_run_button("GET FEATURE IMPORTANCE", fi_tab);+ connect(fi_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Loading...");+ QJsonObject params;+ params["model_id"] = text_inputs_["ls_fi_model"]->text().trimmed();+ AIQuantLabService::instance().signals_get_feature_importance(params);+ });+ fivl->addWidget(fi_run);+ fivl->addStretch();+ tabs->addTab(fi_tab, "Feature Importance");++ vl->addWidget(tabs, 1);+ results_layout_ = new QVBoxLayout;+ vl->addLayout(results_layout_);+ return w;+}++// ═══════════════════════════════════════════════════════════════════════════════+// ONLINE LEARNING PANEL+// ═══════════════════════════════════════════════════════════════════════════════+QWidget* QuantModulePanel::build_online_learning_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ // ── Models ──+ auto* models_tab = new QWidget(this);+ auto* mtvl = new QVBoxLayout(models_tab);+ mtvl->setContentsMargins(12, 12, 12, 12);+ mtvl->setSpacing(8);+ auto* mt_info = new QLabel("Incrementally trained models that update on each new data point.", models_tab);+ mt_info->setWordWrap(true);+ mt_info->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")+ .arg(ui::colors::TEXT_SECONDARY())+ .arg(ui::fonts::SMALL)+ .arg(ui::fonts::DATA_FAMILY));+ mtvl->addWidget(mt_info);+ auto* mt_list = make_run_button("LIST ALL MODELS", models_tab);+ connect(mt_list, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Loading...");+ AIQuantLabService::instance().online_list_models();+ });+ mtvl->addWidget(mt_list);+ mtvl->addStretch();+ tabs->addTab(models_tab, "Models");++ // ── Create Model ──+ auto* create_tab = new QWidget(this);+ auto* ctvl = new QVBoxLayout(create_tab);+ ctvl->setContentsMargins(12, 12, 12, 12);+ ctvl->setSpacing(8);+ auto* ol_model_type = new QComboBox(create_tab);+ ol_model_type->setStyleSheet(combo_ss());+ ol_model_type->addItems({"linear", "bayesian_linear", "pa", "tree", "adaptive_tree", "bagging", "ewa", "srp"});+ combo_inputs_["ol_model_type"] = ol_model_type;+ ctvl->addWidget(build_input_row("Model Type", ol_model_type, create_tab));+ auto* ol_model_id = new QLineEdit(create_tab);+ ol_model_id->setPlaceholderText("Model ID (optional, auto-generated if blank)");+ ol_model_id->setStyleSheet(input_ss());+ text_inputs_["ol_model_id"] = ol_model_id;+ ctvl->addWidget(build_input_row("Model ID", ol_model_id, create_tab));+ auto* ol_create = make_run_button("CREATE MODEL", create_tab);+ connect(ol_create, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Creating...");+ QJsonObject params;+ params["model_type"] = combo_inputs_["ol_model_type"]->currentText();+ auto mid = text_inputs_["ol_model_id"]->text().trimmed();+ if (!mid.isEmpty())+ params["model_id"] = mid;+ AIQuantLabService::instance().online_create_model(params);+ });+ ctvl->addWidget(ol_create);+ ctvl->addStretch();+ tabs->addTab(create_tab, "Create Model");++ // ── Incremental Train ──+ auto* train_tab = new QWidget(this);+ auto* ttvl = new QVBoxLayout(train_tab);+ ttvl->setContentsMargins(12, 12, 12, 12);+ ttvl->setSpacing(8);+ auto* ol_tid = new QLineEdit(train_tab);+ ol_tid->setPlaceholderText("Model ID");+ ol_tid->setStyleSheet(input_ss());+ text_inputs_["ol_train_id"] = ol_tid;+ ttvl->addWidget(build_input_row("Model ID", ol_tid, train_tab));+ auto* ol_feats = new QLineEdit(train_tab);+ ol_feats->setPlaceholderText(R"({"close":94.0,"volume":1000000,"rsi":55.0})");+ ol_feats->setStyleSheet(input_ss());+ text_inputs_["ol_features"] = ol_feats;+ ttvl->addWidget(build_input_row("Features (JSON)", ol_feats, train_tab));+ auto* ol_target = new QLineEdit(train_tab);+ ol_target->setPlaceholderText("Target value (e.g. 0.02)");+ ol_target->setStyleSheet(input_ss());+ text_inputs_["ol_target"] = ol_target;+ ttvl->addWidget(build_input_row("Target", ol_target, train_tab));+ auto* ol_train = make_run_button("TRAIN ONE STEP", train_tab);+ connect(ol_train, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Training...");+ QJsonObject params;+ params["model_id"] = text_inputs_["ol_train_id"]->text().trimmed();+ auto doc = QJsonDocument::fromJson(text_inputs_["ol_features"]->text().toUtf8());+ if (!doc.isNull())+ params["features"] = doc.object();+ params["target"] = text_inputs_["ol_target"]->text().trimmed().toDouble();+ AIQuantLabService::instance().online_train(params);+ });+ ttvl->addWidget(ol_train);+ ttvl->addStretch();+ tabs->addTab(train_tab, "Incremental Train");++ // ── Predict ──+ auto* pred_tab = new QWidget(this);+ auto* predvl = new QVBoxLayout(pred_tab);+ predvl->setContentsMargins(12, 12, 12, 12);+ predvl->setSpacing(8);+ auto* ol_pid = new QLineEdit(pred_tab);+ ol_pid->setPlaceholderText("Model ID");+ ol_pid->setStyleSheet(input_ss());+ text_inputs_["ol_pred_id"] = ol_pid;+ predvl->addWidget(build_input_row("Model ID", ol_pid, pred_tab));+ auto* ol_pfeats = new QLineEdit(pred_tab);+ ol_pfeats->setPlaceholderText(R"({"close":95.0,"volume":1100000,"rsi":58.0})");+ ol_pfeats->setStyleSheet(input_ss());+ text_inputs_["ol_pred_feats"] = ol_pfeats;+ predvl->addWidget(build_input_row("Features (JSON)", ol_pfeats, pred_tab));+ auto* ol_pred = make_run_button("PREDICT", pred_tab);+ connect(ol_pred, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Predicting...");+ QJsonObject params;+ params["model_id"] = text_inputs_["ol_pred_id"]->text().trimmed();+ auto doc = QJsonDocument::fromJson(text_inputs_["ol_pred_feats"]->text().toUtf8());+ if (!doc.isNull())+ params["features"] = doc.object();+ AIQuantLabService::instance().online_predict(params);+ });+ predvl->addWidget(ol_pred);+ auto* ol_perf = make_run_button("GET PERFORMANCE", pred_tab);+ connect(ol_perf, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Loading...");+ QJsonObject params;+ params["model_id"] = text_inputs_["ol_pred_id"]->text().trimmed();+ AIQuantLabService::instance().online_performance(params);+ });+ predvl->addWidget(ol_perf);+ predvl->addStretch();+ tabs->addTab(pred_tab, "Predict");++ vl->addWidget(tabs, 1);+ results_layout_ = new QVBoxLayout;+ vl->addLayout(results_layout_);+ return w;+}++// ═══════════════════════════════════════════════════════════════════════════════+// META LEARNING PANEL+// ═══════════════════════════════════════════════════════════════════════════════+QWidget* QuantModulePanel::build_meta_learning_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ // ── Model Selection ──+ auto* sel_tab = new QWidget(this);+ auto* selvl = new QVBoxLayout(sel_tab);+ selvl->setContentsMargins(12, 12, 12, 12);+ selvl->setSpacing(8);+ auto* sel_info = new QLabel("Automatically select the best model from a set of candidates.", sel_tab);+ sel_info->setWordWrap(true);+ sel_info->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")+ .arg(ui::colors::TEXT_SECONDARY())+ .arg(ui::fonts::SMALL)+ .arg(ui::fonts::DATA_FAMILY));+ selvl->addWidget(sel_info);+ auto* sel_list_btn = make_run_button("LIST AVAILABLE MODELS", sel_tab);+ connect(sel_list_btn, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Loading...");+ AIQuantLabService::instance().meta_list_models();+ });+ selvl->addWidget(sel_list_btn);+ auto* sel_models = new QLineEdit(sel_tab);+ sel_models->setPlaceholderText("Model IDs (comma-separated, e.g. lightgbm,xgboost,random_forest)");+ sel_models->setStyleSheet(input_ss());+ text_inputs_["ml_sel_models"] = sel_models;+ selvl->addWidget(build_input_row("Models", sel_models, sel_tab));+ auto* sel_task = new QComboBox(sel_tab);+ sel_task->setStyleSheet(combo_ss());+ sel_task->addItems({"regression", "classification"});+ combo_inputs_["ml_sel_task"] = sel_task;+ selvl->addWidget(build_input_row("Task Type", sel_task, sel_tab));+ auto* sel_run = make_run_button("RUN MODEL SELECTION", sel_tab);+ connect(sel_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Selecting...");+ QJsonObject params;+ QJsonArray model_ids;+ for (auto& s : text_inputs_["ml_sel_models"]->text().split(','))+ if (!s.trimmed().isEmpty())+ model_ids.append(s.trimmed());+ params["model_ids"] = model_ids;+ params["task_type"] = combo_inputs_["ml_sel_task"]->currentText();+ AIQuantLabService::instance().meta_run_selection(params);+ });+ selvl->addWidget(sel_run);+ selvl->addStretch();+ tabs->addTab(sel_tab, "Model Selection");++ // ── Ensemble ──+ auto* ens_tab = new QWidget(this);+ auto* ensvl = new QVBoxLayout(ens_tab);+ ensvl->setContentsMargins(12, 12, 12, 12);+ ensvl->setSpacing(8);+ auto* ens_keys = new QLineEdit(ens_tab);+ ens_keys->setPlaceholderText("Model keys (from selection output, comma-separated)");+ ens_keys->setStyleSheet(input_ss());+ text_inputs_["ml_ens_keys"] = ens_keys;+ ensvl->addWidget(build_input_row("Model Keys", ens_keys, ens_tab));+ auto* ens_method = new QComboBox(ens_tab);+ ens_method->setStyleSheet(combo_ss());+ ens_method->addItems({"voting", "stacking", "averaging"});+ combo_inputs_["ml_ens_method"] = ens_method;+ ensvl->addWidget(build_input_row("Ensemble Method", ens_method, ens_tab));+ auto* ens_run = make_run_button("CREATE ENSEMBLE", ens_tab);+ connect(ens_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Creating ensemble...");+ QJsonObject params;+ QJsonArray keys;+ for (auto& s : text_inputs_["ml_ens_keys"]->text().split(','))+ if (!s.trimmed().isEmpty())+ keys.append(s.trimmed());+ params["model_keys"] = keys;+ params["method"] = combo_inputs_["ml_ens_method"]->currentText();+ AIQuantLabService::instance().meta_create_ensemble(params);+ });+ ensvl->addWidget(ens_run);+ ensvl->addStretch();+ tabs->addTab(ens_tab, "Ensemble");++ // ── Hyperparameter Tuning ──+ auto* tune_tab = new QWidget(this);+ auto* tunevl = new QVBoxLayout(tune_tab);+ tunevl->setContentsMargins(12, 12, 12, 12);+ tunevl->setSpacing(8);+ auto* tune_model = new QComboBox(tune_tab);+ tune_model->setStyleSheet(combo_ss());+ tune_model->addItems({"lightgbm", "xgboost", "random_forest", "catboost"});+ combo_inputs_["ml_tune_model"] = tune_model;+ tunevl->addWidget(build_input_row("Model", tune_model, tune_tab));+ auto* tune_grid = new QLineEdit(tune_tab);+ tune_grid->setPlaceholderText(R"({"n_estimators":[50,100,200],"max_depth":[3,5,7]})");+ tune_grid->setStyleSheet(input_ss());+ text_inputs_["ml_tune_grid"] = tune_grid;+ tunevl->addWidget(build_input_row("Param Grid (JSON)", tune_grid, tune_tab));+ auto* tune_method = new QComboBox(tune_tab);+ tune_method->setStyleSheet(combo_ss());+ tune_method->addItems({"grid", "random"});+ combo_inputs_["ml_tune_method"] = tune_method;+ tunevl->addWidget(build_input_row("Search Method", tune_method, tune_tab));+ auto* tune_run = make_run_button("TUNE HYPERPARAMETERS", tune_tab);+ connect(tune_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Tuning...");+ QJsonObject params;+ params["model_id"] = combo_inputs_["ml_tune_model"]->currentText();+ auto doc = QJsonDocument::fromJson(text_inputs_["ml_tune_grid"]->text().toUtf8());+ if (!doc.isNull())+ params["param_grid"] = doc.object();+ params["search_method"] = combo_inputs_["ml_tune_method"]->currentText();+ AIQuantLabService::instance().meta_tune_hyperparameters(params);+ });+ tunevl->addWidget(tune_run);+ auto* results_btn = make_run_button("GET ALL RESULTS", tune_tab);+ connect(results_btn, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Loading...");+ AIQuantLabService::instance().meta_get_results();+ });+ tunevl->addWidget(results_btn);+ tunevl->addStretch();+ tabs->addTab(tune_tab, "Hyperparameter Tuning");++ vl->addWidget(tabs, 1);+ results_layout_ = new QVBoxLayout;+ vl->addLayout(results_layout_);+ return w;+}++// ═══════════════════════════════════════════════════════════════════════════════+// HFT PANEL+// ═══════════════════════════════════════════════════════════════════════════════+QWidget* QuantModulePanel::build_hft_panel() {+ const QString accent = module_.color.name();++ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(0, 0, 0, 0);+ vl->setSpacing(0);++ // ── Shared exchange/symbol bar ────────────────────────────────────────────+ auto* top_bar = new QWidget(w);+ top_bar->setStyleSheet(QString("background:%1; border-bottom:1px solid %2;")+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));+ auto* top_hl = new QHBoxLayout(top_bar);+ top_hl->setContentsMargins(12, 8, 12, 8);+ top_hl->setSpacing(8);++ auto* exch_lbl = new QLabel("EXCHANGE", top_bar);+ exch_lbl->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; letter-spacing:0.5px;")+ .arg(ui::colors::TEXT_TERTIARY()));+ auto* hft_exchange = new QComboBox(top_bar);+ hft_exchange->addItems({"binance", "kraken", "coinbase", "bybit", "okx", "hyperliquid"});+ hft_exchange->setStyleSheet(combo_ss());+ hft_exchange->setFixedWidth(110);+ combo_inputs_["hft_exchange"] = hft_exchange;++ auto* sym_lbl = new QLabel("SYMBOL", top_bar);+ sym_lbl->setStyleSheet(exch_lbl->styleSheet());+ auto* hft_symbol = new QLineEdit(top_bar);+ hft_symbol->setText("BTC/USDT");+ hft_symbol->setFixedWidth(100);+ hft_symbol->setStyleSheet(input_ss());+ hft_symbol->setToolTip("e.g. BTC/USDT, ETH/USDT");+ text_inputs_["hft_symbol"] = hft_symbol;++ auto* depth_lbl = new QLabel("DEPTH", top_bar);+ depth_lbl->setStyleSheet(exch_lbl->styleSheet());+ auto* hft_depth = new QComboBox(top_bar);+ hft_depth->addItems({"10", "20", "50", "100"});+ hft_depth->setCurrentIndex(1);+ hft_depth->setFixedWidth(60);+ hft_depth->setStyleSheet(combo_ss());+ combo_inputs_["hft_depth"] = hft_depth;++ top_hl->addWidget(exch_lbl);+ top_hl->addWidget(hft_exchange);+ top_hl->addWidget(sym_lbl);+ top_hl->addWidget(hft_symbol);+ top_hl->addWidget(depth_lbl);+ top_hl->addWidget(hft_depth);+ top_hl->addStretch();++ // Live latency badge+ auto* latency_lbl = new QLabel("LATENCY —", top_bar);+ latency_lbl->setObjectName("hftLatency");+ latency_lbl->setStyleSheet(QString("color:%1; font-size:9px; font-family:'Courier New'; background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ top_hl->addWidget(latency_lbl);+ vl->addWidget(top_bar);++ // ── Tab widget ────────────────────────────────────────────────────────────+ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(accent));++ // ════════════════════════════════════════════════════════+ // TAB 1 — LIVE ORDER BOOK+ // ════════════════════════════════════════════════════════+ auto* ob_tab = new QWidget(this);+ auto* ob_root = new QVBoxLayout(ob_tab);+ ob_root->setContentsMargins(12, 10, 12, 10);+ ob_root->setSpacing(8);++ // Controls row+ auto* ob_ctrl = new QHBoxLayout;+ ob_ctrl->setSpacing(8);+ auto* ob_fetch = make_run_button("FETCH LIVE ORDER BOOK", ob_tab);+ connect(ob_fetch, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Fetching live order book...");+ QJsonObject p;+ p["exchange"] = combo_inputs_["hft_exchange"]->currentText();+ p["symbol"] = text_inputs_["hft_symbol"]->text().trimmed();+ p["depth"] = combo_inputs_["hft_depth"]->currentText().toInt();+ AIQuantLabService::instance().hft_create_orderbook(p);+ });+ ob_ctrl->addWidget(ob_fetch);+ ob_ctrl->addStretch();+ ob_root->addLayout(ob_ctrl);++ // Metrics row — 5 cards in a grid+ auto* metrics_row = new QHBoxLayout;+ metrics_row->setSpacing(6);++ auto make_card = [&](const QString& label, QWidget* parent) -> QPair<QWidget*, QLabel*> {+ auto* card = new QWidget(parent);+ card->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:3px;")+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));+ auto* cvl = new QVBoxLayout(card);+ cvl->setContentsMargins(10, 6, 10, 6);+ cvl->setSpacing(2);+ auto* l = new QLabel(label, card);+ l->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; letter-spacing:0.5px; background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ auto* v = new QLabel("—", card);+ v->setObjectName("hftCardVal");+ v->setStyleSheet(QString("color:%1; font-size:13px; font-weight:700; font-family:'Courier New'; background:transparent;")+ .arg(ui::colors::TEXT_PRIMARY()));+ cvl->addWidget(l);+ cvl->addWidget(v);+ return {card, v};+ };++ auto [mid_card, mid_val] = make_card("MID PRICE", ob_tab);+ auto [spread_card, spread_val] = make_card("SPREAD BPS", ob_tab);+ auto [obi_card, obi_val] = make_card("ORDER BOOK IMBALANCE", ob_tab);+ auto [pressure_card, pres_val] = make_card("PRESSURE", ob_tab);+ auto [wmid_card, wmid_val] = make_card("WEIGHTED MID", ob_tab);++ // Store for result update+ mid_val->setObjectName("hft_mid_val");+ spread_val->setObjectName("hft_spread_val");+ obi_val->setObjectName("hft_obi_val");+ pres_val->setObjectName("hft_pressure_val");+ wmid_val->setObjectName("hft_wmid_val");++ metrics_row->addWidget(mid_card, 1);+ metrics_row->addWidget(spread_card, 1);+ metrics_row->addWidget(obi_card, 1);+ metrics_row->addWidget(pressure_card, 1);+ metrics_row->addWidget(wmid_card, 1);+ ob_root->addLayout(metrics_row);++ // Bid / Ask tables side by side+ auto* books_row = new QHBoxLayout;+ books_row->setSpacing(8);++ // Bids+ auto* bids_frame = new QWidget(ob_tab);+ bids_frame->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:3px;")+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));+ auto* bids_vl = new QVBoxLayout(bids_frame);+ bids_vl->setContentsMargins(0, 0, 0, 0);+ bids_vl->setSpacing(0);+ auto* bids_hdr = new QLabel(" BIDS", bids_frame);+ bids_hdr->setFixedHeight(24);+ bids_hdr->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; letter-spacing:1px;"+ "background:%2; border-bottom:1px solid %3;")+ .arg(ui::colors::POSITIVE(), ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));+ auto* bid_table = new QTableWidget(10, 3, bids_frame);+ bid_table->setObjectName("hft_bid_table");+ bid_table->setHorizontalHeaderLabels({"Price", "Size", "Cumulative"});+ bid_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ bid_table->verticalHeader()->setVisible(false);+ bid_table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ bid_table->setSelectionMode(QAbstractItemView::NoSelection);+ bid_table->setShowGrid(false);+ bid_table->setStyleSheet(+ QString("QTableWidget { background:%1; border:none; }"+ "QHeaderView::section { background:%2; color:%3; font-size:9px; font-weight:700;"+ " padding:3px 6px; border:none; border-bottom:1px solid %4; }"+ "QTableWidget::item { padding:2px 6px; font-family:'Courier New'; font-size:10px; border:none; }")+ .arg(ui::colors::BG_RAISED(), ui::colors::BG_SURFACE(),+ ui::colors::TEXT_TERTIARY(), ui::colors::BORDER_DIM()));+ bids_vl->addWidget(bids_hdr);+ bids_vl->addWidget(bid_table, 1);++ // Asks+ auto* asks_frame = new QWidget(ob_tab);+ asks_frame->setStyleSheet(bids_frame->styleSheet());+ auto* asks_vl = new QVBoxLayout(asks_frame);+ asks_vl->setContentsMargins(0, 0, 0, 0);+ asks_vl->setSpacing(0);+ auto* asks_hdr = new QLabel(" ASKS", asks_frame);+ asks_hdr->setFixedHeight(24);+ asks_hdr->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; letter-spacing:1px;"+ "background:%2; border-bottom:1px solid %3;")+ .arg(ui::colors::NEGATIVE(), ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));+ auto* ask_table = new QTableWidget(10, 3, asks_frame);+ ask_table->setObjectName("hft_ask_table");+ ask_table->setHorizontalHeaderLabels({"Price", "Size", "Cumulative"});+ ask_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ ask_table->verticalHeader()->setVisible(false);+ ask_table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ ask_table->setSelectionMode(QAbstractItemView::NoSelection);+ ask_table->setShowGrid(false);+ ask_table->setStyleSheet(bid_table->styleSheet());+ asks_vl->addWidget(asks_hdr);+ asks_vl->addWidget(ask_table, 1);++ books_row->addWidget(bids_frame, 1);+ books_row->addWidget(asks_frame, 1);+ ob_root->addLayout(books_row, 1);+ tabs->addTab(ob_tab, "Live Order Book");++ // ════════════════════════════════════════════════════════+ // TAB 2 — MICROSTRUCTURE (Market Making + Toxic Flow)+ // ════════════════════════════════════════════════════════+ auto* micro_tab = new QWidget(this);+ auto* micro_root = new QVBoxLayout(micro_tab);+ micro_root->setContentsMargins(12, 10, 12, 10);+ micro_root->setSpacing(10);++ // ─ Market Making section ─+ auto* mm_section = new QWidget(micro_tab);+ mm_section->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:3px;")+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));+ auto* mm_vl = new QVBoxLayout(mm_section);+ mm_vl->setContentsMargins(12, 10, 12, 10);+ mm_vl->setSpacing(8);++ auto* mm_title = new QLabel("MARKET MAKING — Avellaneda-Stoikov Model", mm_section);+ mm_title->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; letter-spacing:0.5px; background:transparent;")+ .arg(accent));+ mm_vl->addWidget(mm_title);++ auto* mm_params = new QHBoxLayout;+ mm_params->setSpacing(8);+ auto* inv_spin = make_double_spin(-1000, 1000, 0.0, 4, " units", mm_section);+ int_inputs_["hft_inventory"] = nullptr;+ double_inputs_["hft_inventory_d"] = inv_spin;+ mm_params->addWidget(build_input_row("Inventory", inv_spin, mm_section));+ auto* spread_spin = make_double_spin(1.0, 10.0, 1.5, 2, "×", mm_section);+ double_inputs_["hft_spread_mult"] = spread_spin;+ mm_params->addWidget(build_input_row("Spread Mult", spread_spin, mm_section));+ auto* risk_spin = make_double_spin(0.001, 0.1, 0.01, 3, "", mm_section);+ double_inputs_["hft_risk_aversion"] = risk_spin;+ mm_params->addWidget(build_input_row("Risk Aversion", risk_spin, mm_section));+ mm_vl->addLayout(mm_params);++ auto* mm_run = make_run_button("CALCULATE OPTIMAL QUOTES", mm_section);+ connect(mm_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Fetching live data + computing quotes...");+ QJsonObject p;+ p["exchange"] = combo_inputs_["hft_exchange"]->currentText();+ p["symbol"] = text_inputs_["hft_symbol"]->text().trimmed();+ p["inventory"] = double_inputs_["hft_inventory_d"]->value();+ p["spread_multiplier"] = double_inputs_["hft_spread_mult"]->value();+ p["risk_aversion"] = double_inputs_["hft_risk_aversion"]->value();+ AIQuantLabService::instance().hft_market_making_quotes(p);+ });+ mm_vl->addWidget(mm_run);++ // MM result cards+ auto* mm_results = new QHBoxLayout;+ mm_results->setSpacing(6);+ auto [bid_card, bid_val2] = make_card("BID QUOTE", mm_section);+ auto [ask_card, ask_val2] = make_card("ASK QUOTE", mm_section);+ auto [qs_card, qs_val] = make_card("QUOTED SPREAD BPS", mm_section);+ auto [edge_card, edge_val] = make_card("EDGE/SIDE BPS", mm_section);+ auto [rec_card, rec_val] = make_card("RECOMMENDATION", mm_section);+ bid_val2->setObjectName("hft_mm_bid");+ ask_val2->setObjectName("hft_mm_ask");+ qs_val->setObjectName("hft_mm_qspread");+ edge_val->setObjectName("hft_mm_edge");+ rec_val->setObjectName("hft_mm_rec");+ mm_results->addWidget(bid_card, 1);+ mm_results->addWidget(ask_card, 1);+ mm_results->addWidget(qs_card, 1);+ mm_results->addWidget(edge_card, 1);+ mm_results->addWidget(rec_card, 1);+ mm_vl->addLayout(mm_results);+ micro_root->addWidget(mm_section);++ // ─ Toxic Flow section ─+ auto* tox_section = new QWidget(micro_tab);+ tox_section->setStyleSheet(mm_section->styleSheet());+ auto* tox_vl = new QVBoxLayout(tox_section);+ tox_vl->setContentsMargins(12, 10, 12, 10);+ tox_vl->setSpacing(8);++ auto* tox_title = new QLabel("TOXIC FLOW DETECTION — PIN Score Model", tox_section);+ tox_title->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; letter-spacing:0.5px; background:transparent;")+ .arg(accent));+ tox_vl->addWidget(tox_title);++ auto* tox_params = new QHBoxLayout;+ tox_params->setSpacing(8);+ auto* tox_limit = new QComboBox(tox_section);+ tox_limit->addItems({"50", "100", "200", "500"});+ tox_limit->setCurrentIndex(2);+ tox_limit->setStyleSheet(combo_ss());+ combo_inputs_["hft_tox_limit"] = tox_limit;+ tox_params->addWidget(build_input_row("Trade History", tox_limit, tox_section));+ tox_params->addStretch();+ tox_vl->addLayout(tox_params);++ auto* tox_run = make_run_button("DETECT TOXIC FLOW", tox_section);+ connect(tox_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Fetching trades + analyzing flow...");+ QJsonObject p;+ p["exchange"] = combo_inputs_["hft_exchange"]->currentText();+ p["symbol"] = text_inputs_["hft_symbol"]->text().trimmed();+ p["limit"] = combo_inputs_["hft_tox_limit"]->currentText().toInt();+ AIQuantLabService::instance().hft_detect_toxic(p);+ });+ tox_vl->addWidget(tox_run);++ auto* tox_results = new QHBoxLayout;+ tox_results->setSpacing(6);+ auto [pin_card, pin_val] = make_card("PIN SCORE (0-100)", tox_section);+ auto [vol_card, vol_val] = make_card("VOLUME IMBALANCE", tox_section);+ auto [impact_card, impact_val] = make_card("PRICE IMPACT BPS", tox_section);+ auto [class_card, class_val] = make_card("CLASSIFICATION", tox_section);+ auto [action_card, action_val] = make_card("RECOMMENDED ACTION", tox_section);+ pin_val->setObjectName("hft_tox_pin");+ vol_val->setObjectName("hft_tox_vol");+ impact_val->setObjectName("hft_tox_impact");+ class_val->setObjectName("hft_tox_class");+ action_val->setObjectName("hft_tox_action");+ tox_results->addWidget(pin_card, 1);+ tox_results->addWidget(vol_card, 1);+ tox_results->addWidget(impact_card, 1);+ tox_results->addWidget(class_card, 1);+ tox_results->addWidget(action_card, 1);+ tox_vl->addLayout(tox_results);+ micro_root->addWidget(tox_section);+ micro_root->addStretch();+ tabs->addTab(micro_tab, "Microstructure");++ // ════════════════════════════════════════════════════════+ // TAB 3 — SLIPPAGE ESTIMATOR+ // ════════════════════════════════════════════════════════+ auto* slip_tab = new QWidget(this);+ auto* slip_root = new QVBoxLayout(slip_tab);+ slip_root->setContentsMargins(12, 10, 12, 10);+ slip_root->setSpacing(10);++ auto* slip_section = new QWidget(slip_tab);+ slip_section->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:3px;")+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));+ auto* slip_vl = new QVBoxLayout(slip_section);+ slip_vl->setContentsMargins(12, 10, 12, 10);+ slip_vl->setSpacing(8);++ auto* slip_title = new QLabel("SLIPPAGE ESTIMATOR — Real Order Book Walk", slip_section);+ slip_title->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; letter-spacing:0.5px; background:transparent;")+ .arg(accent));+ slip_vl->addWidget(slip_title);++ auto* slip_desc = new QLabel(+ "Walks the live order book level-by-level to compute actual fill price and slippage for a given order size.", slip_section);+ slip_desc->setWordWrap(true);+ slip_desc->setStyleSheet(QString("color:%1; font-size:10px; background:transparent;").arg(ui::colors::TEXT_SECONDARY()));+ slip_vl->addWidget(slip_desc);++ auto* slip_params = new QHBoxLayout;+ slip_params->setSpacing(8);+ auto* slip_side = new QComboBox(slip_section);+ slip_side->addItems({"buy", "sell"});+ slip_side->setStyleSheet(combo_ss());+ combo_inputs_["hft_slip_side"] = slip_side;+ slip_params->addWidget(build_input_row("Side", slip_side, slip_section));+ auto* slip_qty = make_double_spin(0.0001, 1'000'000, 1.0, 6, "", slip_section);+ double_inputs_["hft_slip_qty"] = slip_qty;+ slip_params->addWidget(build_input_row("Quantity", slip_qty, slip_section));+ slip_vl->addLayout(slip_params);++ auto* slip_run = make_run_button("ESTIMATE SLIPPAGE", slip_section);+ connect(slip_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Walking order book...");+ QJsonObject p;+ p["exchange"] = combo_inputs_["hft_exchange"]->currentText();+ p["symbol"] = text_inputs_["hft_symbol"]->text().trimmed();+ p["side"] = combo_inputs_["hft_slip_side"]->currentText();+ p["quantity"] = double_inputs_["hft_slip_qty"]->value();+ AIQuantLabService::instance().hft_execute_order(p);+ });+ slip_vl->addWidget(slip_run);++ // Slippage result cards+ auto* slip_results = new QHBoxLayout;+ slip_results->setSpacing(6);+ auto [avgp_card, avgp_val] = make_card("AVG FILL PRICE", slip_section);+ auto [slbps_card, slbps_val] = make_card("SLIPPAGE BPS", slip_section);+ auto [cost_card, cost_val] = make_card("TOTAL COST", slip_section);+ auto [fills_card, fills_val] = make_card("FILL LEVELS", slip_section);+ auto [viable_card, viable_val] = make_card("VIABILITY", slip_section);+ avgp_val->setObjectName("hft_slip_avgp");+ slbps_val->setObjectName("hft_slip_bps");+ cost_val->setObjectName("hft_slip_cost");+ fills_val->setObjectName("hft_slip_fills");+ viable_val->setObjectName("hft_slip_viable");+ slip_results->addWidget(avgp_card, 1);+ slip_results->addWidget(slbps_card, 1);+ slip_results->addWidget(cost_card, 1);+ slip_results->addWidget(fills_card, 1);+ slip_results->addWidget(viable_card, 1);+ slip_vl->addLayout(slip_results);++ // Fills table+ auto* fills_table = new QTableWidget(0, 3, slip_section);+ fills_table->setObjectName("hft_slip_table");+ fills_table->setHorizontalHeaderLabels({"Fill Price", "Quantity", "Cost"});+ fills_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ fills_table->verticalHeader()->setVisible(false);+ fills_table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ fills_table->setSelectionMode(QAbstractItemView::NoSelection);+ fills_table->setShowGrid(false);+ fills_table->setMaximumHeight(160);+ fills_table->setStyleSheet(+ QString("QTableWidget { background:%1; border:1px solid %2; }"+ "QHeaderView::section { background:%3; color:%4; font-size:9px; font-weight:700;"+ " padding:3px 6px; border:none; border-bottom:1px solid %2; }"+ "QTableWidget::item { padding:2px 6px; font-family:'Courier New'; font-size:10px; }")+ .arg(ui::colors::BG_BASE(), ui::colors::BORDER_DIM(),+ ui::colors::BG_SURFACE(), ui::colors::TEXT_TERTIARY()));+ slip_vl->addWidget(fills_table);++ slip_root->addWidget(slip_section);+ slip_root->addStretch();+ tabs->addTab(slip_tab, "Slippage Estimator");++ // ── Full Analyze button (bottom bar) ─────────────────────────────────────+ auto* bottom_bar = new QWidget(w);+ bottom_bar->setStyleSheet(QString("background:%1; border-top:1px solid %2;")+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));+ auto* bot_hl = new QHBoxLayout(bottom_bar);+ bot_hl->setContentsMargins(12, 6, 12, 6);+ auto* analyze_btn = make_run_button("⚡ FULL ANALYSIS — FETCH ALL & COMPUTE", bottom_bar);+ analyze_btn->setToolTip("Fetches live order book + trades, computes book metrics, market making quotes, toxic flow, and slippage in one call");+ connect(analyze_btn, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Running full microstructure analysis...");+ QJsonObject p;+ p["exchange"] = combo_inputs_["hft_exchange"]->currentText();+ p["symbol"] = text_inputs_["hft_symbol"]->text().trimmed();+ p["depth"] = combo_inputs_["hft_depth"]->currentText().toInt();+ p["limit"] = combo_inputs_["hft_tox_limit"]->currentText().toInt();+ p["inventory"] = double_inputs_["hft_inventory_d"]->value();+ p["spread_multiplier"] = double_inputs_["hft_spread_mult"]->value();+ p["quantity"] = double_inputs_["hft_slip_qty"]->value();+ AIQuantLabService::instance().hft_snapshot(p);+ });+ bot_hl->addWidget(analyze_btn, 1);++ vl->addWidget(tabs, 1);+ vl->addWidget(bottom_bar);++ results_layout_ = new QVBoxLayout;+ vl->addLayout(results_layout_);+ return w;+}++// ═══════════════════════════════════════════════════════════════════════════════+// ROLLING RETRAINING PANEL+// ═══════════════════════════════════════════════════════════════════════════════+QWidget* QuantModulePanel::build_rolling_retraining_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ const QString accent = module_.color.name();+ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(accent));++ // ── Tab 1: Schedules ─────────────────────────────────────────────────────+ auto* list_tab = new QWidget;+ auto* ltvl = new QVBoxLayout(list_tab);+ ltvl->setContentsMargins(12, 12, 12, 12);+ ltvl->setSpacing(10);++ auto* lt_info = new QLabel(+ "Schedules are persisted in ~/.fincept/rolling_schedules.json. "+ "Click Refresh to load the latest state.", list_tab);+ lt_info->setWordWrap(true);+ lt_info->setStyleSheet(QString("color:%1; font-size:11px;").arg(ui::colors::TEXT_SECONDARY()));+ ltvl->addWidget(lt_info);++ // Schedule cards container (scrollable)+ auto* scroll = new QScrollArea(list_tab);+ scroll->setWidgetResizable(true);+ scroll->setFrameShape(QFrame::NoFrame);+ scroll->setStyleSheet(QString("QScrollArea{background:transparent;border:none;}"+ "QScrollBar:vertical{background:%1;width:6px;border-radius:3px;}"+ "QScrollBar::handle:vertical{background:%2;border-radius:3px;}")+ .arg(ui::colors::BG_BASE(), ui::colors::BORDER_MED()));+ auto* cards_w = new QWidget;+ cards_w->setStyleSheet("background:transparent;");+ auto* cards_vl = new QVBoxLayout(cards_w);+ cards_vl->setContentsMargins(0, 0, 0, 0);+ cards_vl->setSpacing(8);+ cards_vl->addStretch();+ scroll->setWidget(cards_w);+ ltvl->addWidget(scroll, 1);++ // Store pointer so result handler can repopulate cards+ // We tag the cards container via objectName+ cards_w->setObjectName("rr_cards_container");++ auto* lt_run = make_run_button("REFRESH SCHEDULES", list_tab);+ connect(lt_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Loading schedules...");+ AIQuantLabService::instance().rolling_list_schedules();+ });+ ltvl->addWidget(lt_run);+ tabs->addTab(list_tab, "Schedules");++ // ── Tab 2: Create Schedule ───────────────────────────────────────────────+ auto* create_tab = new QWidget;+ auto* ctvl = new QVBoxLayout(create_tab);+ ctvl->setContentsMargins(12, 12, 12, 12);+ ctvl->setSpacing(8);++ auto* rr_model_id = new QLineEdit(create_tab);+ rr_model_id->setPlaceholderText("Unique model ID (e.g. lgbm_sp500)");+ rr_model_id->setStyleSheet(input_ss());+ text_inputs_["rr_model_id"] = rr_model_id;+ ctvl->addWidget(build_input_row("Model ID *", rr_model_id, create_tab));++ auto* rr_conf = new QLineEdit(create_tab);+ rr_conf->setPlaceholderText("Optional: path to Qlib YAML config (leave blank for built-in LightGBM+Alpha158)");+ rr_conf->setStyleSheet(input_ss());+ text_inputs_["rr_conf_path"] = rr_conf;+ ctvl->addWidget(build_input_row("Config Path", rr_conf, create_tab));++ auto* rr_freq = new QComboBox(create_tab);+ rr_freq->setStyleSheet(combo_ss());+ rr_freq->addItems({"daily", "weekly", "monthly"});+ combo_inputs_["rr_frequency"] = rr_freq;+ ctvl->addWidget(build_input_row("Frequency", rr_freq, create_tab));++ auto* rr_window = new QLineEdit(create_tab);+ rr_window->setPlaceholderText("Rolling window in trading days (default: 252)");+ rr_window->setStyleSheet(input_ss());+ text_inputs_["rr_window"] = rr_window;+ ctvl->addWidget(build_input_row("Window (days)", rr_window, create_tab));++ auto* rr_step = new QLineEdit(create_tab);+ rr_step->setPlaceholderText("Step size between windows (default: 20)");+ rr_step->setStyleSheet(input_ss());+ text_inputs_["rr_step"] = rr_step;+ ctvl->addWidget(build_input_row("Step (days)", rr_step, create_tab));++ // Region selector+ auto* rr_region = new QComboBox(create_tab);+ rr_region->setStyleSheet(combo_ss());+ rr_region->addItems({"us", "cn"});+ combo_inputs_["rr_region"] = rr_region;+ ctvl->addWidget(build_input_row("Data Region", rr_region, create_tab));++ // Preview + Create buttons side by side+ auto* btn_row = new QWidget(create_tab);+ auto* btn_hl = new QHBoxLayout(btn_row);+ btn_hl->setContentsMargins(0, 4, 0, 0);+ btn_hl->setSpacing(8);++ auto* rr_preview = make_run_button("PREVIEW WINDOWS", btn_row);+ rr_preview->setStyleSheet(QString(+ "QPushButton{background:%1;color:%2;border:1px solid %1;border-radius:4px;"+ "font-size:11px;font-weight:700;padding:6px 14px;}"+ "QPushButton:hover{background:%3;}")+ .arg(ui::colors::BG_RAISED(), accent, ui::colors::BG_HOVER()));+ connect(rr_preview, &QPushButton::clicked, this, [this]() {+ const QString mid = text_inputs_["rr_model_id"]->text().trimmed();+ const QString cp = text_inputs_["rr_conf_path"]->text().trimmed();+ if (mid.isEmpty() && cp.isEmpty()) {+ status_label_->setText("Enter a Model ID or Config Path to preview.");+ return;+ }+ status_label_->setText("Generating preview...");+ QJsonObject params;+ if (!mid.isEmpty()) params["model_id"] = mid;+ if (!cp.isEmpty()) params["conf_path"] = cp;+ const QString step = text_inputs_["rr_step"]->text().trimmed();+ if (!step.isEmpty()) params["step"] = step.toInt();+ AIQuantLabService::instance().rolling_preview_tasks(params);+ });+ btn_hl->addWidget(rr_preview, 1);++ auto* rr_create = make_run_button("CREATE SCHEDULE", btn_row);+ connect(rr_create, &QPushButton::clicked, this, [this]() {+ const QString mid = text_inputs_["rr_model_id"]->text().trimmed();+ if (mid.isEmpty()) {+ status_label_->setText("Model ID is required.");+ return;+ }+ status_label_->setText("Creating schedule...");+ QJsonObject params;+ params["model_id"] = mid;+ params["frequency"] = combo_inputs_["rr_frequency"]->currentText();+ params["region"] = combo_inputs_["rr_region"]->currentText();+ const QString cp = text_inputs_["rr_conf_path"]->text().trimmed();+ if (!cp.isEmpty()) params["conf_path"] = cp;+ const QString win = text_inputs_["rr_window"]->text().trimmed();+ if (!win.isEmpty()) params["window"] = win.toInt();+ const QString step = text_inputs_["rr_step"]->text().trimmed();+ if (!step.isEmpty()) params["step"] = step.toInt();+ AIQuantLabService::instance().rolling_create_schedule(params);+ });+ btn_hl->addWidget(rr_create, 1);+ ctvl->addWidget(btn_row);+ ctvl->addStretch();+ tabs->addTab(create_tab, "Create Schedule");++ // ── Tab 3: Execute Retrain ───────────────────────────────────────────────+ auto* retrain_tab = new QWidget;+ auto* retrainvl = new QVBoxLayout(retrain_tab);+ retrainvl->setContentsMargins(12, 12, 12, 12);+ retrainvl->setSpacing(10);++ auto* rt_info = new QLabel(+ "Executes a full rolling retrain for a scheduled model. Each window trains "+ "independently and progress is streamed live below.", retrain_tab);+ rt_info->setWordWrap(true);+ rt_info->setStyleSheet(QString("color:%1; font-size:11px;").arg(ui::colors::TEXT_SECONDARY()));+ retrainvl->addWidget(rt_info);++ auto* rr_exec_id = new QLineEdit(retrain_tab);+ rr_exec_id->setPlaceholderText("Model ID (must be in Schedules)");+ rr_exec_id->setStyleSheet(input_ss());+ text_inputs_["rr_exec_id"] = rr_exec_id;+ retrainvl->addWidget(build_input_row("Model ID *", rr_exec_id, retrain_tab));++ // Progress bar+ auto* rr_progress = new QProgressBar(retrain_tab);+ rr_progress->setObjectName("rr_progress");+ rr_progress->setRange(0, 100);+ rr_progress->setValue(0);+ rr_progress->setTextVisible(true);+ rr_progress->setFormat("Idle");+ rr_progress->setStyleSheet(QString(+ "QProgressBar{background:%1;border:1px solid %2;border-radius:4px;"+ "color:%3;font-size:11px;font-weight:600;text-align:center;height:20px;}"+ "QProgressBar::chunk{background:%4;border-radius:3px;}")+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_MED(),+ ui::colors::TEXT_PRIMARY(), accent));+ retrainvl->addWidget(rr_progress);++ // Streaming log output+ auto* rr_log = new QTextEdit(retrain_tab);+ rr_log->setObjectName("rr_log");+ rr_log->setReadOnly(true);+ rr_log->setPlaceholderText("Training progress will stream here...");+ rr_log->setStyleSheet(output_ss());+ rr_log->setMinimumHeight(140);+ retrainvl->addWidget(rr_log, 1);++ auto* rr_exec = make_run_button("EXECUTE RETRAIN NOW", retrain_tab);+ connect(rr_exec, &QPushButton::clicked, this, [this]() {+ const QString mid = text_inputs_["rr_exec_id"]->text().trimmed();+ if (mid.isEmpty()) {+ status_label_->setText("Model ID is required.");+ return;+ }+ // Reset progress UI+ if (auto* pb = this->findChild<QProgressBar*>("rr_progress")) {+ pb->setValue(0);+ pb->setFormat("Starting...");+ }+ if (auto* log = this->findChild<QTextEdit*>("rr_log"))+ log->clear();+ status_label_->setText("Retraining...");+ QJsonObject params;+ params["model_id"] = mid;+ AIQuantLabService::instance().rolling_execute_retrain(params);+ });+ retrainvl->addWidget(rr_exec);+ tabs->addTab(retrain_tab, "Execute Retrain");++ vl->addWidget(tabs, 1);+ results_layout_ = new QVBoxLayout;+ vl->addLayout(results_layout_);+ return w;+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_QuantReporting.cpp b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_QuantReporting.cppnew file mode 100644index 000000000..89f43fc7e--- /dev/null+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_QuantReporting.cpp@@ -0,0 +1,909 @@+// src/screens/ai_quant_lab/QuantModulePanel_QuantReporting.cpp+//+// Quant Reporting panel — 5 report builders (IC analysis, cumulative returns,+// risk report, model performance, factor quantiles). Mirrors GS Quant /+// Functime / Statsmodels / Fortitudo pattern. Extracted from QuantModulePanel.cpp+// to keep that file maintainable.+#include "screens/ai_quant_lab/QuantModulePanel.h"+#include "screens/ai_quant_lab/QuantModulePanel_Common.h"+#include "screens/ai_quant_lab/QuantModulePanel_GsHelpers.h"+#include "screens/ai_quant_lab/QuantModulePanel_Styles.h"++#include "services/ai_quant_lab/AIQuantLabService.h"+#include "ui/theme/Theme.h"++#include <QAbstractItemView>+#include <QColor>+#include <QComboBox>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QJsonArray>+#include <QJsonObject>+#include <QLabel>+#include <QLineEdit>+#include <QList>+#include <QPointer>+#include <QPushButton>+#include <QSpinBox>+#include <QString>+#include <QStringList>+#include <QTabWidget>+#include <QTableWidget>+#include <QTableWidgetItem>+#include <QVBoxLayout>+#include <QWidget>++#include <algorithm>+#include <cmath>++namespace fincept::screens {++using namespace fincept::services::quant;+using namespace fincept::screens::quant_styles;+using namespace fincept::screens::quant_common;+using namespace fincept::screens::quant_gs_helpers;++// ═══════════════════════════════════════════════════════════════════════════════+// QUANT REPORTING PANEL — 5 report builders (IC analysis, cumulative returns,+// risk report, model performance, factor quantiles). Mirrors GS Quant /+// Functime / Statsmodels / Fortitudo pattern.+// ═══════════════════════════════════════════════════════════════════════════════+QWidget* QuantModulePanel::build_quant_reporting_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ // Local LOAD SAMPLE helper — same shape as the other panels.+ auto add_sample_btn = [this](QLineEdit* edit, QWidget* parent, unsigned seed,+ const QString& tip) -> QPushButton* {+ auto* btn = new QPushButton("LOAD SAMPLE", parent);+ btn->setCursor(Qt::PointingHandCursor);+ btn->setFixedHeight(22);+ btn->setToolTip(tip);+ btn->setStyleSheet(QString("QPushButton { color:%1; background:transparent; border:1px solid %2;"+ "padding:0 8px; font-size:9px; font-weight:700; letter-spacing:0.5px; border-radius:2px; }"+ "QPushButton:hover { color:%3; border-color:%3; background:rgba(255,255,255,0.04); }")+ .arg(ui::colors::TEXT_TERTIARY(), ui::colors::BORDER_DIM(), module_.color.name()));+ QPointer<QLineEdit> guard(edit);+ connect(btn, &QPushButton::clicked, this, [guard, seed]() {+ if (guard) guard->setText(sample_returns(seed));+ });+ return btn;+ };++ // ── IC Analysis ──────────────────────────────────────────────────────────+ auto* ic_tab = new QWidget(this);+ auto* icvl = new QVBoxLayout(ic_tab);+ icvl->setContentsMargins(12, 12, 12, 12);+ icvl->setSpacing(8);++ auto* ic_preds = new QLineEdit(ic_tab);+ ic_preds->setPlaceholderText("Model predictions (decimals, >= 10 values)");+ ic_preds->setStyleSheet(input_ss());+ text_inputs_["rp_ic_preds"] = ic_preds;+ icvl->addWidget(build_input_row("Predictions", ic_preds, ic_tab));+ icvl->addWidget(add_sample_btn(ic_preds, ic_tab, 211,+ "252 synthetic predictions (mu=0.05%, sigma=1.2%)"));++ auto* ic_rets = new QLineEdit(ic_tab);+ ic_rets->setPlaceholderText("Realized returns (decimals, same length as predictions)");+ ic_rets->setStyleSheet(input_ss());+ text_inputs_["rp_ic_rets"] = ic_rets;+ icvl->addWidget(build_input_row("Returns", ic_rets, ic_tab));+ icvl->addWidget(add_sample_btn(ic_rets, ic_tab, 212,+ "252 synthetic realized returns"));++ auto* ic_method = new QComboBox(ic_tab);+ ic_method->addItems({"both", "pearson", "spearman"});+ ic_method->setStyleSheet(combo_ss());+ combo_inputs_["rp_ic_method"] = ic_method;+ icvl->addWidget(build_input_row("IC Method", ic_method, ic_tab));++ auto* ic_window = new QSpinBox(ic_tab);+ ic_window->setRange(5, 100);+ ic_window->setValue(20);+ ic_window->setStyleSheet(spinbox_ss());+ int_inputs_["rp_ic_window"] = ic_window;+ icvl->addWidget(build_input_row("Rolling Window", ic_window, ic_tab));++ auto* ic_run = make_run_button("RUN IC ANALYSIS", ic_tab);+ connect(ic_run, &QPushButton::clicked, this, [this]() {+ QJsonArray preds, rets;+ QString bad;+ if (!parse_doubles(text_inputs_["rp_ic_preds"]->text(), preds, &bad)) {+ display_error(QString("Predictions: '%1' is not numeric.").arg(bad));+ return;+ }+ if (!parse_doubles(text_inputs_["rp_ic_rets"]->text(), rets, &bad)) {+ display_error(QString("Returns: '%1' is not numeric.").arg(bad));+ return;+ }+ if (preds.size() < 10) {+ display_error(QString("IC analysis needs at least 10 predictions; you provided %1.").arg(preds.size()));+ return;+ }+ if (preds.size() != rets.size()) {+ display_error(QString("Predictions (%1) and returns (%2) must have the same length.")+ .arg(preds.size()).arg(rets.size()));+ return;+ }+ show_loading(QString("Computing IC + rolling IC on %1 observations...").arg(preds.size()));+ QJsonObject params;+ params["predictions"] = preds;+ params["returns"] = rets;+ params["method"] = combo_inputs_["rp_ic_method"]->currentText();+ params["window"] = int_inputs_["rp_ic_window"]->value();+ AIQuantLabService::instance().reporting_ic_analysis(params);+ });+ icvl->addWidget(ic_run);+ icvl->addStretch();+ tabs->addTab(ic_tab, "IC Analysis");++ // ── Cumulative Returns ───────────────────────────────────────────────────+ auto* cr_tab = new QWidget(this);+ auto* crvl = new QVBoxLayout(cr_tab);+ crvl->setContentsMargins(12, 12, 12, 12);+ crvl->setSpacing(8);++ auto* cr_rets = new QLineEdit(cr_tab);+ cr_rets->setPlaceholderText("Portfolio daily returns (decimals)");+ cr_rets->setStyleSheet(input_ss());+ text_inputs_["rp_cr_rets"] = cr_rets;+ crvl->addWidget(build_input_row("Returns", cr_rets, cr_tab));+ crvl->addWidget(add_sample_btn(cr_rets, cr_tab, 221,+ "252 synthetic portfolio returns"));++ auto* cr_bench = new QLineEdit(cr_tab);+ cr_bench->setPlaceholderText("Benchmark returns (optional; same length as portfolio if provided)");+ cr_bench->setStyleSheet(input_ss());+ text_inputs_["rp_cr_bench"] = cr_bench;+ crvl->addWidget(build_input_row("Benchmark Returns (optional)", cr_bench, cr_tab));+ crvl->addWidget(add_sample_btn(cr_bench, cr_tab, 222,+ "252 synthetic benchmark returns"));++ auto* cr_title = new QLineEdit(cr_tab);+ cr_title->setPlaceholderText("Chart title (e.g. Strategy vs S&P 500)");+ cr_title->setText("Cumulative Returns");+ cr_title->setStyleSheet(input_ss());+ text_inputs_["rp_cr_title"] = cr_title;+ crvl->addWidget(build_input_row("Title", cr_title, cr_tab));++ auto* cr_run = make_run_button("BUILD CUMULATIVE RETURNS REPORT", cr_tab);+ connect(cr_run, &QPushButton::clicked, this, [this]() {+ QJsonArray rets;+ QString bad;+ if (!parse_doubles(text_inputs_["rp_cr_rets"]->text(), rets, &bad)) {+ display_error(QString("Returns: '%1' is not numeric.").arg(bad));+ return;+ }+ if (rets.size() < 5) {+ display_error(QString("Need at least 5 returns; you provided %1.").arg(rets.size()));+ return;+ }+ QJsonObject params;+ params["returns"] = rets;+ const QString bench_text = text_inputs_["rp_cr_bench"]->text().trimmed();+ if (!bench_text.isEmpty()) {+ QJsonArray bench;+ if (!parse_doubles(bench_text, bench, &bad)) {+ display_error(QString("Benchmark: '%1' is not numeric.").arg(bad));+ return;+ }+ if (bench.size() != rets.size()) {+ display_error(QString("Benchmark (%1) and returns (%2) must have the same length.")+ .arg(bench.size()).arg(rets.size()));+ return;+ }+ params["benchmark_returns"] = bench;+ }+ const QString title = text_inputs_["rp_cr_title"]->text().trimmed();+ params["title"] = title.isEmpty() ? QString("Cumulative Returns") : title;+ show_loading(QString("Building cumulative returns report on %1 obs...").arg(rets.size()));+ AIQuantLabService::instance().reporting_cumulative_returns(params);+ });+ crvl->addWidget(cr_run);+ crvl->addStretch();+ tabs->addTab(cr_tab, "Cumulative Returns");++ // ── Risk Report ──────────────────────────────────────────────────────────+ auto* rk_tab = new QWidget(this);+ auto* rkvl = new QVBoxLayout(rk_tab);+ rkvl->setContentsMargins(12, 12, 12, 12);+ rkvl->setSpacing(8);++ auto* rk_rets = new QLineEdit(rk_tab);+ rk_rets->setPlaceholderText("Daily returns (>= 30 values)");+ rk_rets->setStyleSheet(input_ss());+ text_inputs_["rp_rk_rets"] = rk_rets;+ rkvl->addWidget(build_input_row("Returns", rk_rets, rk_tab));+ rkvl->addWidget(add_sample_btn(rk_rets, rk_tab, 231,+ "252 synthetic daily returns"));++ auto* rk_window = new QSpinBox(rk_tab);+ rk_window->setRange(5, 100);+ rk_window->setValue(20);+ rk_window->setStyleSheet(spinbox_ss());+ int_inputs_["rp_rk_window"] = rk_window;+ rkvl->addWidget(build_input_row("Rolling Volatility Window (days)", rk_window, rk_tab));++ auto* rk_hint = new QLabel(+ "Computes max drawdown with peak/trough/recovery markers, daily VaR + CVaR at 5% and 1%, "+ "and rolling annualized volatility.", rk_tab);+ rk_hint->setWordWrap(true);+ rk_hint->setStyleSheet(QString("color:%1; font-size:10px;").arg(ui::colors::TEXT_TERTIARY()));+ rkvl->addWidget(rk_hint);++ auto* rk_run = make_run_button("BUILD RISK REPORT", rk_tab);+ connect(rk_run, &QPushButton::clicked, this, [this]() {+ QJsonArray rets;+ QString bad;+ if (!parse_doubles(text_inputs_["rp_rk_rets"]->text(), rets, &bad)) {+ display_error(QString("Returns: '%1' is not numeric.").arg(bad));+ return;+ }+ if (rets.size() < 30) {+ display_error(QString("Risk report needs at least 30 obs; you provided %1.").arg(rets.size()));+ return;+ }+ QJsonObject params;+ params["returns"] = rets;+ params["rolling_window"] = int_inputs_["rp_rk_window"]->value();+ show_loading(QString("Computing drawdown + rolling vol on %1 obs...").arg(rets.size()));+ AIQuantLabService::instance().reporting_risk_report(params);+ });+ rkvl->addWidget(rk_run);+ rkvl->addStretch();+ tabs->addTab(rk_tab, "Risk Report");++ // ── Model Performance ────────────────────────────────────────────────────+ auto* mp_tab = new QWidget(this);+ auto* mpvl = new QVBoxLayout(mp_tab);+ mpvl->setContentsMargins(12, 12, 12, 12);+ mpvl->setSpacing(8);++ auto* mp_preds = new QLineEdit(mp_tab);+ mp_preds->setPlaceholderText("Model predictions (decimals, >= 20 values)");+ mp_preds->setStyleSheet(input_ss());+ text_inputs_["rp_mp_preds"] = mp_preds;+ mpvl->addWidget(build_input_row("Predictions", mp_preds, mp_tab));+ mpvl->addWidget(add_sample_btn(mp_preds, mp_tab, 241,+ "252 synthetic model predictions"));++ auto* mp_rets = new QLineEdit(mp_tab);+ mp_rets->setPlaceholderText("Realized returns (same length as predictions)");+ mp_rets->setStyleSheet(input_ss());+ text_inputs_["rp_mp_rets"] = mp_rets;+ mpvl->addWidget(build_input_row("Returns", mp_rets, mp_tab));+ mpvl->addWidget(add_sample_btn(mp_rets, mp_tab, 242,+ "252 synthetic realized returns"));++ auto* mp_name = new QLineEdit(mp_tab);+ mp_name->setPlaceholderText("Model label (e.g. LightGBM, LSTM)");+ mp_name->setText("Model");+ mp_name->setStyleSheet(input_ss());+ text_inputs_["rp_mp_name"] = mp_name;+ mpvl->addWidget(build_input_row("Model Name", mp_name, mp_tab));++ auto* mp_q = new QSpinBox(mp_tab);+ mp_q->setRange(2, 10);+ mp_q->setValue(5);+ mp_q->setStyleSheet(spinbox_ss());+ int_inputs_["rp_mp_n_quantiles"] = mp_q;+ mpvl->addWidget(build_input_row("Quantile Buckets", mp_q, mp_tab));++ auto* mp_run = make_run_button("EVALUATE MODEL", mp_tab);+ connect(mp_run, &QPushButton::clicked, this, [this]() {+ QJsonArray preds, rets;+ QString bad;+ if (!parse_doubles(text_inputs_["rp_mp_preds"]->text(), preds, &bad)) {+ display_error(QString("Predictions: '%1' is not numeric.").arg(bad));+ return;+ }+ if (!parse_doubles(text_inputs_["rp_mp_rets"]->text(), rets, &bad)) {+ display_error(QString("Returns: '%1' is not numeric.").arg(bad));+ return;+ }+ if (preds.size() < 20) {+ display_error(QString("Model evaluation needs at least 20 obs; you provided %1.").arg(preds.size()));+ return;+ }+ if (preds.size() != rets.size()) {+ display_error(QString("Predictions (%1) and returns (%2) must have the same length.")+ .arg(preds.size()).arg(rets.size()));+ return;+ }+ QJsonObject params;+ params["predictions"] = preds;+ params["returns"] = rets;+ const QString name = text_inputs_["rp_mp_name"]->text().trimmed();+ params["model_name"] = name.isEmpty() ? QString("Model") : name;+ params["n_quantiles"] = int_inputs_["rp_mp_n_quantiles"]->value();+ show_loading(QString("Evaluating %1 on %2 obs...").arg(name.isEmpty() ? "model" : name).arg(preds.size()));+ AIQuantLabService::instance().reporting_model_performance(params);+ });+ mpvl->addWidget(mp_run);+ mpvl->addStretch();+ tabs->addTab(mp_tab, "Model Performance");++ // ── Factor Quantiles ─────────────────────────────────────────────────────+ auto* fq_tab = new QWidget(this);+ auto* fqvl = new QVBoxLayout(fq_tab);+ fqvl->setContentsMargins(12, 12, 12, 12);+ fqvl->setSpacing(8);++ auto* fq_preds = new QLineEdit(fq_tab);+ fq_preds->setPlaceholderText("Factor / signal values (decimals, >= 20)");+ fq_preds->setStyleSheet(input_ss());+ text_inputs_["rp_fq_preds"] = fq_preds;+ fqvl->addWidget(build_input_row("Factor Signal", fq_preds, fq_tab));+ fqvl->addWidget(add_sample_btn(fq_preds, fq_tab, 251,+ "252 synthetic factor values"));++ auto* fq_rets = new QLineEdit(fq_tab);+ fq_rets->setPlaceholderText("Realized returns (same length as factor)");+ fq_rets->setStyleSheet(input_ss());+ text_inputs_["rp_fq_rets"] = fq_rets;+ fqvl->addWidget(build_input_row("Realized Returns", fq_rets, fq_tab));+ fqvl->addWidget(add_sample_btn(fq_rets, fq_tab, 252,+ "252 synthetic realized returns"));++ auto* fq_q = new QSpinBox(fq_tab);+ fq_q->setRange(2, 10);+ fq_q->setValue(5);+ fq_q->setStyleSheet(spinbox_ss());+ int_inputs_["rp_fq_n_quantiles"] = fq_q;+ fqvl->addWidget(build_input_row("Quantile Buckets", fq_q, fq_tab));++ auto* fq_hint = new QLabel(+ "Sorts observations into N buckets by signal strength and reports realized return per bucket. "+ "A monotone Q1→Q5 progression indicates a clean factor; non-monotone hints at noise.", fq_tab);+ fq_hint->setWordWrap(true);+ fq_hint->setStyleSheet(QString("color:%1; font-size:10px;").arg(ui::colors::TEXT_TERTIARY()));+ fqvl->addWidget(fq_hint);++ auto* fq_run = make_run_button("ANALYZE FACTOR QUANTILES", fq_tab);+ connect(fq_run, &QPushButton::clicked, this, [this]() {+ QJsonArray preds, rets;+ QString bad;+ if (!parse_doubles(text_inputs_["rp_fq_preds"]->text(), preds, &bad)) {+ display_error(QString("Factor: '%1' is not numeric.").arg(bad));+ return;+ }+ if (!parse_doubles(text_inputs_["rp_fq_rets"]->text(), rets, &bad)) {+ display_error(QString("Returns: '%1' is not numeric.").arg(bad));+ return;+ }+ if (preds.size() < 20) {+ display_error(QString("Quantile analysis needs at least 20 obs; you provided %1.").arg(preds.size()));+ return;+ }+ if (preds.size() != rets.size()) {+ display_error(QString("Factor (%1) and returns (%2) must have the same length.")+ .arg(preds.size()).arg(rets.size()));+ return;+ }+ QJsonObject params;+ params["predictions"] = preds;+ params["returns"] = rets;+ params["n_quantiles"] = int_inputs_["rp_fq_n_quantiles"]->value();+ show_loading(QString("Bucketing %1 obs into %2 quantiles...")+ .arg(preds.size()).arg(int_inputs_["rp_fq_n_quantiles"]->value()));+ AIQuantLabService::instance().reporting_factor_quantiles(params);+ });+ fqvl->addWidget(fq_run);+ fqvl->addStretch();+ tabs->addTab(fq_tab, "Factor Quantiles");++ vl->addWidget(tabs, 1);++ auto* rc = new QWidget(w);+ results_layout_ = new QVBoxLayout(rc);+ results_layout_->setContentsMargins(0, 8, 0, 0);+ results_layout_->setSpacing(8);+ vl->addWidget(rc);++ return w;+}++// ── QUANT REPORTING: rich card-based display per command ────────────────────++void QuantModulePanel::display_quant_reporting_result(const QString& command, const QJsonObject& payload) {+ clear_results();++ if (!payload.value("success").toBool(false)) {+ const QString err = payload.value("error").toString("Unknown error");+ const QString kind = payload.value("error_kind").toString();+ const QString prefix = kind == "validation" ? "Input error: "+ : kind == "runtime" ? "Computation failed: "+ : "";+ display_error(prefix + err);+ return;+ }++ const QJsonObject d = payload.value("data").toObject();+ const QString accent = module_.color.name();++ // Section header+ QString header_text = command.toUpper();+ header_text.replace('_', ' ');+ if (d.contains("n_observations"))+ header_text += QString(" | %1 OBS").arg(d.value("n_observations").toInt());+ results_layout_->addWidget(gs_section_header(header_text, accent));++ // ── 1. CHECK STATUS ──────────────────────────────────────────────────────+ if (command == "check_status") {+ auto bool_card = [this](const QString& label, bool ok) {+ return gs_make_card(label, ok ? "AVAILABLE" : "MISSING", this,+ ok ? ui::colors::POSITIVE() : ui::colors::NEGATIVE());+ };+ QList<QWidget*> deps = {+ bool_card("SCIPY", d.value("scipy").toBool()),+ bool_card("PANDAS", d.value("pandas").toBool()),+ gs_make_card("BACKEND", d.value("backend").toString().toUpper(), this),+ gs_make_card("OPS", QString::number(d.value("ops_available").toArray().size()),+ this, ui::colors::INFO()),+ };+ results_layout_->addWidget(gs_card_row(deps, this));+ status_label_->setText("Quant Reporting backend ready");+ return;+ }++ // ── 2. IC ANALYSIS ───────────────────────────────────────────────────────+ if (command == "ic_analysis") {+ const double pearson = d.value("overall_pearson_ic").toDouble();+ const double pearson_p = d.value("overall_pearson_p").toDouble();+ const double spearman = d.value("overall_spearman_ic").toDouble();+ const double spearman_p = d.value("overall_spearman_p").toDouble();+ const double icir = d.value("icir").toDouble();+ const double rank_icir = d.value("rank_icir").toDouble();+ const QString ic_verdict = d.value("ic_verdict").toString();+ const QString rank_verdict = d.value("rank_ic_verdict").toString();++ auto* hdr = new QLabel(QString("METHOD: %1 | ROLLING WINDOW: %2 | %3 ROLLING POINTS")+ .arg(d.value("method").toString().toUpper())+ .arg(d.value("window").toInt())+ .arg(d.value("n_rolling_points").toInt()));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(), accent));+ results_layout_->addWidget(hdr);++ auto verdict_color = [](const QString& v) {+ if (v == "STRONG") return ui::colors::POSITIVE();+ if (v == "MODERATE") return ui::colors::POSITIVE();+ if (v == "WEAK") return ui::colors::WARNING();+ if (v == "VERY WEAK") return ui::colors::WARNING();+ return ui::colors::NEGATIVE();+ };++ QList<QWidget*> overall = {+ gs_make_card("PEARSON IC", gs_fmt_num(pearson, 4), this, gs_pos_neg_color(pearson)),+ gs_make_card("PEARSON p", gs_fmt_num(pearson_p, 4), this,+ pearson_p < 0.05 ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ gs_make_card("SPEARMAN IC", gs_fmt_num(spearman, 4), this, gs_pos_neg_color(spearman)),+ gs_make_card("SPEARMAN p", gs_fmt_num(spearman_p, 4), this,+ spearman_p < 0.05 ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ };+ results_layout_->addWidget(gs_card_row(overall, this));++ QList<QWidget*> ic_card = {+ gs_make_card("ROLLING IC MEAN", gs_fmt_num(d.value("ic_mean").toDouble(), 4), this,+ gs_pos_neg_color(d.value("ic_mean").toDouble())),+ gs_make_card("ROLLING IC σ", gs_fmt_num(d.value("ic_std").toDouble(), 4), this),+ gs_make_card("ICIR", gs_fmt_num(icir, 3), this,+ icir >= 0.5 ? ui::colors::POSITIVE()+ : icir >= 0 ? ui::colors::WARNING()+ : ui::colors::NEGATIVE()),+ gs_make_card("IC VERDICT", ic_verdict, this, verdict_color(ic_verdict)),+ };+ results_layout_->addWidget(gs_card_row(ic_card, this));++ QList<QWidget*> rank_card = {+ gs_make_card("RANK IC MEAN", gs_fmt_num(d.value("rank_ic_mean").toDouble(), 4), this,+ gs_pos_neg_color(d.value("rank_ic_mean").toDouble())),+ gs_make_card("RANK IC σ", gs_fmt_num(d.value("rank_ic_std").toDouble(), 4), this),+ gs_make_card("RANK ICIR", gs_fmt_num(rank_icir, 3), this,+ rank_icir >= 0.5 ? ui::colors::POSITIVE()+ : rank_icir >= 0 ? ui::colors::WARNING()+ : ui::colors::NEGATIVE()),+ gs_make_card("RANK VERDICT", rank_verdict, this, verdict_color(rank_verdict)),+ };+ results_layout_->addWidget(gs_card_row(rank_card, this));++ QList<QWidget*> hit = {+ gs_make_card("IC POSITIVE %", QString::number(d.value("ic_positive_pct").toDouble(), 'f', 1) + "%", this,+ d.value("ic_positive_pct").toDouble() > 60 ? ui::colors::POSITIVE()+ : ui::colors::WARNING()),+ gs_make_card("RANK IC POS %",+ QString::number(d.value("rank_ic_positive_pct").toDouble(), 'f', 1) + "%", this,+ d.value("rank_ic_positive_pct").toDouble() > 60 ? ui::colors::POSITIVE()+ : ui::colors::WARNING()),+ gs_make_card("OBSERVATIONS", QString::number(d.value("n_observations").toInt()), this),+ gs_make_card("WINDOW SIZE", QString::number(d.value("window").toInt()) + " obs", this),+ };+ results_layout_->addWidget(gs_card_row(hit, this));++ // Rolling IC table (sample first/middle/last 15 rows)+ const QJsonArray rolling = d.value("rolling_series").toArray();+ if (!rolling.isEmpty()) {+ const int rows = std::min<int>(15, rolling.size());+ const int step = std::max<int>(1, rolling.size() / rows);+ auto* table = new QTableWidget(rows, 3, this);+ table->setHorizontalHeaderLabels({"End Index", "IC", "Rank IC"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(rows * 22 + 32);+ for (int i = 0, r = 0; i < rolling.size() && r < rows; i += step, ++r) {+ const auto o = rolling[i].toObject();+ table->setItem(r, 0, new QTableWidgetItem(QString::number(o.value("end_index").toInt())));+ auto add_v = [&](int col, double v) {+ auto* it = new QTableWidgetItem(QString::number(v, 'f', 4));+ it->setForeground(QColor(gs_pos_neg_color(v)));+ it->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(r, col, it);+ };+ add_v(1, o.value("ic").toDouble());+ add_v(2, o.value("rank_ic").toDouble());+ table->setRowHeight(r, 22);+ }+ results_layout_->addWidget(table);+ }++ status_label_->setText(QString("IC: pearson=%1 spearman=%2 ICIR=%3 → %4")+ .arg(pearson, 0, 'f', 3).arg(spearman, 0, 'f', 3)+ .arg(icir, 0, 'f', 3).arg(ic_verdict));+ return;+ }++ // ── 3. CUMULATIVE RETURNS ────────────────────────────────────────────────+ if (command == "cumulative_returns") {+ const double total_ret_pct = d.value("total_return_pct").toDouble();+ const double ann_ret_pct = d.value("annualized_return_pct").toDouble();+ const double ann_vol_pct = d.value("annualized_volatility_pct").toDouble();+ const double sharpe = d.value("sharpe_ratio").toDouble();+ const double mdd_pct = d.value("max_drawdown_pct").toDouble();+ const double win_pct = d.value("win_rate_pct").toDouble();+ const bool has_bench = d.value("has_benchmark").toBool();++ auto* hdr = new QLabel(QString("%1 | %2 OBS").arg(d.value("title").toString())+ .arg(d.value("n_observations").toInt()));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(), accent));+ results_layout_->addWidget(hdr);++ QList<QWidget*> top = {+ gs_make_card("TOTAL RETURN", QString::number(total_ret_pct, 'f', 2) + "%", this,+ gs_pos_neg_color(total_ret_pct)),+ gs_make_card("ANN. RETURN", QString::number(ann_ret_pct, 'f', 2) + "%", this,+ gs_pos_neg_color(ann_ret_pct)),+ gs_make_card("ANN. VOLATILITY", QString::number(ann_vol_pct, 'f', 2) + "%", this),+ gs_make_card("SHARPE RATIO", gs_fmt_num(sharpe, 3), this,+ sharpe >= 1.0 ? ui::colors::POSITIVE()+ : sharpe >= 0 ? ui::colors::TEXT_PRIMARY()+ : ui::colors::NEGATIVE()),+ };+ results_layout_->addWidget(gs_card_row(top, this));++ QList<QWidget*> risk = {+ gs_make_card("MAX DRAWDOWN", QString::number(mdd_pct, 'f', 2) + "%", this,+ mdd_pct <= -20.0 ? ui::colors::NEGATIVE() : ui::colors::WARNING()),+ gs_make_card("WIN RATE", QString::number(win_pct, 'f', 1) + "%", this,+ win_pct > 55 ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ gs_make_card("BEST DAY", QString::number(d.value("best_day").toDouble() * 100, 'f', 2) + "%", this,+ ui::colors::POSITIVE()),+ gs_make_card("WORST DAY", QString::number(d.value("worst_day").toDouble() * 100, 'f', 2) + "%", this,+ ui::colors::NEGATIVE()),+ };+ results_layout_->addWidget(gs_card_row(risk, this));++ if (has_bench) {+ QList<QWidget*> bench = {+ gs_make_card("BENCH TOTAL",+ QString::number(d.value("benchmark_total_return_pct").toDouble(), 'f', 2) + "%",+ this, gs_pos_neg_color(d.value("benchmark_total_return_pct").toDouble())),+ gs_make_card("ALPHA", QString::number(d.value("alpha_pct").toDouble(), 'f', 2) + "%", this,+ gs_pos_neg_color(d.value("alpha_pct").toDouble())),+ gs_make_card("TRACKING ERROR",+ QString::number(d.value("tracking_error_pct").toDouble(), 'f', 2) + "%", this),+ gs_make_card("INFORMATION RATIO",+ gs_fmt_num(d.value("information_ratio").toDouble(), 3), this,+ d.value("information_ratio").toDouble() > 0.5 ? ui::colors::POSITIVE()+ : ui::colors::WARNING()),+ };+ results_layout_->addWidget(gs_card_row(bench, this));+ }++ // Equity curve preview — table sampled to ~12 rows+ const QJsonArray curve = d.value("portfolio_curve").toArray();+ const QJsonArray bench_curve = d.value("benchmark_curve").toArray();+ if (!curve.isEmpty()) {+ const int rows = std::min<int>(12, curve.size());+ const int step = std::max<int>(1, curve.size() / rows);+ auto* table = new QTableWidget(rows, has_bench ? 4 : 3, this);+ QStringList headers = {"Index", "Portfolio", "Cum Return"};+ if (has_bench) headers << "Benchmark";+ table->setHorizontalHeaderLabels(headers);+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(rows * 22 + 32);+ for (int i = 0, r = 0; i < curve.size() && r < rows; i += step, ++r) {+ const auto o = curve[i].toObject();+ const double v = o.value("value").toDouble();+ table->setItem(r, 0, new QTableWidgetItem(QString::number(o.value("index").toInt())));+ auto* vi = new QTableWidgetItem(QString::number(v, 'f', 4));+ vi->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(r, 1, vi);+ auto* ri = new QTableWidgetItem(QString::number((v - 1.0) * 100, 'f', 2) + "%");+ ri->setForeground(QColor(gs_pos_neg_color(v - 1.0)));+ ri->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(r, 2, ri);+ if (has_bench && i < bench_curve.size()) {+ const auto bo = bench_curve[i].toObject();+ auto* bi = new QTableWidgetItem(QString::number(bo.value("value").toDouble(), 'f', 4));+ bi->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(r, 3, bi);+ }+ table->setRowHeight(r, 22);+ }+ results_layout_->addWidget(table);+ }++ status_label_->setText(QString("%1: total %2% Sharpe %3 MaxDD %4%")+ .arg(d.value("title").toString())+ .arg(total_ret_pct, 0, 'f', 2).arg(sharpe, 0, 'f', 2)+ .arg(mdd_pct, 0, 'f', 2));+ return;+ }++ // ── 4. RISK REPORT ───────────────────────────────────────────────────────+ if (command == "risk_report") {+ const double mdd_pct = d.value("max_drawdown_pct").toDouble();+ const bool recovered = d.value("max_drawdown_recovered").toBool();+ const int duration = d.value("drawdown_duration_days").toInt();+ const double cur_dd = d.value("current_drawdown_pct").toDouble();+ const double cur_vol = d.value("current_rolling_vol").toDouble();+ const double avg_vol = d.value("avg_rolling_vol").toDouble();++ auto* hdr = new QLabel(QString("ROLLING WINDOW: %1 DAYS").arg(d.value("rolling_window").toInt()));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(), accent));+ results_layout_->addWidget(hdr);++ QList<QWidget*> dd = {+ gs_make_card("MAX DRAWDOWN", QString::number(mdd_pct, 'f', 2) + "%", this,+ mdd_pct <= -20.0 ? ui::colors::NEGATIVE() : ui::colors::WARNING()),+ gs_make_card("CURRENT DD", QString::number(cur_dd, 'f', 2) + "%", this,+ cur_dd < -5.0 ? ui::colors::WARNING() : ui::colors::TEXT_PRIMARY()),+ gs_make_card("DURATION", QString("%1 days").arg(duration), this),+ gs_make_card("RECOVERED",+ recovered ? "YES" : "NOT YET",+ this, recovered ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ };+ results_layout_->addWidget(gs_card_row(dd, this));++ QList<QWidget*> vol = {+ gs_make_card("CURRENT VOL", QString::number(cur_vol * 100, 'f', 2) + "%", this,+ cur_vol > avg_vol * 1.3 ? ui::colors::WARNING() : ui::colors::TEXT_PRIMARY()),+ gs_make_card("AVG ROLLING VOL", QString::number(avg_vol * 100, 'f', 2) + "%", this),+ gs_make_card("MAX ROLLING VOL",+ QString::number(d.value("max_rolling_vol").toDouble() * 100, 'f', 2) + "%", this,+ ui::colors::WARNING()),+ gs_make_card("MIN ROLLING VOL",+ QString::number(d.value("min_rolling_vol").toDouble() * 100, 'f', 2) + "%", this),+ };+ results_layout_->addWidget(gs_card_row(vol, this));++ QList<QWidget*> tail = {+ gs_make_card("VaR 5%",+ QString::number(d.value("var_5pct_daily").toDouble() * 100, 'f', 3) + "%", this,+ ui::colors::WARNING()),+ gs_make_card("CVaR 5%",+ QString::number(d.value("cvar_5pct_daily").toDouble() * 100, 'f', 3) + "%", this,+ ui::colors::NEGATIVE()),+ gs_make_card("VaR 1%",+ QString::number(d.value("var_1pct_daily").toDouble() * 100, 'f', 3) + "%", this,+ ui::colors::WARNING()),+ gs_make_card("CVaR 1%",+ QString::number(d.value("cvar_1pct_daily").toDouble() * 100, 'f', 3) + "%", this,+ ui::colors::NEGATIVE()),+ };+ results_layout_->addWidget(gs_card_row(tail, this));++ // Drawdown timeline strip+ const int peak_i = d.value("max_drawdown_peak_index").toInt();+ const int trough_i = d.value("max_drawdown_trough_index").toInt();+ const int recov_i = d.value("max_drawdown_recovery_index").toInt();+ auto* timeline = new QLabel(QString(+ "Drawdown timeline: peak @ obs %1 → trough @ obs %2 (Δ %3 days) → %4")+ .arg(peak_i).arg(trough_i).arg(trough_i - peak_i)+ .arg(recov_i >= 0+ ? QString("recovered @ obs %1").arg(recov_i)+ : QString("not yet recovered")));+ timeline->setStyleSheet(QString("color:%1; font-size:10px; font-family:'Courier New';"+ "padding:6px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_SECONDARY(), ui::colors::BG_SURFACE(),+ recovered ? ui::colors::POSITIVE() : ui::colors::WARNING()));+ results_layout_->addWidget(timeline);++ status_label_->setText(QString("MaxDD %1% Cur %2% Vol %3% Recovered: %4")+ .arg(mdd_pct, 0, 'f', 2).arg(cur_dd, 0, 'f', 2)+ .arg(cur_vol * 100, 0, 'f', 2).arg(recovered ? "YES" : "NO"));+ return;+ }++ // ── 5. MODEL PERFORMANCE ────────────────────────────────────────────────+ if (command == "model_performance") {+ const QString model = d.value("model_name").toString();+ const double pearson = d.value("pearson_ic").toDouble();+ const double spearman = d.value("spearman_ic").toDouble();+ const double dir_acc = d.value("direction_accuracy_pct").toDouble();+ const double hit_rate = d.value("hit_rate_pct").toDouble();+ const double ls_bps = d.value("long_short_spread_bps").toDouble();+ const bool monotonic = d.value("monotonic").toBool();+ const QString verdict = d.value("verdict").toString();++ auto* hdr = new QLabel(QString("MODEL: %1 | %2 QUANTILES | %3")+ .arg(model.toUpper()).arg(d.value("n_quantiles").toInt())+ .arg(verdict));+ const bool good = verdict.contains("STRONG") || verdict.contains("MODERATE");+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(),+ good ? ui::colors::POSITIVE() : ui::colors::WARNING()));+ results_layout_->addWidget(hdr);++ QList<QWidget*> ic = {+ gs_make_card("PEARSON IC", gs_fmt_num(pearson, 4), this, gs_pos_neg_color(pearson)),+ gs_make_card("SPEARMAN IC", gs_fmt_num(spearman, 4), this, gs_pos_neg_color(spearman)),+ gs_make_card("PEARSON p", gs_fmt_num(d.value("pearson_p_value").toDouble(), 4), this),+ gs_make_card("SPEARMAN p", gs_fmt_num(d.value("spearman_p_value").toDouble(), 4), this),+ };+ results_layout_->addWidget(gs_card_row(ic, this));++ QList<QWidget*> hit = {+ gs_make_card("DIR. ACCURACY", QString::number(dir_acc, 'f', 1) + "%", this,+ dir_acc > 55 ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ gs_make_card("HIT RATE", QString::number(hit_rate, 'f', 1) + "%", this,+ hit_rate > 55 ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ gs_make_card("LONG-SHORT SPREAD",+ QString::number(ls_bps, 'f', 1) + " bps", this,+ gs_pos_neg_color(ls_bps)),+ gs_make_card("MONOTONIC", monotonic ? "YES" : "NO", this,+ monotonic ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ };+ results_layout_->addWidget(gs_card_row(hit, this));++ // Quantile table+ const QJsonArray quants = d.value("quantile_table").toArray();+ if (!quants.isEmpty()) {+ auto* table = new QTableWidget(quants.size(), 6, this);+ table->setHorizontalHeaderLabels({"Q", "N", "Pred Range", "Mean Return", "Median Return", "Win Rate"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(quants.size() * 24 + 32, 280));+ for (int i = 0; i < quants.size(); ++i) {+ const auto q = quants[i].toObject();+ const double mr = q.value("mean_return").toDouble();+ table->setItem(i, 0, new QTableWidgetItem(QString::number(q.value("quantile").toInt())));+ table->setItem(i, 1, new QTableWidgetItem(QString::number(q.value("n").toInt())));+ table->setItem(i, 2, new QTableWidgetItem(+ QString("[%1, %2]").arg(q.value("pred_min").toDouble(), 0, 'f', 4)+ .arg(q.value("pred_max").toDouble(), 0, 'f', 4)));+ auto* mri = new QTableWidgetItem(QString::number(mr * 100, 'f', 4) + "%");+ mri->setForeground(QColor(gs_pos_neg_color(mr)));+ mri->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 3, mri);+ auto* mei = new QTableWidgetItem(+ QString::number(q.value("median_return").toDouble() * 100, 'f', 4) + "%");+ mei->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 4, mei);+ auto* wi = new QTableWidgetItem(+ QString::number(q.value("win_rate_pct").toDouble(), 'f', 1) + "%");+ wi->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 5, wi);+ table->setRowHeight(i, 24);+ }+ results_layout_->addWidget(table);+ }++ status_label_->setText(QString("%1: IC=%2 Spread=%3 bps → %4")+ .arg(model).arg(spearman, 0, 'f', 3)+ .arg(ls_bps, 0, 'f', 1).arg(verdict));+ return;+ }++ // ── 6. FACTOR QUANTILES ─────────────────────────────────────────────────+ if (command == "factor_quantiles") {+ const double spread_bps = d.value("long_short_spread_bps").toDouble();+ const double ls_sharpe = d.value("long_short_sharpe_annualized").toDouble();+ const bool monotone = d.value("monotonic").toBool();+ const QString verdict = d.value("verdict").toString();+ const int n_q = d.value("n_quantiles").toInt();++ auto* hdr = new QLabel(QString("%1 QUANTILES | %2").arg(n_q).arg(verdict));+ const bool good = verdict.contains("STRONG");+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(),+ good ? ui::colors::POSITIVE() : ui::colors::WARNING()));+ results_layout_->addWidget(hdr);++ QList<QWidget*> top = {+ gs_make_card("L/S SPREAD", QString::number(spread_bps, 'f', 1) + " bps", this,+ gs_pos_neg_color(spread_bps)),+ gs_make_card("L/S SHARPE (ANN)", gs_fmt_num(ls_sharpe, 3), this,+ ls_sharpe >= 1.0 ? ui::colors::POSITIVE()+ : ls_sharpe > 0 ? ui::colors::WARNING()+ : ui::colors::NEGATIVE()),+ gs_make_card("MONOTONIC", monotone ? "YES" : "NO", this,+ monotone ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ gs_make_card("OBSERVATIONS", QString::number(d.value("n_observations").toInt()), this),+ };+ results_layout_->addWidget(gs_card_row(top, this));++ // Quantile detail table+ const QJsonArray quants = d.value("quantiles").toArray();+ if (!quants.isEmpty()) {+ auto* table = new QTableWidget(quants.size(), 7, this);+ table->setHorizontalHeaderLabels({"Q", "N", "Pred Mean", "Ret Mean", "Ret Median", "Ret σ", "Win Rate"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(quants.size() * 26 + 32, 320));+ for (int i = 0; i < quants.size(); ++i) {+ const auto q = quants[i].toObject();+ const int qid = q.value("quantile").toInt();+ const double rm = q.value("ret_mean").toDouble();+ QString tag = QString::number(qid);+ if (qid == 1) tag += " (low)";+ if (qid == n_q) tag += " (high)";+ table->setItem(i, 0, new QTableWidgetItem(tag));+ table->setItem(i, 1, new QTableWidgetItem(QString::number(q.value("n").toInt())));+ auto add_n = [&](int col, double v, int dec, bool color = false) {+ auto* it = new QTableWidgetItem(QString::number(v, 'f', dec));+ it->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ if (color) it->setForeground(QColor(gs_pos_neg_color(v)));+ table->setItem(i, col, it);+ };+ add_n(2, q.value("pred_mean").toDouble(), 4);+ auto* rmi = new QTableWidgetItem(QString::number(rm * 100, 'f', 4) + "%");+ rmi->setForeground(QColor(gs_pos_neg_color(rm)));+ rmi->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 3, rmi);+ auto* rmd = new QTableWidgetItem(+ QString::number(q.value("ret_median").toDouble() * 100, 'f', 4) + "%");+ rmd->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 4, rmd);+ add_n(5, q.value("ret_std").toDouble() * 100, 4);+ auto* wi = new QTableWidgetItem(+ QString::number(q.value("win_rate_pct").toDouble(), 'f', 1) + "%");+ wi->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 6, wi);+ table->setRowHeight(i, 26);+ }+ results_layout_->addWidget(table);+ }++ status_label_->setText(QString("Spread %1 bps Sharpe %2 → %3")+ .arg(spread_bps, 0, 'f', 1).arg(ls_sharpe, 0, 'f', 2).arg(verdict));+ return;+ }++ // ── Fallback ─────────────────────────────────────────────────────────────+ display_result(d);+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_RL.cpp b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_RL.cppnew file mode 100644index 000000000..19b42e7a8--- /dev/null+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_RL.cpp@@ -0,0 +1,144 @@+// src/screens/ai_quant_lab/QuantModulePanel_RL.cpp+//+// RL Trading panel — train RL agents (PPO/DQN/A2C/SAC/TD3) on yfinance data+// with live progress + log console. Extracted from QuantModulePanel.cpp to keep+// that file maintainable.+#include "screens/ai_quant_lab/QuantModulePanel.h"+#include "screens/ai_quant_lab/QuantModulePanel_Common.h"+#include "screens/ai_quant_lab/QuantModulePanel_GsHelpers.h"+#include "screens/ai_quant_lab/QuantModulePanel_Styles.h"++#include "services/ai_quant_lab/AIQuantLabService.h"+#include "ui/theme/Theme.h"++#include <QComboBox>+#include <QJsonObject>+#include <QLabel>+#include <QLineEdit>+#include <QPlainTextEdit>+#include <QProgressBar>+#include <QPushButton>+#include <QSpinBox>+#include <QString>+#include <QVBoxLayout>+#include <QWidget>++namespace fincept::screens {++using namespace fincept::services::quant;+using namespace fincept::screens::quant_styles;+using namespace fincept::screens::quant_common;+using namespace fincept::screens::quant_gs_helpers;++// ═══════════════════════════════════════════════════════════════════════════════+// RL TRADING PANEL+// ═══════════════════════════════════════════════════════════════════════════════++QWidget* QuantModulePanel::build_rl_trading_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* algo = new QComboBox(w);+ algo->addItems({"PPO", "DQN", "A2C", "SAC", "TD3"});+ algo->setStyleSheet(combo_ss());+ combo_inputs_["rl_algo"] = algo;+ vl->addWidget(build_input_row("RL Algorithm", algo, w));++ auto* ticker = new QLineEdit(w);+ ticker->setPlaceholderText("AAPL");+ ticker->setStyleSheet(input_ss());+ text_inputs_["rl_ticker"] = ticker;+ vl->addWidget(build_input_row("Ticker", ticker, w));++ auto* episodes = new QSpinBox(w);+ episodes->setRange(10, 10000);+ episodes->setValue(100);+ episodes->setStyleSheet(spinbox_ss());+ int_inputs_["rl_episodes"] = episodes;+ vl->addWidget(build_input_row("Training Episodes", episodes, w));++ auto* lr = make_double_spin(0.00001, 1.0, 0.0003, 5, "", w);+ double_inputs_["rl_learning_rate"] = lr;+ vl->addWidget(build_input_row("Learning Rate", lr, w));++ auto* capital = make_double_spin(1000, 1e12, 100000, 0, "", w);+ double_inputs_["rl_capital"] = capital;+ vl->addWidget(build_input_row("Initial Capital ($)", capital, w));++ rl_train_button_ = make_run_button("TRAIN RL AGENT", w);+ connect(rl_train_button_, &QPushButton::clicked, this, [this]() {+ if (!rl_train_button_ || !rl_log_console_) return;+ rl_log_console_->clear();+ rl_progress_bar_->setValue(0);+ rl_progress_bar_->setVisible(true);+ rl_progress_stats_->setText("step 0 / — · reward — · loss —");+ rl_progress_stats_->setVisible(true);+ rl_log_console_->setVisible(true);+ rl_train_button_->setEnabled(false);+ status_label_->setText("Training RL Agent...");+ QJsonObject params;+ params["algorithm"] = combo_inputs_["rl_algo"]->currentText();+ params["ticker"] = text_inputs_["rl_ticker"]->text();+ params["episodes"] = int_inputs_["rl_episodes"]->value();+ params["learning_rate"] = double_inputs_["rl_learning_rate"]->value();+ params["initial_capital"] = double_inputs_["rl_capital"]->value();+ AIQuantLabService::instance().train_rl_agent(params);+ });+ vl->addWidget(rl_train_button_);++ // Progress bar — hidden until training starts+ rl_progress_bar_ = new QProgressBar(w);+ rl_progress_bar_->setRange(0, 100);+ rl_progress_bar_->setValue(0);+ rl_progress_bar_->setTextVisible(true);+ rl_progress_bar_->setFixedHeight(18);+ rl_progress_bar_->setVisible(false);+ rl_progress_bar_->setStyleSheet(+ QString("QProgressBar { background:%1; border:1px solid %2; border-radius:2px; text-align:center; color:%3; }"+ "QProgressBar::chunk { background:%4; }")+ .arg(ui::colors::BG_RAISED())+ .arg(ui::colors::BORDER_MED())+ .arg(ui::colors::TEXT_PRIMARY())+ .arg(module_.color.name()));+ vl->addWidget(rl_progress_bar_);++ // Stats label — hidden until training starts+ rl_progress_stats_ = new QLabel(w);+ rl_progress_stats_->setText("");+ rl_progress_stats_->setVisible(false);+ rl_progress_stats_->setStyleSheet(+ QString("color:%1; background:transparent; font-family:%2; font-size:%3px;")+ .arg(ui::colors::TEXT_SECONDARY())+ .arg(ui::fonts::DATA_FAMILY)+ .arg(ui::fonts::SMALL));+ vl->addWidget(rl_progress_stats_);++ // Log console — hidden until training starts+ rl_log_console_ = new QPlainTextEdit(w);+ rl_log_console_->setReadOnly(true);+ rl_log_console_->setMaximumBlockCount(5000);+ rl_log_console_->setMinimumHeight(200);+ rl_log_console_->setVisible(false);+ rl_log_console_->setStyleSheet(+ QString("QPlainTextEdit { background:%1; color:%2; border:1px solid %3; border-radius:2px;"+ "font-family:%4; font-size:%5px; padding:6px; }")+ .arg(ui::colors::BG_BASE())+ .arg(ui::colors::TEXT_PRIMARY())+ .arg(ui::colors::BORDER_MED())+ .arg(ui::fonts::DATA_FAMILY)+ .arg(ui::fonts::SMALL));+ vl->addWidget(rl_log_console_);++ auto* rc = new QWidget(w);+ results_layout_ = new QVBoxLayout(rc);+ results_layout_->setContentsMargins(0, 8, 0, 0);+ results_layout_->setSpacing(8);+ vl->addWidget(rc);+ vl->addStretch();++ return w;+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Statsmodels.cpp b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Statsmodels.cppnew file mode 100644index 000000000..a8c9e8e7f--- /dev/null+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Statsmodels.cpp@@ -0,0 +1,944 @@+// src/screens/ai_quant_lab/QuantModulePanel_Statsmodels.cpp+//+// Statsmodels panel — 6 econometric analyses (OLS, ARIMA, stationarity,+// ACF/PACF, Granger causality, descriptive). Mirrors the GS Quant / Functime+// pattern. Extracted from QuantModulePanel.cpp to keep that file maintainable.+#include "screens/ai_quant_lab/QuantModulePanel.h"+#include "screens/ai_quant_lab/QuantModulePanel_Common.h"+#include "screens/ai_quant_lab/QuantModulePanel_GsHelpers.h"+#include "screens/ai_quant_lab/QuantModulePanel_Styles.h"++#include "services/ai_quant_lab/AIQuantLabService.h"+#include "ui/theme/Theme.h"++#include <QAbstractItemView>+#include <QColor>+#include <QComboBox>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QJsonArray>+#include <QJsonObject>+#include <QJsonValue>+#include <QLabel>+#include <QLineEdit>+#include <QList>+#include <QPointer>+#include <QPushButton>+#include <QSpinBox>+#include <QString>+#include <QStringList>+#include <QTabWidget>+#include <QTableWidget>+#include <QTableWidgetItem>+#include <QVBoxLayout>+#include <QWidget>++#include <algorithm>+#include <cmath>++namespace fincept::screens {++using namespace fincept::services::quant;+using namespace fincept::screens::quant_styles;+using namespace fincept::screens::quant_common;+using namespace fincept::screens::quant_gs_helpers;++// ═══════════════════════════════════════════════════════════════════════════════+// STATSMODELS PANEL — 6 econometric analyses (OLS, ARIMA, stationarity,+// ACF/PACF, Granger causality, descriptive). Mirrors the GS Quant / Functime+// pattern.+// ═══════════════════════════════════════════════════════════════════════════════++QWidget* QuantModulePanel::build_statsmodels_panel() {+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(16, 16, 16, 16);+ vl->setSpacing(12);++ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(module_.color.name()));++ // Same LOAD SAMPLE helper shape as functime+ auto add_sample_btn = [this](QLineEdit* edit, QWidget* parent, unsigned seed,+ const QString& tip, bool walk = false) -> QPushButton* {+ auto* btn = new QPushButton("LOAD SAMPLE", parent);+ btn->setCursor(Qt::PointingHandCursor);+ btn->setFixedHeight(22);+ btn->setToolTip(tip);+ btn->setStyleSheet(QString("QPushButton { color:%1; background:transparent; border:1px solid %2;"+ "padding:0 8px; font-size:9px; font-weight:700; letter-spacing:0.5px; border-radius:2px; }"+ "QPushButton:hover { color:%3; border-color:%3; background:rgba(255,255,255,0.04); }")+ .arg(ui::colors::TEXT_TERTIARY(), ui::colors::BORDER_DIM(), module_.color.name()));+ QPointer<QLineEdit> guard(edit);+ connect(btn, &QPushButton::clicked, this, [guard, seed, walk]() {+ if (guard) guard->setText(walk ? sample_random_walk(seed) : sample_series(seed));+ });+ return btn;+ };++ // ── OLS Regression ───────────────────────────────────────────────────────+ auto* ols = new QWidget(this);+ auto* oll = new QVBoxLayout(ols);+ oll->setContentsMargins(12, 12, 12, 12);+ oll->setSpacing(8);++ auto* ols_y = new QLineEdit(ols);+ ols_y->setPlaceholderText("Dependent variable y (>= 10 values)");+ ols_y->setStyleSheet(input_ss());+ text_inputs_["sm_ols_y"] = ols_y;+ oll->addWidget(build_input_row("y (Dependent)", ols_y, ols));+ oll->addWidget(add_sample_btn(ols_y, ols, 71,+ "100-pt synthetic series (level ~50)"));++ auto* ols_x = new QLineEdit(ols);+ ols_x->setPlaceholderText("Regressor x (single column, same length as y). For multi-feature use the JSON 2D form.");+ ols_x->setStyleSheet(input_ss());+ text_inputs_["sm_ols_x"] = ols_x;+ oll->addWidget(build_input_row("x (Regressor)", ols_x, ols));+ oll->addWidget(add_sample_btn(ols_x, ols, 72,+ "100-pt synthetic regressor"));++ auto* ols_const = new QComboBox(ols);+ ols_const->addItems({"true", "false"});+ ols_const->setStyleSheet(combo_ss());+ combo_inputs_["sm_ols_const"] = ols_const;+ oll->addWidget(build_input_row("Add Constant", ols_const, ols));++ auto* ols_run = make_run_button("RUN OLS REGRESSION", ols);+ connect(ols_run, &QPushButton::clicked, this, [this]() {+ QJsonArray y, x;+ QString bad;+ if (!parse_doubles(text_inputs_["sm_ols_y"]->text(), y, &bad)) {+ display_error(QString("y: '%1' is not numeric.").arg(bad));+ return;+ }+ if (!parse_doubles(text_inputs_["sm_ols_x"]->text(), x, &bad)) {+ display_error(QString("x: '%1' is not numeric.").arg(bad));+ return;+ }+ if (y.size() < 10) {+ display_error(QString("OLS needs at least 10 observations; you provided %1.").arg(y.size()));+ return;+ }+ if (y.size() != x.size()) {+ display_error(QString("y (%1) and x (%2) must have the same length.")+ .arg(y.size()).arg(x.size()));+ return;+ }+ show_loading(QString("Fitting OLS on %1 obs...").arg(y.size()));+ QJsonObject params;+ params["y"] = y;+ params["x"] = x;+ params["add_constant"] = combo_inputs_["sm_ols_const"]->currentText() == "true";+ AIQuantLabService::instance().sm_ols(params);+ });+ oll->addWidget(ols_run);+ oll->addStretch();+ tabs->addTab(ols, "OLS Regression");++ // ── ARIMA ────────────────────────────────────────────────────────────────+ auto* ar = new QWidget(this);+ auto* arl = new QVBoxLayout(ar);+ arl->setContentsMargins(12, 12, 12, 12);+ arl->setSpacing(8);++ auto* ar_vals = new QLineEdit(ar);+ ar_vals->setPlaceholderText("Time series values (>= 30)");+ ar_vals->setStyleSheet(input_ss());+ text_inputs_["sm_ar_values"] = ar_vals;+ arl->addWidget(build_input_row("Series Values", ar_vals, ar));+ arl->addWidget(add_sample_btn(ar_vals, ar, 81,+ "200-pt synthetic series with seasonality"));++ auto* ar_p = new QSpinBox(ar);+ ar_p->setRange(0, 10);+ ar_p->setValue(1);+ ar_p->setStyleSheet(spinbox_ss());+ int_inputs_["sm_ar_p"] = ar_p;+ arl->addWidget(build_input_row("AR Order p", ar_p, ar));++ auto* ar_d = new QSpinBox(ar);+ ar_d->setRange(0, 3);+ ar_d->setValue(1);+ ar_d->setStyleSheet(spinbox_ss());+ int_inputs_["sm_ar_d"] = ar_d;+ arl->addWidget(build_input_row("Differencing d", ar_d, ar));++ auto* ar_q = new QSpinBox(ar);+ ar_q->setRange(0, 10);+ ar_q->setValue(1);+ ar_q->setStyleSheet(spinbox_ss());+ int_inputs_["sm_ar_q"] = ar_q;+ arl->addWidget(build_input_row("MA Order q", ar_q, ar));++ auto* ar_h = new QSpinBox(ar);+ ar_h->setRange(1, 365);+ ar_h->setValue(14);+ ar_h->setStyleSheet(spinbox_ss());+ int_inputs_["sm_ar_horizon"] = ar_h;+ arl->addWidget(build_input_row("Forecast Horizon", ar_h, ar));++ auto* ar_run = make_run_button("FIT ARIMA + FORECAST", ar);+ connect(ar_run, &QPushButton::clicked, this, [this]() {+ QJsonArray vals;+ QString bad;+ if (!parse_doubles(text_inputs_["sm_ar_values"]->text(), vals, &bad)) {+ display_error(QString("Series Values: '%1' is not numeric.").arg(bad));+ return;+ }+ if (vals.size() < 30) {+ display_error(QString("ARIMA needs at least 30 observations; you provided %1.").arg(vals.size()));+ return;+ }+ const int p = int_inputs_["sm_ar_p"]->value();+ const int d = int_inputs_["sm_ar_d"]->value();+ const int q = int_inputs_["sm_ar_q"]->value();+ show_loading(QString("Fitting ARIMA(%1,%2,%3) on %4 obs and projecting %5 steps...")+ .arg(p).arg(d).arg(q).arg(vals.size()).arg(int_inputs_["sm_ar_horizon"]->value()));+ QJsonObject params;+ params["values"] = vals;+ params["p"] = p;+ params["d"] = d;+ params["q"] = q;+ params["horizon"] = int_inputs_["sm_ar_horizon"]->value();+ AIQuantLabService::instance().sm_arima(params);+ });+ arl->addWidget(ar_run);+ arl->addStretch();+ tabs->addTab(ar, "ARIMA");++ // ── Stationarity Tests (single d, full ADF + KPSS detail) ────────────────+ auto* st = new QWidget(this);+ auto* stl = new QVBoxLayout(st);+ stl->setContentsMargins(12, 12, 12, 12);+ stl->setSpacing(8);++ auto* st_vals = new QLineEdit(st);+ st_vals->setPlaceholderText("Time series values (>= 30)");+ st_vals->setStyleSheet(input_ss());+ text_inputs_["sm_st_values"] = st_vals;+ stl->addWidget(build_input_row("Series Values", st_vals, st));+ stl->addWidget(add_sample_btn(st_vals, st, 91,+ "150-pt random walk with drift", true));++ auto* st_d = new QSpinBox(st);+ st_d->setRange(0, 3);+ st_d->setValue(0);+ st_d->setStyleSheet(spinbox_ss());+ int_inputs_["sm_st_d"] = st_d;+ stl->addWidget(build_input_row("Differencing Order d", st_d, st));++ auto* st_adf = new QComboBox(st);+ st_adf->addItems({"c", "ct", "ctt", "n"});+ st_adf->setToolTip("c = constant, ct = constant + trend, ctt = constant + trend + quadratic trend, n = no constant");+ st_adf->setStyleSheet(combo_ss());+ combo_inputs_["sm_st_adf_reg"] = st_adf;+ stl->addWidget(build_input_row("ADF Regression Type", st_adf, st));++ auto* st_kpss = new QComboBox(st);+ st_kpss->addItems({"c", "ct"});+ st_kpss->setToolTip("c = constant only, ct = constant + trend");+ st_kpss->setStyleSheet(combo_ss());+ combo_inputs_["sm_st_kpss_reg"] = st_kpss;+ stl->addWidget(build_input_row("KPSS Regression Type", st_kpss, st));++ auto* st_run = make_run_button("RUN ADF + KPSS", st);+ connect(st_run, &QPushButton::clicked, this, [this]() {+ QJsonArray vals;+ QString bad;+ if (!parse_doubles(text_inputs_["sm_st_values"]->text(), vals, &bad)) {+ display_error(QString("Series Values: '%1' is not numeric.").arg(bad));+ return;+ }+ if (vals.size() < 30) {+ display_error(QString("Stationarity tests need at least 30 observations; you provided %1.").arg(vals.size()));+ return;+ }+ show_loading(QString("Running ADF + KPSS at d=%1...").arg(int_inputs_["sm_st_d"]->value()));+ QJsonObject params;+ params["values"] = vals;+ params["d"] = int_inputs_["sm_st_d"]->value();+ params["adf_regression"] = combo_inputs_["sm_st_adf_reg"]->currentText();+ params["kpss_regression"] = combo_inputs_["sm_st_kpss_reg"]->currentText();+ AIQuantLabService::instance().sm_stationarity_tests(params);+ });+ stl->addWidget(st_run);+ stl->addStretch();+ tabs->addTab(st, "Stationarity");++ // ── ACF / PACF ───────────────────────────────────────────────────────────+ auto* ap = new QWidget(this);+ auto* apl = new QVBoxLayout(ap);+ apl->setContentsMargins(12, 12, 12, 12);+ apl->setSpacing(8);++ auto* ap_vals = new QLineEdit(ap);+ ap_vals->setPlaceholderText("Time series values (>= 20). Used for ARIMA(p,q) order selection.");+ ap_vals->setStyleSheet(input_ss());+ text_inputs_["sm_ap_values"] = ap_vals;+ apl->addWidget(build_input_row("Series Values", ap_vals, ap));+ apl->addWidget(add_sample_btn(ap_vals, ap, 101,+ "200-pt synthetic series with seasonality"));++ auto* ap_lags = new QSpinBox(ap);+ ap_lags->setRange(2, 100);+ ap_lags->setValue(20);+ ap_lags->setStyleSheet(spinbox_ss());+ int_inputs_["sm_ap_nlags"] = ap_lags;+ apl->addWidget(build_input_row("Number of Lags", ap_lags, ap));++ auto* ap_run = make_run_button("COMPUTE ACF + PACF", ap);+ connect(ap_run, &QPushButton::clicked, this, [this]() {+ QJsonArray vals;+ QString bad;+ if (!parse_doubles(text_inputs_["sm_ap_values"]->text(), vals, &bad)) {+ display_error(QString("Series Values: '%1' is not numeric.").arg(bad));+ return;+ }+ if (vals.size() < 20) {+ display_error(QString("ACF/PACF needs at least 20 observations; you provided %1.").arg(vals.size()));+ return;+ }+ show_loading(QString("Computing ACF + PACF up to lag %1...").arg(int_inputs_["sm_ap_nlags"]->value()));+ QJsonObject params;+ params["values"] = vals;+ params["nlags"] = int_inputs_["sm_ap_nlags"]->value();+ AIQuantLabService::instance().sm_acf_pacf(params);+ });+ apl->addWidget(ap_run);+ apl->addStretch();+ tabs->addTab(ap, "ACF / PACF");++ // ── Granger Causality ────────────────────────────────────────────────────+ auto* gc = new QWidget(this);+ auto* gcl = new QVBoxLayout(gc);+ gcl->setContentsMargins(12, 12, 12, 12);+ gcl->setSpacing(8);++ auto* gc_y = new QLineEdit(gc);+ gc_y->setPlaceholderText("Effect series y (the one we ask: 'is this caused by x?')");+ gc_y->setStyleSheet(input_ss());+ text_inputs_["sm_gc_y"] = gc_y;+ gcl->addWidget(build_input_row("y (Effect)", gc_y, gc));+ gcl->addWidget(add_sample_btn(gc_y, gc, 111,+ "200-pt synthetic effect series"));++ auto* gc_x = new QLineEdit(gc);+ gc_x->setPlaceholderText("Potential cause series x (same length as y)");+ gc_x->setStyleSheet(input_ss());+ text_inputs_["sm_gc_x"] = gc_x;+ gcl->addWidget(build_input_row("x (Potential Cause)", gc_x, gc));+ gcl->addWidget(add_sample_btn(gc_x, gc, 112,+ "200-pt synthetic candidate cause"));++ auto* gc_lag = new QSpinBox(gc);+ gc_lag->setRange(1, 20);+ gc_lag->setValue(4);+ gc_lag->setStyleSheet(spinbox_ss());+ int_inputs_["sm_gc_max_lag"] = gc_lag;+ gcl->addWidget(build_input_row("Max Lag to Test", gc_lag, gc));++ auto* gc_hint = new QLabel(+ "H₀: x does NOT Granger-cause y. p < 0.05 ⇒ x carries predictive information about y at that lag.",+ gc);+ gc_hint->setWordWrap(true);+ gc_hint->setStyleSheet(QString("color:%1; font-size:10px;").arg(ui::colors::TEXT_TERTIARY()));+ gcl->addWidget(gc_hint);++ auto* gc_run = make_run_button("TEST GRANGER CAUSALITY", gc);+ connect(gc_run, &QPushButton::clicked, this, [this]() {+ QJsonArray y, x;+ QString bad;+ if (!parse_doubles(text_inputs_["sm_gc_y"]->text(), y, &bad)) {+ display_error(QString("y: '%1' is not numeric.").arg(bad));+ return;+ }+ if (!parse_doubles(text_inputs_["sm_gc_x"]->text(), x, &bad)) {+ display_error(QString("x: '%1' is not numeric.").arg(bad));+ return;+ }+ if (y.size() < 30 || x.size() < 30) {+ display_error("Granger test needs at least 30 observations in both series.");+ return;+ }+ if (y.size() != x.size()) {+ display_error(QString("y (%1) and x (%2) must have the same length.")+ .arg(y.size()).arg(x.size()));+ return;+ }+ show_loading(QString("Testing Granger causality up to lag %1...")+ .arg(int_inputs_["sm_gc_max_lag"]->value()));+ QJsonObject params;+ params["y"] = y;+ params["x"] = x;+ params["max_lag"] = int_inputs_["sm_gc_max_lag"]->value();+ AIQuantLabService::instance().sm_granger_causality(params);+ });+ gcl->addWidget(gc_run);+ gcl->addStretch();+ tabs->addTab(gc, "Granger Causality");++ // ── Descriptive + Normality ──────────────────────────────────────────────+ auto* de = new QWidget(this);+ auto* del = new QVBoxLayout(de);+ del->setContentsMargins(12, 12, 12, 12);+ del->setSpacing(8);++ auto* de_vals = new QLineEdit(de);+ de_vals->setPlaceholderText("Numeric values (>= 8). Includes Jarque-Bera + Shapiro-Wilk normality tests.");+ de_vals->setStyleSheet(input_ss());+ text_inputs_["sm_de_values"] = de_vals;+ del->addWidget(build_input_row("Values", de_vals, de));+ del->addWidget(add_sample_btn(de_vals, de, 121,+ "200-pt synthetic series"));++ auto* de_run = make_run_button("DESCRIBE + TEST NORMALITY", de);+ connect(de_run, &QPushButton::clicked, this, [this]() {+ QJsonArray vals;+ QString bad;+ if (!parse_doubles(text_inputs_["sm_de_values"]->text(), vals, &bad)) {+ display_error(QString("Values: '%1' is not numeric.").arg(bad));+ return;+ }+ if (vals.size() < 8) {+ display_error(QString("Need at least 8 values; you provided %1.").arg(vals.size()));+ return;+ }+ show_loading(QString("Computing descriptive statistics + normality on %1 values...").arg(vals.size()));+ QJsonObject params;+ params["values"] = vals;+ AIQuantLabService::instance().sm_descriptive(params);+ });+ del->addWidget(de_run);+ del->addStretch();+ tabs->addTab(de, "Descriptive");++ vl->addWidget(tabs);++ auto* rc = new QWidget(w);+ results_layout_ = new QVBoxLayout(rc);+ results_layout_->setContentsMargins(0, 8, 0, 0);+ results_layout_->setSpacing(8);+ vl->addWidget(rc);++ return w;+}++// ── STATSMODELS: rich card-based display per command ────────────────────────++void QuantModulePanel::display_statsmodels_result(const QString& command, const QJsonObject& payload) {+ clear_results();++ if (!payload.value("success").toBool(false)) {+ const QString err = payload.value("error").toString("Unknown error");+ const QString kind = payload.value("error_kind").toString();+ const QString prefix = kind == "validation" ? "Input error: "+ : kind == "runtime" ? "Computation failed: "+ : "";+ display_error(prefix + err);+ return;+ }++ const QJsonObject d = payload.value("data").toObject();+ const QString accent = module_.color.name();++ // Header strip — same shape as gs_quant / functime+ QString header_text = command.toUpper();+ header_text.replace('_', ' ');+ if (d.contains("n_observations"))+ header_text += QString(" | %1 OBS").arg(d.value("n_observations").toInt());+ results_layout_->addWidget(gs_section_header(header_text, accent));++ // ── 1. CHECK STATUS ──────────────────────────────────────────────────────+ if (command == "check_status") {+ auto bool_card = [this](const QString& label, bool ok) {+ return gs_make_card(label, ok ? "AVAILABLE" : "MISSING", this,+ ok ? ui::colors::POSITIVE() : ui::colors::NEGATIVE());+ };+ QList<QWidget*> deps = {+ bool_card("STATSMODELS", d.value("statsmodels").toBool()),+ bool_card("SCIPY", d.value("scipy").toBool()),+ gs_make_card("BACKEND", d.value("backend").toString().toUpper(), this),+ gs_make_card("OPS", QString::number(d.value("ops_available").toArray().size()),+ this, ui::colors::INFO()),+ };+ results_layout_->addWidget(gs_card_row(deps, this));+ const auto ops = d.value("ops_available").toArray();+ QStringList names;+ for (const auto& v : ops) names << v.toString();+ auto* lbl = new QLabel(QString("Operations: %1").arg(names.join(", ")));+ lbl->setWordWrap(true);+ lbl->setStyleSheet(QString("color:%1; font-size:10px; font-family:'Courier New';"+ "padding:8px 10px; background:%2; border:1px solid %3;")+ .arg(ui::colors::TEXT_SECONDARY(), ui::colors::BG_SURFACE(),+ ui::colors::BORDER_DIM()));+ results_layout_->addWidget(lbl);+ status_label_->setText("Statsmodels backend ready");+ return;+ }++ // ── 2. OLS ───────────────────────────────────────────────────────────────+ if (command == "ols") {+ const double r2 = d.value("r_squared").toDouble();+ const double adj = d.value("adj_r_squared").toDouble();+ const double f_stat = d.value("f_statistic").toDouble();+ const double f_p = d.value("f_p_value").toDouble();+ const double dw = d.value("durbin_watson").toDouble();+ const double bp_p = d.value("breusch_pagan_p").toDouble();++ auto* hdr = new QLabel(QString("OLS | %1 OBS | %2 FEATURES%3")+ .arg(d.value("n_observations").toInt())+ .arg(d.value("n_features").toInt())+ .arg(d.value("has_constant").toBool() ? " + CONSTANT" : ""));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border:1px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(),+ ui::colors::BORDER_DIM()));+ results_layout_->addWidget(hdr);++ QList<QWidget*> fit = {+ gs_make_card("R²", gs_fmt_num(r2, 4), this,+ r2 >= 0.7 ? ui::colors::POSITIVE()+ : r2 >= 0.3 ? ui::colors::WARNING()+ : ui::colors::NEGATIVE()),+ gs_make_card("ADJ R²", gs_fmt_num(adj, 4), this),+ gs_make_card("F STATISTIC", gs_fmt_num(f_stat, 2), this),+ gs_make_card("F p-VALUE", gs_fmt_num(f_p, 4), this,+ f_p < 0.05 ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ };+ results_layout_->addWidget(gs_card_row(fit, this));++ QList<QWidget*> ic = {+ gs_make_card("AIC", gs_fmt_num(d.value("aic").toDouble(), 2), this),+ gs_make_card("BIC", gs_fmt_num(d.value("bic").toDouble(), 2), this),+ gs_make_card("LOG-LIK", gs_fmt_num(d.value("log_likelihood").toDouble(), 2), this),+ gs_make_card("RESID SE", gs_fmt_num(d.value("residual_std_error").toDouble(), 4), this),+ };+ results_layout_->addWidget(gs_card_row(ic, this));++ const QString dw_col = (dw >= 1.5 && dw <= 2.5) ? ui::colors::POSITIVE()+ : ui::colors::WARNING();+ QList<QWidget*> diag = {+ gs_make_card("DURBIN-WATSON", gs_fmt_num(dw, 3), this, dw_col),+ gs_make_card("AUTOCORR.", d.value("dw_interpretation").toString().toUpper(), this, dw_col),+ gs_make_card("BREUSCH-PAGAN p", gs_fmt_num(bp_p, 4), this),+ gs_make_card("HOMOSCEDASTIC", d.value("homoscedastic_5pct").toBool() ? "YES" : "NO", this,+ d.value("homoscedastic_5pct").toBool() ? ui::colors::POSITIVE()+ : ui::colors::WARNING()),+ };+ results_layout_->addWidget(gs_card_row(diag, this));++ // Coefficient table+ const QJsonArray coefs = d.value("coefficients").toArray();+ if (!coefs.isEmpty()) {+ auto* table = new QTableWidget(coefs.size(), 7, this);+ table->setHorizontalHeaderLabels({"Term", "Estimate", "Std. Error", "t", "p", "95% CI Lower", "95% CI Upper"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->setSelectionMode(QAbstractItemView::SingleSelection);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(coefs.size() * 26 + 40, 320));+ for (int i = 0; i < coefs.size(); ++i) {+ const auto c = coefs[i].toObject();+ table->setItem(i, 0, new QTableWidgetItem(c.value("name").toString()));+ auto* est = new QTableWidgetItem(QString::number(c.value("estimate").toDouble(), 'f', 4));+ est->setForeground(QColor(gs_pos_neg_color(c.value("estimate").toDouble())));+ est->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 1, est);+ auto add_num = [&](int col, double v, int dec, const QString& col_color = {}) {+ auto* it = new QTableWidgetItem(QString::number(v, 'f', dec));+ it->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ if (!col_color.isEmpty()) it->setForeground(QColor(col_color));+ table->setItem(i, col, it);+ };+ add_num(2, c.value("std_error").toDouble(), 4);+ add_num(3, c.value("t_stat").toDouble(), 3);+ const double pv = c.value("p_value").toDouble();+ add_num(4, pv, 4, c.value("significant_5pct").toBool() ? ui::colors::POSITIVE()+ : ui::colors::TEXT_TERTIARY());+ add_num(5, c.value("ci_lower").toDouble(), 4);+ add_num(6, c.value("ci_upper").toDouble(), 4);+ table->setRowHeight(i, 24);+ }+ results_layout_->addWidget(table);+ }++ status_label_->setText(QString("R²=%1 Adj=%2 F=%3 (p=%4)")+ .arg(r2, 0, 'f', 4).arg(adj, 0, 'f', 4)+ .arg(f_stat, 0, 'f', 2).arg(f_p, 0, 'g', 3));+ return;+ }++ // ── 3. ARIMA ─────────────────────────────────────────────────────────────+ if (command == "arima") {+ const QJsonArray order = d.value("order").toArray();+ const int p = order.size() > 0 ? order[0].toInt() : 0;+ const int d_ord = order.size() > 1 ? order[1].toInt() : 0;+ const int q = order.size() > 2 ? order[2].toInt() : 0;+ const int horizon = d.value("horizon").toInt();+ const double aic = d.value("aic").toDouble();+ const double bic = d.value("bic").toDouble();+ const double r2 = d.value("in_sample_r2").toDouble();+ const double lb_p = d.value("ljung_box_lag10_p").toDouble();+ const bool whitenoise = d.value("ljung_box_residuals_white_noise").toBool();+ const double last_actual = d.value("last_actual").toDouble();+ const double first_fc = d.value("first_forecast").toDouble();+ const double last_fc = d.value("last_forecast").toDouble();++ auto* hdr = new QLabel(QString("ARIMA(%1,%2,%3) | HORIZON %4 STEPS | %5 OBS")+ .arg(p).arg(d_ord).arg(q).arg(horizon)+ .arg(d.value("n_observations").toInt()));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border:1px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(),+ ui::colors::BORDER_DIM()));+ results_layout_->addWidget(hdr);++ QList<QWidget*> fit = {+ gs_make_card("AIC", gs_fmt_num(aic, 2), this),+ gs_make_card("BIC", gs_fmt_num(bic, 2), this),+ gs_make_card("HQIC", gs_fmt_num(d.value("hqic").toDouble(), 2), this),+ gs_make_card("IN-SAMPLE R²", gs_fmt_num(r2, 4), this,+ r2 >= 0.7 ? ui::colors::POSITIVE()+ : r2 >= 0.3 ? ui::colors::WARNING()+ : ui::colors::NEGATIVE()),+ };+ results_layout_->addWidget(gs_card_row(fit, this));++ QList<QWidget*> resid = {+ gs_make_card("LB(10) p-VALUE", gs_fmt_num(lb_p, 4), this,+ whitenoise ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ gs_make_card("RESID WHITE NOISE", whitenoise ? "YES" : "NO", this,+ whitenoise ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ gs_make_card("RESID MEAN", gs_fmt_num(d.value("residual_mean").toDouble(), 4), this),+ gs_make_card("RESID σ", gs_fmt_num(d.value("residual_std").toDouble(), 4), this),+ };+ results_layout_->addWidget(gs_card_row(resid, this));++ const double horizon_drift = last_fc - last_actual;+ QList<QWidget*> proj = {+ gs_make_card("LAST ACTUAL", gs_fmt_num(last_actual, 4), this),+ gs_make_card("FIRST FORECAST", gs_fmt_num(first_fc, 4), this,+ gs_pos_neg_color(first_fc - last_actual)),+ gs_make_card("LAST FORECAST", gs_fmt_num(last_fc, 4), this,+ gs_pos_neg_color(horizon_drift)),+ gs_make_card("HORIZON Δ", gs_fmt_num(horizon_drift, 4), this,+ gs_pos_neg_color(horizon_drift)),+ };+ results_layout_->addWidget(gs_card_row(proj, this));++ // Forecast table with 95% bands+ const QJsonArray forecast = d.value("forecast").toArray();+ if (!forecast.isEmpty()) {+ auto* table = new QTableWidget(forecast.size(), 4, this);+ table->setHorizontalHeaderLabels({"Step", "Lower 95%", "Point", "Upper 95%"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->setSelectionMode(QAbstractItemView::NoSelection);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(forecast.size() * 22 + 32, 280));+ for (int i = 0; i < forecast.size(); ++i) {+ const auto o = forecast[i].toObject();+ table->setItem(i, 0, new QTableWidgetItem(QString::number(o.value("step").toInt())));+ auto* lo = new QTableWidgetItem(QString::number(o.value("lower_95").toDouble(), 'f', 4));+ lo->setForeground(QColor(ui::colors::NEGATIVE()));+ lo->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 1, lo);+ auto* pt = new QTableWidgetItem(QString::number(o.value("point").toDouble(), 'f', 4));+ pt->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 2, pt);+ auto* up = new QTableWidgetItem(QString::number(o.value("upper_95").toDouble(), 'f', 4));+ up->setForeground(QColor(ui::colors::POSITIVE()));+ up->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, 3, up);+ table->setRowHeight(i, 22);+ }+ results_layout_->addWidget(table);+ }++ status_label_->setText(QString("ARIMA(%1,%2,%3) — AIC=%4 R²=%5 LB(10) p=%6")+ .arg(p).arg(d_ord).arg(q)+ .arg(aic, 0, 'f', 1).arg(r2, 0, 'f', 3).arg(lb_p, 0, 'f', 3));+ return;+ }++ // ── 4. STATIONARITY TESTS ────────────────────────────────────────────────+ if (command == "stationarity_tests") {+ const QString verdict = d.value("verdict").toString();+ const int d_ord = d.value("differencing_order").toInt();++ auto* hdr = new QLabel(QString("VERDICT: %1 | DIFFERENCING d = %2")+ .arg(verdict).arg(d_ord));+ const bool stationary = verdict.contains("STATIONARY") && !verdict.contains("NON-");+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(),+ stationary ? ui::colors::POSITIVE() : ui::colors::NEGATIVE()));+ results_layout_->addWidget(hdr);++ const QJsonObject adf = d.value("adf").toObject();+ const QJsonObject kp = d.value("kpss").toObject();++ // ADF row+ auto* adf_lbl = new QLabel("ADF (H₀: unit root → non-stationary)");+ adf_lbl->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; padding:4px 0 0 2px;")+ .arg(ui::colors::TEXT_TERTIARY()));+ results_layout_->addWidget(adf_lbl);+ QList<QWidget*> adf_row = {+ gs_make_card("STATISTIC", gs_fmt_num(adf.value("statistic").toDouble(), 4), this),+ gs_make_card("p-VALUE", gs_fmt_num(adf.value("p_value").toDouble(), 4), this,+ adf.value("stationary_5pct").toBool() ? ui::colors::POSITIVE()+ : ui::colors::WARNING()),+ gs_make_card("VERDICT @ 5%", adf.value("stationary_5pct").toBool() ? "STATIONARY"+ : "NON-STATIONARY",+ this, adf.value("stationary_5pct").toBool() ? ui::colors::POSITIVE()+ : ui::colors::NEGATIVE()),+ gs_make_card("LAGS USED", QString::number(adf.value("lags_used").toInt()), this),+ };+ results_layout_->addWidget(gs_card_row(adf_row, this));+ QList<QWidget*> adf_crit = {+ gs_make_card("ADF CRIT 1%", gs_fmt_num(adf.value("critical_1pct").toDouble(), 4), this),+ gs_make_card("ADF CRIT 5%", gs_fmt_num(adf.value("critical_5pct").toDouble(), 4), this),+ gs_make_card("ADF CRIT 10%", gs_fmt_num(adf.value("critical_10pct").toDouble(), 4), this),+ gs_make_card("REGRESSION", adf.value("regression").toString().toUpper(), this),+ };+ results_layout_->addWidget(gs_card_row(adf_crit, this));++ // KPSS row+ auto* kpss_lbl = new QLabel("KPSS (H₀: stationary)");+ kpss_lbl->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; padding:4px 0 0 2px;")+ .arg(ui::colors::TEXT_TERTIARY()));+ results_layout_->addWidget(kpss_lbl);+ QList<QWidget*> kp_row = {+ gs_make_card("STATISTIC", gs_fmt_num(kp.value("statistic").toDouble(), 4), this),+ gs_make_card("p-VALUE", gs_fmt_num(kp.value("p_value").toDouble(), 4), this,+ kp.value("stationary_5pct").toBool() ? ui::colors::POSITIVE()+ : ui::colors::WARNING()),+ gs_make_card("VERDICT @ 5%", kp.value("stationary_5pct").toBool() ? "STATIONARY"+ : "NON-STATIONARY",+ this, kp.value("stationary_5pct").toBool() ? ui::colors::POSITIVE()+ : ui::colors::NEGATIVE()),+ gs_make_card("LAGS USED", QString::number(kp.value("lags_used").toInt()), this),+ };+ results_layout_->addWidget(gs_card_row(kp_row, this));+ QList<QWidget*> kp_crit = {+ gs_make_card("KPSS CRIT 1%", gs_fmt_num(kp.value("critical_1pct").toDouble(), 4), this),+ gs_make_card("KPSS CRIT 5%", gs_fmt_num(kp.value("critical_5pct").toDouble(), 4), this),+ gs_make_card("KPSS CRIT 10%", gs_fmt_num(kp.value("critical_10pct").toDouble(), 4), this),+ gs_make_card("REGRESSION", kp.value("regression").toString().toUpper(), this),+ };+ results_layout_->addWidget(gs_card_row(kp_crit, this));++ status_label_->setText(verdict);+ return;+ }++ // ── 5. ACF / PACF ───────────────────────────────────────────────────────+ if (command == "acf_pacf") {+ const int p_sug = d.value("suggested_arima_p").toInt();+ const int q_sug = d.value("suggested_arima_q").toInt();+ const double band = d.value("significance_band_95pct").toDouble();++ auto* hdr = new QLabel(QString("LAGS %1 | SIGNIFICANCE BAND ±%2 | SUGGESTED ARIMA(p=%3, q=%4)")+ .arg(d.value("nlags").toInt())+ .arg(band, 0, 'f', 4).arg(p_sug).arg(q_sug));+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(), accent));+ results_layout_->addWidget(hdr);++ QList<QWidget*> sum = {+ gs_make_card("SIG. ACF LAGS", QString::number(d.value("n_significant_acf_lags").toInt()), this),+ gs_make_card("SIG. PACF LAGS", QString::number(d.value("n_significant_pacf_lags").toInt()), this),+ gs_make_card("SUGGESTED p", QString::number(p_sug), this, ui::colors::INFO()),+ gs_make_card("SUGGESTED q", QString::number(q_sug), this, ui::colors::INFO()),+ };+ results_layout_->addWidget(gs_card_row(sum, this));++ // Lag table+ const QJsonArray lags = d.value("lags").toArray();+ if (!lags.isEmpty()) {+ auto* table = new QTableWidget(lags.size(), 5, this);+ table->setHorizontalHeaderLabels({"Lag", "ACF", "ACF Sig.", "PACF", "PACF Sig."});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->setSelectionMode(QAbstractItemView::NoSelection);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(lags.size() * 22 + 32, 360));+ for (int i = 0; i < lags.size(); ++i) {+ const auto o = lags[i].toObject();+ table->setItem(i, 0, new QTableWidgetItem(QString::number(o.value("lag").toInt())));+ auto* a = new QTableWidgetItem(QString::number(o.value("acf").toDouble(), 'f', 4));+ a->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ a->setForeground(QColor(o.value("acf_significant").toBool() ? ui::colors::POSITIVE()+ : ui::colors::TEXT_PRIMARY()));+ table->setItem(i, 1, a);+ table->setItem(i, 2, new QTableWidgetItem(o.value("acf_significant").toBool() ? "✓" : "—"));+ auto* p = new QTableWidgetItem(QString::number(o.value("pacf").toDouble(), 'f', 4));+ p->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ p->setForeground(QColor(o.value("pacf_significant").toBool() ? ui::colors::POSITIVE()+ : ui::colors::TEXT_PRIMARY()));+ table->setItem(i, 3, p);+ table->setItem(i, 4, new QTableWidgetItem(o.value("pacf_significant").toBool() ? "✓" : "—"));+ table->setRowHeight(i, 22);+ }+ results_layout_->addWidget(table);+ }+ status_label_->setText(QString("Suggested ARIMA(p=%1, q=%2)").arg(p_sug).arg(q_sug));+ return;+ }++ // ── 6. GRANGER CAUSALITY ────────────────────────────────────────────────+ if (command == "granger_causality") {+ const bool any_causal = d.value("x_causes_y_at_any_lag").toBool();+ const QJsonArray causal_lags = d.value("causal_lags").toArray();++ auto* hdr = new QLabel(QString("MAX LAG TESTED: %1 | %2")+ .arg(d.value("max_lag").toInt())+ .arg(d.value("interpretation").toString()));+ hdr->setWordWrap(true);+ hdr->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Courier New'; font-weight:700;"+ "padding:8px 10px; background:%2; border-left:3px solid %3;")+ .arg(ui::colors::TEXT_PRIMARY(), ui::colors::BG_SURFACE(),+ any_causal ? ui::colors::POSITIVE() : ui::colors::TEXT_TERTIARY()));+ results_layout_->addWidget(hdr);++ QStringList causal_strs;+ for (const auto& v : causal_lags) causal_strs << QString::number(v.toInt());++ QList<QWidget*> sum = {+ gs_make_card("ANY CAUSAL LAG", any_causal ? "YES" : "NO", this,+ any_causal ? ui::colors::POSITIVE() : ui::colors::TEXT_PRIMARY()),+ gs_make_card("CAUSAL LAGS", causal_strs.isEmpty() ? "—" : causal_strs.join(", "), this,+ any_causal ? ui::colors::POSITIVE() : ui::colors::TEXT_TERTIARY()),+ gs_make_card("LAGS TESTED", QString::number(d.value("max_lag").toInt()), this),+ gs_make_card("OBS", QString::number(d.value("n_observations").toInt()), this),+ };+ results_layout_->addWidget(gs_card_row(sum, this));++ const QJsonArray tests = d.value("tests").toArray();+ if (!tests.isEmpty()) {+ auto* table = new QTableWidget(tests.size(), 6, this);+ table->setHorizontalHeaderLabels({"Lag", "F-stat", "F p-value", "χ² stat", "χ² p-value", "x ⇒ y @ 5%"});+ table->verticalHeader()->setVisible(false);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->setSelectionMode(QAbstractItemView::NoSelection);+ table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table->setStyleSheet(table_ss());+ table->setMaximumHeight(qMin(tests.size() * 26 + 32, 280));+ for (int i = 0; i < tests.size(); ++i) {+ const auto t = tests[i].toObject();+ const bool causal = t.value("x_causes_y_5pct").toBool();+ table->setItem(i, 0, new QTableWidgetItem(QString::number(t.value("lag").toInt())));+ auto add_num = [&](int col, double v, int dec) {+ auto* it = new QTableWidgetItem(QString::number(v, 'f', dec));+ it->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ table->setItem(i, col, it);+ };+ add_num(1, t.value("f_statistic").toDouble(), 3);+ auto* fp = new QTableWidgetItem(QString::number(t.value("f_p_value").toDouble(), 'g', 4));+ fp->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ fp->setForeground(QColor(causal ? ui::colors::POSITIVE() : ui::colors::TEXT_TERTIARY()));+ table->setItem(i, 2, fp);+ add_num(3, t.value("chi2_statistic").toDouble(), 3);+ auto* cp = new QTableWidgetItem(QString::number(t.value("chi2_p_value").toDouble(), 'g', 4));+ cp->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);+ cp->setForeground(QColor(causal ? ui::colors::POSITIVE() : ui::colors::TEXT_TERTIARY()));+ table->setItem(i, 4, cp);+ auto* yn = new QTableWidgetItem(causal ? "YES" : "NO");+ yn->setForeground(QColor(causal ? ui::colors::POSITIVE() : ui::colors::TEXT_TERTIARY()));+ yn->setTextAlignment(Qt::AlignCenter);+ table->setItem(i, 5, yn);+ table->setRowHeight(i, 24);+ }+ results_layout_->addWidget(table);+ }++ status_label_->setText(d.value("interpretation").toString());+ return;+ }++ // ── 7. DESCRIPTIVE + NORMALITY ───────────────────────────────────────────+ if (command == "descriptive") {+ QList<QWidget*> central = {+ gs_make_card("MEAN", gs_fmt_num(d.value("mean").toDouble(), 4), this),+ gs_make_card("MEDIAN", gs_fmt_num(d.value("median").toDouble(), 4), this),+ gs_make_card("STD DEV", gs_fmt_num(d.value("std").toDouble(), 4), this),+ gs_make_card("VARIANCE", gs_fmt_num(d.value("variance").toDouble(), 4), this),+ };+ results_layout_->addWidget(gs_card_row(central, this));++ QList<QWidget*> spread = {+ gs_make_card("MIN", gs_fmt_num(d.value("min").toDouble(), 4), this, ui::colors::NEGATIVE()),+ gs_make_card("MAX", gs_fmt_num(d.value("max").toDouble(), 4), this, ui::colors::POSITIVE()),+ gs_make_card("RANGE", gs_fmt_num(d.value("range").toDouble(), 4), this),+ gs_make_card("IQR", gs_fmt_num(d.value("iqr").toDouble(), 4), this),+ };+ results_layout_->addWidget(gs_card_row(spread, this));++ QList<QWidget*> qrt = {+ gs_make_card("p25", gs_fmt_num(d.value("p25").toDouble(), 4), this),+ gs_make_card("p50", gs_fmt_num(d.value("p50").toDouble(), 4), this),+ gs_make_card("p75", gs_fmt_num(d.value("p75").toDouble(), 4), this),+ gs_make_card("CV",+ d.value("coefficient_of_variation").isNull()+ ? QString("—")+ : gs_fmt_num(d.value("coefficient_of_variation").toDouble(), 4),+ this),+ };+ results_layout_->addWidget(gs_card_row(qrt, this));++ QList<QWidget*> shape = {+ gs_make_card("SKEWNESS", gs_fmt_num(d.value("skewness").toDouble(), 3), this,+ gs_pos_neg_color(d.value("skewness").toDouble())),+ gs_make_card("KURTOSIS (excess)", gs_fmt_num(d.value("kurtosis_excess").toDouble(), 3), this),+ gs_make_card("SUM", gs_fmt_num(d.value("sum").toDouble(), 2), this),+ gs_make_card("OBS", QString::number(d.value("n_observations").toInt()), this),+ };+ results_layout_->addWidget(gs_card_row(shape, this));++ // Normality+ auto* nh = new QLabel("NORMALITY (H₀: data is normally distributed; p > 0.05 ⇒ cannot reject normal)");+ nh->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; padding:4px 0 0 2px;")+ .arg(ui::colors::TEXT_TERTIARY()));+ results_layout_->addWidget(nh);++ const QJsonValue jb_normal = d.value("jarque_bera_normal_5pct");+ const QJsonValue sw_normal = d.value("shapiro_wilk_normal_5pct");+ QList<QWidget*> norm = {+ gs_make_card("JARQUE-BERA STAT", gs_fmt_num(d.value("jarque_bera_stat").toDouble(), 3), this),+ gs_make_card("JARQUE-BERA p", gs_fmt_num(d.value("jarque_bera_p").toDouble(), 4), this,+ jb_normal.isBool()+ ? (jb_normal.toBool() ? ui::colors::POSITIVE() : ui::colors::WARNING())+ : ui::colors::TEXT_PRIMARY()),+ gs_make_card("SHAPIRO-WILK p", gs_fmt_num(d.value("shapiro_wilk_p").toDouble(), 4), this,+ sw_normal.isBool()+ ? (sw_normal.toBool() ? ui::colors::POSITIVE() : ui::colors::WARNING())+ : ui::colors::TEXT_PRIMARY()),+ gs_make_card("NORMAL (BOTH)",+ (jb_normal.isBool() && sw_normal.isBool() &&+ jb_normal.toBool() && sw_normal.toBool())+ ? "YES" : "NO",+ this,+ (jb_normal.isBool() && sw_normal.isBool() &&+ jb_normal.toBool() && sw_normal.toBool())+ ? ui::colors::POSITIVE() : ui::colors::WARNING()),+ };+ results_layout_->addWidget(gs_card_row(norm, this));++ status_label_->setText(QString("μ=%1 σ=%2 n=%3 JB p=%4")+ .arg(d.value("mean").toDouble(), 0, 'f', 3)+ .arg(d.value("std").toDouble(), 0, 'f', 3)+ .arg(d.value("n_observations").toInt())+ .arg(d.value("jarque_bera_p").toDouble(), 0, 'f', 3));+ return;+ }++ // ── Fallback ─────────────────────────────────────────────────────────────+ display_result(d);+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Styles.h b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Styles.hnew file mode 100644index 000000000..881f70c25--- /dev/null+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel_Styles.h@@ -0,0 +1,102 @@+// src/screens/ai_quant_lab/QuantModulePanel_Styles.h+//+// Private header — included only by QuantModulePanel*.cpp translation units.+// Provides the shared style-sheet helpers that were originally file-static in+// QuantModulePanel.cpp. Each helper reads live theme tokens at call time, so+// it must be invoked at widget-creation time (not cached at startup).+#pragma once++#include "ui/theme/Theme.h"++#include <QString>++namespace fincept::screens::quant_styles {++inline QString input_ss() {+ return QString("QLineEdit,QTextEdit { background:%1; color:%2; border:1px solid %3;"+ "padding:4px 6px; border-radius:2px; }"+ "QLineEdit:focus,QTextEdit:focus { border-color:%4; }")+ .arg(ui::colors::BG_RAISED())+ .arg(ui::colors::TEXT_PRIMARY())+ .arg(ui::colors::BORDER_MED())+ .arg(ui::colors::BORDER_BRIGHT());+}++inline QString combo_ss() {+ return QString("QComboBox { background:%1; color:%2; border:1px solid %3;"+ "padding:3px 6px; border-radius:2px; }"+ "QComboBox:focus { border-color:%4; }"+ "QComboBox::drop-down { border:none; width:18px; }"+ "QComboBox QAbstractItemView { background:%1; color:%2;"+ "selection-background-color:%5; border:1px solid %3; }")+ .arg(ui::colors::BG_RAISED())+ .arg(ui::colors::TEXT_PRIMARY())+ .arg(ui::colors::BORDER_MED())+ .arg(ui::colors::BORDER_BRIGHT())+ .arg(ui::colors::BG_HOVER());+}++inline QString spinbox_ss() {+ return QString("QSpinBox,QDoubleSpinBox { background:%1; color:%2; border:1px solid %3;"+ "padding:4px 6px; border-radius:2px; }"+ "QSpinBox:focus,QDoubleSpinBox:focus { border-color:%4; }"+ "QSpinBox::up-button,QSpinBox::down-button,"+ "QDoubleSpinBox::up-button,QDoubleSpinBox::down-button { width:16px; }")+ .arg(ui::colors::BG_RAISED())+ .arg(ui::colors::TEXT_PRIMARY())+ .arg(ui::colors::BORDER_MED())+ .arg(ui::colors::BORDER_BRIGHT());+}++inline QString tab_ss(const QString& accent) {+ return QString("QTabWidget::pane { border:1px solid %1; background:%2; }"+ "QTabBar::tab { background:%3; color:%4; padding:6px 14px;"+ "border:1px solid %1; border-bottom:none; margin-right:1px; }"+ "QTabBar::tab:selected { background:%2; color:%5; font-weight:700;"+ "border-bottom:2px solid %5; }"+ "QTabBar::tab:hover { color:%4; background:%6; }")+ .arg(ui::colors::BORDER_DIM())+ .arg(ui::colors::BG_SURFACE())+ .arg(ui::colors::BG_RAISED())+ .arg(ui::colors::TEXT_SECONDARY())+ .arg(accent)+ .arg(ui::colors::BG_HOVER());+}++inline QString sub_tab_ss(const QString& accent) {+ return QString("QTabWidget::pane { border:none; background:%1; }"+ "QTabBar::tab { background:%2; color:%3; padding:5px 12px;"+ "border:1px solid %4; border-bottom:none; margin-right:1px; }"+ "QTabBar::tab:selected { background:%1; color:%5; font-weight:700; }"+ "QTabBar { background:%2; }")+ .arg(ui::colors::BG_SURFACE())+ .arg(ui::colors::BG_RAISED())+ .arg(ui::colors::TEXT_SECONDARY())+ .arg(ui::colors::BORDER_DIM())+ .arg(accent);+}++inline QString output_ss() {+ return QString("QTextEdit { background:%1; color:%2; border:1px solid %3; padding:8px; }")+ .arg(ui::colors::BG_RAISED())+ .arg(ui::colors::TEXT_PRIMARY())+ .arg(ui::colors::BORDER_DIM());+}++inline QString table_ss() {+ return QString("QTableWidget { background:%1; color:%2; border:1px solid %3;"+ "gridline-color:%3; alternate-background-color:%4; }"+ "QTableWidget::item { padding:3px 6px; }"+ "QHeaderView::section { background:%5; color:%6; font-weight:700;"+ "padding:4px 8px; border:none; border-bottom:1px solid %3; }"+ "QTableWidget::item:selected { background:%7; color:%2; }")+ .arg(ui::colors::BG_SURFACE())+ .arg(ui::colors::TEXT_PRIMARY())+ .arg(ui::colors::BORDER_DIM())+ .arg(ui::colors::ROW_ALT())+ .arg(ui::colors::BG_RAISED())+ .arg(ui::colors::TEXT_SECONDARY())+ .arg(ui::colors::BG_HOVER());+}++} // namespace fincept::screens::quant_stylesdiff --git a/fincept-qt/src/screens/alt_investments/AltInvestmentsScreen.cpp b/fincept-qt/src/screens/alt_investments/AltInvestmentsScreen.cppindex d901739b9..27b1bb56e 100644--- a/fincept-qt/src/screens/alt_investments/AltInvestmentsScreen.cpp+++ b/fincept-qt/src/screens/alt_investments/AltInvestmentsScreen.cpp@@ -509,7 +509,7 @@ QWidget* AltInvestmentsScreen::create_header() {tc->setSpacing(1);auto* title = new QLabel("ALTERNATIVE INVESTMENTS");title->setObjectName("altHeaderTitle");- auto* sub = new QLabel("27 ANALYZERS \xB7 10 ASSET CLASSES \xB7 CFA-LEVEL ANALYTICS");+ auto* sub = new QLabel("27 ANALYZERS \xB7 10 ASSET CLASSES \xB7 MULTI-ASSET ANALYTICS");sub->setObjectName("altHeaderSub");tc->addWidget(title);tc->addWidget(sub);diff --git a/fincept-qt/src/screens/auth/LockScreen.cpp b/fincept-qt/src/screens/auth/LockScreen.cppindex 38db12040..6422733e6 100644--- a/fincept-qt/src/screens/auth/LockScreen.cpp+++ b/fincept-qt/src/screens/auth/LockScreen.cpp@@ -514,11 +514,15 @@ void LockScreen::on_setup_submit() {const QString confirm = setup_confirm_input_->text();// Match check is UI-only — PinManager has no concept of a confirm field.+ // Clear BOTH fields on mismatch — leaving the original PIN sitting in+ // the masked first field is mild process-memory exposure (text() still+ // returns plaintext) and forces the user to re-type both anyway.if (pin != confirm) {setup_error_->setText("PINs do not match");setup_error_->show();+ setup_pin_input_->clear();setup_confirm_input_->clear();- setup_confirm_input_->setFocus();+ setup_pin_input_->setFocus();return;}diff --git a/fincept-qt/src/screens/backtesting/BacktestingScreen.cpp b/fincept-qt/src/screens/backtesting/BacktestingScreen.cppindex 0d6d8ad52..b5ddf7069 100644--- a/fincept-qt/src/screens/backtesting/BacktestingScreen.cpp+++ b/fincept-qt/src/screens/backtesting/BacktestingScreen.cpp@@ -157,6 +157,46 @@ void BacktestingScreen::build_ui() {// ── Top Bar: Provider tabs + Run button ──────────────────────────────────────+namespace {++// Every chip on the top bar (brand label, provider tabs, RUN, status) shares+// the same outer geometry. The global QSS in ThemeManager applies a default+// `padding` to every QPushButton — we override that here with explicit+// min-height / max-height / padding so all chips render at exactly the same+// box size regardless of widget type or selection state.+constexpr int kPillHeight = 24;+constexpr int kPillPadH = 10;++QString pill_qss(const QString& selector,+ const QString& fg,+ const QString& bg,+ const QString& border,+ int font_px,+ const QString& font_family,+ const QString& weight = "700") {+ // Subtract 2px (the 1px top + bottom border) from min/max-height so the+ // total outer box equals kPillHeight in Qt's stylesheet box model.+ return QString("%1 {"+ " color:%2; background:%3; border:1px solid %4;"+ " font-family:%5; font-size:%6px; font-weight:%7;"+ " padding:0 %8px;"+ " min-height:%9px; max-height:%9px;"+ "}")+ .arg(selector, fg, bg, border, font_family)+ .arg(font_px)+ .arg(weight)+ .arg(kPillPadH)+ .arg(kPillHeight - 2);+}++void apply_pill_geometry(QWidget* w) {+ w->setFixedHeight(kPillHeight);+ w->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);+ w->setContentsMargins(0, 0, 0, 0);+}++} // namespace+QWidget* BacktestingScreen::build_top_bar() {auto* bar = new QWidget(this);bar->setFixedHeight(34);@@ -167,14 +207,18 @@ QWidget* BacktestingScreen::build_top_bar() {hl->setContentsMargins(12, 0, 12, 0);hl->setSpacing(8);+ const QString font_family = ui::fonts::DATA_FAMILY;+ const int font_px = ui::fonts::TINY;++ // Brand chipauto* brand = new QLabel("BACKTESTING", bar);- brand->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700; font-family:%3;"- "padding:4px 12px; background:rgba(217,119,6,0.1);"- "border:1px solid %4;")- .arg(ui::colors::AMBER())- .arg(ui::fonts::TINY)- .arg(ui::fonts::DATA_FAMILY)- .arg(ui::colors::AMBER_DIM()));+ brand->setAlignment(Qt::AlignCenter);+ apply_pill_geometry(brand);+ brand->setStyleSheet(pill_qss("QLabel",+ ui::colors::AMBER(),+ "rgba(217,119,6,0.1)",+ ui::colors::AMBER_DIM(),+ font_px, font_family));hl->addWidget(brand);auto* div = new QWidget(bar);@@ -182,11 +226,13 @@ QWidget* BacktestingScreen::build_top_bar() {div->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM()));hl->addWidget(div);- // Provider tabs+ // Provider tabs — geometry pinned here, colour applied later in+ // update_provider_buttons() using the same pill_qss template.for (int i = 0; i < providers_.size(); ++i) {const auto& p = providers_[i];auto* btn = new QPushButton(p.display_name, bar);btn->setCursor(Qt::PointingHandCursor);+ apply_pill_geometry(btn);connect(btn, &QPushButton::clicked, this, [this, i]() { on_provider_changed(i); });hl->addWidget(btn);provider_buttons_.append(btn);@@ -194,34 +240,32 @@ QWidget* BacktestingScreen::build_top_bar() {hl->addStretch(1);- // Run button — accent amber style per DESIGN_SYSTEM 5.5+ // Run buttonrun_button_ = new QPushButton("RUN", bar);run_button_->setCursor(Qt::PointingHandCursor);+ apply_pill_geometry(run_button_);run_button_->setStyleSheet(- QString("QPushButton { background:rgba(217,119,6,0.1); color:%1; font-family:%2; font-size:%3px;"- "font-weight:700; border:1px solid %4; padding:0 12px;"- "letter-spacing:1px; }"- "QPushButton:hover { background:%1; color:%5; }"- "QPushButton:disabled { background:%6; color:%7; border-color:%8; }")- .arg(ui::colors::AMBER())- .arg(ui::fonts::DATA_FAMILY)- .arg(ui::fonts::SMALL)- .arg(ui::colors::AMBER_DIM())- .arg(ui::colors::BG_BASE())- .arg(ui::colors::BG_RAISED())- .arg(ui::colors::TEXT_DIM())- .arg(ui::colors::BORDER_DIM()));+ pill_qss("QPushButton",+ ui::colors::AMBER(),+ "rgba(217,119,6,0.1)",+ ui::colors::AMBER_DIM(),+ font_px, font_family) ++ QString("QPushButton:hover { background:%1; color:%2; }"+ "QPushButton:disabled { background:%3; color:%4; border-color:%5; }")+ .arg(ui::colors::AMBER(), ui::colors::BG_BASE(),+ ui::colors::BG_RAISED(), ui::colors::TEXT_DIM(), ui::colors::BORDER_DIM()));connect(run_button_, &QPushButton::clicked, this, &BacktestingScreen::on_run);hl->addWidget(run_button_);- // Status dot+ // Status chipstatus_dot_ = new QLabel("READY", bar);- status_dot_->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700; font-family:%3;"- "padding:3px 8px; background:rgba(22,163,74,0.08);"- "border:1px solid rgba(22,163,74,0.25);")- .arg(ui::colors::POSITIVE())- .arg(ui::fonts::TINY)- .arg(ui::fonts::DATA_FAMILY));+ status_dot_->setAlignment(Qt::AlignCenter);+ apply_pill_geometry(status_dot_);+ status_dot_->setStyleSheet(pill_qss("QLabel",+ ui::colors::POSITIVE(),+ "rgba(22,163,74,0.08)",+ "rgba(22,163,74,0.25)",+ font_px, font_family));hl->addWidget(status_dot_);return bar;@@ -1032,21 +1076,18 @@ void BacktestingScreen::on_provider_changed(int index) {void BacktestingScreen::update_provider_buttons() {for (int i = 0; i < provider_buttons_.size(); ++i) {const auto& p = providers_[i];- bool active = (i == active_provider_);+ const bool active = (i == active_provider_);+ const QString rgb = QString("%1,%2,%3").arg(p.color.red()).arg(p.color.green()).arg(p.color.blue());+ const QString fg = active ? p.color.name() : ui::colors::TEXT_TERTIARY();+ const QString bg = active ? QString("rgba(%1,0.12)").arg(rgb) : QString("transparent");+ const QString border = active ? QString("rgba(%1,0.3)").arg(rgb) : ui::colors::BORDER_DIM();+ const QString weight = active ? "700" : "400";++ // Same pill template as the brand / RUN / status chips so geometry is+ // identical regardless of selection state.provider_buttons_[i]->setStyleSheet(- QString("QPushButton { color:%1; font-size:%2px; font-family:%3;"- "padding:0 10px; border:1px solid %4;"- "background:%5; font-weight:%6; }"- "QPushButton:hover { background:rgba(%7,0.15); }")- .arg(active ? p.color.name() : ui::colors::TEXT_TERTIARY())- .arg(ui::fonts::TINY)- .arg(ui::fonts::DATA_FAMILY)- .arg(active ? QString("rgba(%1,%2,%3,0.3)").arg(p.color.red()).arg(p.color.green()).arg(p.color.blue())- : ui::colors::BORDER_DIM())- .arg(active ? QString("rgba(%1,%2,%3,0.12)").arg(p.color.red()).arg(p.color.green()).arg(p.color.blue())- : "transparent")- .arg(active ? "700" : "400")- .arg(QString("%1,%2,%3").arg(p.color.red()).arg(p.color.green()).arg(p.color.blue())));+ pill_qss("QPushButton", fg, bg, border, ui::fonts::TINY, ui::fonts::DATA_FAMILY, weight) ++ QString("QPushButton:hover { background:rgba(%1,0.15); }").arg(rgb));}}@@ -1558,14 +1599,23 @@ void BacktestingScreen::on_command_options_loaded(const QString& provider, constcombo->setCurrentIndex(0);};- repopulate(pos_sizing_combo_, options.value("position_sizing_methods").toArray());- repopulate(opt_objective_combo_, options.value("optimize_objectives").toArray());- repopulate(opt_method_combo_, options.value("optimize_methods").toArray());- repopulate(labels_type_combo_, options.value("label_types").toArray());- repopulate(splitter_type_combo_, options.value("splitter_types").toArray());- repopulate(signal_gen_combo_, options.value("signal_generators").toArray());- repopulate(ind_signal_mode_combo_, options.value("indicator_signal_modes").toArray());- repopulate(returns_type_combo_, options.value("returns_analysis_types").toArray());+ // Providers using json_response() emit camelCase keys; fincept_provider+ // uses raw json.dumps so its keys stay snake_case. Try camelCase first+ // (the dominant form across vectorbt/bt/backtestingpy/fasttrade/zipline),+ // then fall back to snake_case for fincept.+ auto pick = [&](const char* camel, const char* snake) -> QJsonArray {+ auto a = options.value(camel).toArray();+ return a.isEmpty() ? options.value(snake).toArray() : a;+ };++ repopulate(pos_sizing_combo_, pick("positionSizingMethods", "position_sizing_methods"));+ repopulate(opt_objective_combo_, pick("optimizeObjectives", "optimize_objectives"));+ repopulate(opt_method_combo_, pick("optimizeMethods", "optimize_methods"));+ repopulate(labels_type_combo_, pick("labelTypes", "label_types"));+ repopulate(splitter_type_combo_, pick("splitterTypes", "splitter_types"));+ repopulate(signal_gen_combo_, pick("signalGenerators", "signal_generators"));+ repopulate(ind_signal_mode_combo_, pick("indicatorSignalModes", "indicator_signal_modes"));+ repopulate(returns_type_combo_, pick("returnsAnalysisTypes", "returns_analysis_types"));LOG_INFO("Backtesting", QString("[%1] Command options loaded").arg(provider));}diff --git a/fincept-qt/src/screens/crypto_center/CryptoCenterScreen.cpp b/fincept-qt/src/screens/crypto_center/CryptoCenterScreen.cppindex 9911bb25e..c5d05689a 100644--- a/fincept-qt/src/screens/crypto_center/CryptoCenterScreen.cpp+++ b/fincept-qt/src/screens/crypto_center/CryptoCenterScreen.cpp@@ -3,9 +3,11 @@#include "core/logging/Logger.h"#include "screens/crypto_center/HoldingsBar.h"#include "screens/crypto_center/tabs/ActivityTab.h"-#include "screens/crypto_center/tabs/ComingSoonTab.h"#include "screens/crypto_center/tabs/HomeTab.h"+#include "screens/crypto_center/tabs/MarketsTab.h"+#include "screens/crypto_center/tabs/RoadmapTab.h"#include "screens/crypto_center/tabs/SettingsTab.h"+#include "screens/crypto_center/tabs/StakeTab.h"#include "screens/crypto_center/tabs/TradeTab.h"#include "services/wallet/WalletService.h"#include "ui/theme/Theme.h"@@ -197,27 +199,20 @@ void CryptoCenterScreen::build_connected_page() {activity_tab_ = new ActivityTab(tab_widget_);settings_tab_ = new SettingsTab(tab_widget_);- stake_tab_ = new ComingSoonTab(- QStringLiteral("STAKE"),- QStringLiteral("PHASE 3"),- tr("veFNCPT lock for 3 months – 4 years. Real-yield share of terminal "- "revenue and tier badges (bronze / silver / gold) gating premium "- "features across the terminal."),- tab_widget_);- markets_tab_ = new ComingSoonTab(- QStringLiteral("MARKETS"),- QStringLiteral("PHASE 4"),- tr("Internal prediction markets settling in $FNCPT — Fed rate moves, "- "CPI prints, S&P close, weather, crypto milestones. YES / NO order "- "book with on-chain settlement."),- tab_widget_);- roadmap_tab_ = new ComingSoonTab(- QStringLiteral("ROADMAP"),- QStringLiteral("PHASE 5"),- tr("Buyback & burn dashboard — live epoch buyback, cumulative burn, "- "supply chart, and treasury runway. Replaces the static roadmap "- "panel on HOME once Phase 5 ships."),- tab_widget_);+ // Phase 3 ships the real STAKE tab (veFNCPT lock + active locks + tier).+ // Until the fincept_lock Anchor program is deployed, the producers ship+ // mock data with `is_mock=true` and the panel pills read "DEMO".+ stake_tab_ = new StakeTab(tab_widget_);+ // Phase 4 §4.2: internal prediction markets. Ships in demo mode (curated+ // 3-market dataset) until `fincept.markets_endpoint` is configured and+ // the `fincept_market` Anchor program is deployed. The status pill on+ // MarketsListPanel reads "DEMO" until then.+ markets_tab_ = new MarketsTab(tab_widget_);+ // Phase 5 ships the real roadmap dashboard (buyback ticker, supply+ // chart, treasury card). Until the buyback worker is deployed, the+ // service publishes mock data with `is_mock=true` and the panel head+ // pills read "DEMO".+ roadmap_tab_ = new RoadmapTab(tab_widget_);tab_widget_->addTab(home_tab_, tr("HOME"));tab_widget_->addTab(trade_tab_, tr("TRADE"));@@ -227,6 +222,17 @@ void CryptoCenterScreen::build_connected_page() {tab_widget_->addTab(markets_tab_, tr("MARKETS"));tab_widget_->addTab(roadmap_tab_, tr("ROADMAP"));+ // Bridge HomeTab → TradeTab: clicking a row in the holdings table+ // pre-fills SwapPanel's FROM combo and switches the user to TRADE.+ // (Stage 2A.5.10.)+ connect(home_tab_, &HomeTab::select_token, this,+ [this](const QString& mint) {+ if (mint.isEmpty()) return;+ if (trade_tab_) trade_tab_->set_from_mint(mint);+ const int trade_idx = tab_widget_->indexOf(trade_tab_);+ if (trade_idx >= 0) tab_widget_->setCurrentIndex(trade_idx);+ });+root->addWidget(tab_widget_, 1);stack_->addWidget(connected_page_);}diff --git a/fincept-qt/src/screens/crypto_center/CryptoCenterScreen.h b/fincept-qt/src/screens/crypto_center/CryptoCenterScreen.hindex 372603ce4..a630c4300 100644--- a/fincept-qt/src/screens/crypto_center/CryptoCenterScreen.h+++ b/fincept-qt/src/screens/crypto_center/CryptoCenterScreen.h@@ -18,7 +18,9 @@ class HoldingsBar;class HomeTab;class TradeTab;class SettingsTab;-class ComingSoonTab;+class RoadmapTab;+class StakeTab;+class MarketsTab;/// Crypto Center — Obsidian-themed wallet hub.///@@ -75,9 +77,9 @@ class CryptoCenterScreen : public QWidget {TradeTab* trade_tab_ = nullptr;ActivityTab* activity_tab_ = nullptr;SettingsTab* settings_tab_ = nullptr;- ComingSoonTab* stake_tab_ = nullptr;- ComingSoonTab* markets_tab_ = nullptr;- ComingSoonTab* roadmap_tab_ = nullptr;+ StakeTab* stake_tab_ = nullptr; // Phase 3 — veFNCPT lock + tier+ MarketsTab* markets_tab_ = nullptr; // Phase 4 — internal prediction markets+ RoadmapTab* roadmap_tab_ = nullptr; // Phase 5 — buyback & burn dashboard};} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/crypto_center/panels/ActiveLocksPanel.cpp b/fincept-qt/src/screens/crypto_center/panels/ActiveLocksPanel.cppnew file mode 100644index 000000000..b60fdbdee--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/panels/ActiveLocksPanel.cpp@@ -0,0 +1,393 @@+#include "screens/crypto_center/panels/ActiveLocksPanel.h"++#include "core/logging/Logger.h"+#include "datahub/DataHub.h"+#include "services/wallet/StakingService.h"+#include "services/wallet/WalletService.h"+#include "services/wallet/WalletTypes.h"+#include "ui/theme/Theme.h"++#include <QAction>+#include <QDateTime>+#include <QFrame>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QHideEvent>+#include <QLabel>+#include <QLocale>+#include <QMenu>+#include <QShowEvent>+#include <QStyle>+#include <QTableWidget>+#include <QTableWidgetItem>+#include <QVBoxLayout>++#include <cmath>++namespace fincept::screens::panels {++namespace {++QString font_stack() {+ return QStringLiteral(+ "'Consolas','Cascadia Mono','JetBrains Mono','SF Mono',monospace");+}++double atomic_to_ui(const QString& raw, int decimals) {+ if (raw.isEmpty()) return 0.0;+ bool ok = false;+ const auto u = raw.toULongLong(&ok);+ if (!ok) return 0.0;+ return static_cast<double>(u) / std::pow(10.0, std::max(0, decimals));+}++QString format_token(double v, int dp = 2) {+ if (v <= 0.0) return QStringLiteral("0");+ return QLocale::system().toString(v, 'f', dp);+}++QString format_usdc(double v) {+ if (v <= 0.0) return QStringLiteral("$0");+ return QStringLiteral("$%1").arg(QLocale::system().toString(v, 'f', 0));+}++QString format_unlock_date(qint64 ts_ms) {+ if (ts_ms <= 0) return QStringLiteral("—");+ return QDateTime::fromMSecsSinceEpoch(ts_ms).toString(QStringLiteral("yyyy-MM-dd"));+}++QString format_duration(qint64 secs) {+ constexpr qint64 kMonth = 30LL * 24 * 60 * 60;+ constexpr qint64 kYear = 365LL * 24 * 60 * 60;+ if (secs >= kYear * 4) return QStringLiteral("4 yr");+ if (secs >= kYear * 2) return QStringLiteral("2 yr");+ if (secs >= kYear) return QStringLiteral("1 yr");+ if (secs >= kMonth * 6) return QStringLiteral("6 mo");+ if (secs >= kMonth * 3) return QStringLiteral("3 mo");+ // Off-grid (custom duration via on-chain extend) — show approx months.+ return QStringLiteral("%1 mo").arg(secs / kMonth);+}++bool position_is_expired(const fincept::wallet::LockPosition& p) {+ return p.unlock_ts > 0 && p.unlock_ts <= QDateTime::currentMSecsSinceEpoch();+}++} // namespace++ActiveLocksPanel::ActiveLocksPanel(QWidget* parent) : QWidget(parent) {+ setObjectName(QStringLiteral("activeLocksPanel"));+ build_ui();+ apply_theme();++ auto& svc = fincept::wallet::WalletService::instance();+ connect(&svc, &fincept::wallet::WalletService::wallet_connected, this,+ &ActiveLocksPanel::on_wallet_connected);+ connect(&svc, &fincept::wallet::WalletService::wallet_disconnected, this,+ &ActiveLocksPanel::on_wallet_disconnected);++ auto& hub = fincept::datahub::DataHub::instance();+ connect(&hub, &fincept::datahub::DataHub::topic_error, this,+ &ActiveLocksPanel::on_topic_error);++ if (svc.is_connected()) {+ on_wallet_connected(svc.current_pubkey(), svc.state().label);+ } else {+ on_wallet_disconnected();+ }+}++ActiveLocksPanel::~ActiveLocksPanel() = default;++void ActiveLocksPanel::build_ui() {+ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(0, 0, 0, 0);+ root->setSpacing(0);++ // Head+ auto* head = new QWidget(this);+ head->setObjectName(QStringLiteral("activeLocksHead"));+ head->setFixedHeight(34);+ auto* hl = new QHBoxLayout(head);+ hl->setContentsMargins(12, 0, 12, 0);+ hl->setSpacing(8);+ auto* title = new QLabel(QStringLiteral("ACTIVE LOCKS"), head);+ title->setObjectName(QStringLiteral("activeLocksTitle"));+ summary_label_ = new QLabel(QStringLiteral("0 positions · 0 veFNCPT"), head);+ summary_label_->setObjectName(QStringLiteral("activeLocksHeadCaption"));+ status_pill_ = new QLabel(QStringLiteral("LIVE"), head);+ status_pill_->setObjectName(QStringLiteral("activeLocksPill"));+ hl->addWidget(title);+ hl->addWidget(summary_label_);+ hl->addStretch();+ hl->addWidget(status_pill_);+ root->addWidget(head);++ // Body+ auto* body = new QWidget(this);+ body->setObjectName(QStringLiteral("activeLocksBody"));+ auto* bl = new QVBoxLayout(body);+ bl->setContentsMargins(0, 0, 0, 0);+ bl->setSpacing(0);++ table_ = new QTableWidget(body);+ table_->setObjectName(QStringLiteral("activeLocksTable"));+ table_->setColumnCount(5);+ table_->setHorizontalHeaderLabels({+ QStringLiteral("LOCKED"),+ QStringLiteral("DURATION"),+ QStringLiteral("UNLOCKS"),+ QStringLiteral("WEIGHT"),+ QStringLiteral("YIELD (LIFETIME)"),+ });+ table_->verticalHeader()->setVisible(false);+ table_->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ table_->horizontalHeader()->setHighlightSections(false);+ table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ table_->setSelectionMode(QAbstractItemView::SingleSelection);+ table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table_->setShowGrid(false);+ table_->setContextMenuPolicy(Qt::CustomContextMenu);+ connect(table_, &QTableWidget::customContextMenuRequested, this,+ &ActiveLocksPanel::on_row_context_menu);+ bl->addWidget(table_, 1);++ empty_state_ = new QLabel(+ tr("No active locks. Lock $FNCPT above to start earning yield."), body);+ empty_state_->setObjectName(QStringLiteral("activeLocksEmpty"));+ empty_state_->setAlignment(Qt::AlignCenter);+ empty_state_->setMinimumHeight(120);+ bl->addWidget(empty_state_);++ // Error strip+ error_strip_ = new QFrame(body);+ error_strip_->setObjectName(QStringLiteral("activeLocksErrorStrip"));+ auto* es_l = new QHBoxLayout(error_strip_);+ es_l->setContentsMargins(10, 6, 10, 6);+ es_l->setSpacing(8);+ auto* es_icon = new QLabel(QStringLiteral("!"), error_strip_);+ es_icon->setObjectName(QStringLiteral("activeLocksErrorIcon"));+ error_text_ = new QLabel(QString(), error_strip_);+ error_text_->setObjectName(QStringLiteral("activeLocksErrorText"));+ error_text_->setWordWrap(true);+ es_l->addWidget(es_icon);+ es_l->addWidget(error_text_, 1);+ error_strip_->hide();+ bl->addWidget(error_strip_);++ root->addWidget(body, 1);+}++void ActiveLocksPanel::apply_theme() {+ using namespace ui::colors;+ const QString font = font_stack();++ const QString ss = QStringLiteral(+ "QWidget#activeLocksPanel { background:%1; }"+ "QWidget#activeLocksHead { background:%2; border-bottom:1px solid %3; }"+ "QLabel#activeLocksTitle { color:%4; font-family:%5; font-size:11px;"+ " font-weight:700; letter-spacing:1.4px; background:transparent; }"+ "QLabel#activeLocksHeadCaption { color:%6; font-family:%5; font-size:10px;"+ " font-weight:600; letter-spacing:0.8px; background:transparent; }"+ "QLabel#activeLocksPill { color:%7; background:%8; border:1px solid %3;"+ " font-family:%5; font-size:9px; font-weight:700; letter-spacing:1.2px;"+ " padding:2px 8px; }"+ "QLabel#activeLocksPillDemo { color:%4; background:rgba(217,119,6,0.10);"+ " border:1px solid %12; font-family:%5; font-size:9px; font-weight:700;"+ " letter-spacing:1.2px; padding:2px 8px; }"+ "QWidget#activeLocksBody { background:%1; }"+ "QTableWidget#activeLocksTable { background:%1; color:%7; gridline-color:%3;"+ " border:none; selection-background-color:%10; selection-color:%7;"+ " font-family:%5; font-size:11px; }"+ "QTableWidget#activeLocksTable::item { padding:6px 10px; border-bottom:1px solid %3; }"+ "QHeaderView::section { background:%8; color:%6; padding:6px 10px;"+ " border:none; border-bottom:1px solid %3; font-family:%5;"+ " font-size:9px; font-weight:700; letter-spacing:1.4px; }"+ "QLabel#activeLocksEmpty { color:%6; font-family:%5; font-size:11px;"+ " background:transparent; }"+ "QFrame#activeLocksErrorStrip { background:rgba(220,38,38,0.10);"+ " border:1px solid %9; }"+ "QLabel#activeLocksErrorIcon { color:%9; font-family:%5; font-size:13px;"+ " font-weight:700; background:transparent; }"+ "QLabel#activeLocksErrorText { color:%9; font-family:%5; font-size:11px;"+ " background:transparent; }"+ )+ .arg(BG_BASE(), // %1+ BG_SURFACE(), // %2+ BORDER_DIM(), // %3+ AMBER(), // %4+ font, // %5+ TEXT_TERTIARY(), // %6+ TEXT_PRIMARY(), // %7+ BG_RAISED(), // %8+ NEGATIVE()) // %9+ .arg(BG_HOVER(), // %10+ BORDER_BRIGHT(), // %11+ QStringLiteral("#78350f")); // %12 darker amber+ setStyleSheet(ss);+}++// ── Lifecycle ──────────────────────────────────────────────────────────────++void ActiveLocksPanel::on_wallet_connected(const QString& pubkey,+ const QString& /*label*/) {+ current_pubkey_ = pubkey;+ if (isVisible() && current_topic_.isEmpty()) {+ current_topic_ = QStringLiteral("wallet:locks:%1").arg(pubkey);+ auto& hub = fincept::datahub::DataHub::instance();+ hub.subscribe(this, current_topic_,+ [this](const QVariant& v) { on_locks_update(v); });+ hub.request(current_topic_, /*force=*/false);+ }+}++void ActiveLocksPanel::on_wallet_disconnected() {+ fincept::datahub::DataHub::instance().unsubscribe(this);+ current_topic_.clear();+ current_pubkey_.clear();+ latest_.clear();+ rebuild_table();+}++void ActiveLocksPanel::showEvent(QShowEvent* e) {+ QWidget::showEvent(e);+ if (!current_pubkey_.isEmpty() && current_topic_.isEmpty()) {+ current_topic_ = QStringLiteral("wallet:locks:%1").arg(current_pubkey_);+ auto& hub = fincept::datahub::DataHub::instance();+ hub.subscribe(this, current_topic_,+ [this](const QVariant& v) { on_locks_update(v); });+ hub.request(current_topic_, /*force=*/false);+ }+}++void ActiveLocksPanel::hideEvent(QHideEvent* e) {+ QWidget::hideEvent(e);+ fincept::datahub::DataHub::instance().unsubscribe(this);+ current_topic_.clear();+}++// ── Updates ────────────────────────────────────────────────────────────────++void ActiveLocksPanel::on_locks_update(const QVariant& v) {+ if (!v.canConvert<QVector<fincept::wallet::LockPosition>>()) return;+ latest_ = v.value<QVector<fincept::wallet::LockPosition>>();+ rebuild_table();+}++void ActiveLocksPanel::on_topic_error(const QString& topic, const QString& error) {+ if (topic != current_topic_) return;+ show_error_strip(tr("Locks feed error: %1").arg(error));+}++void ActiveLocksPanel::rebuild_table() {+ if (latest_.isEmpty()) {+ table_->setRowCount(0);+ table_->hide();+ empty_state_->show();+ summary_label_->setText(QStringLiteral("0 positions · 0 veFNCPT"));+ update_demo_chip(false);+ return;+ }+ empty_state_->hide();+ table_->show();++ bool any_mock = false;+ double total_weight_ui = 0.0;+ double total_yield_ui = 0.0;++ table_->setRowCount(latest_.size() + 1); // +1 for the TOTAL row+ for (int i = 0; i < latest_.size(); ++i) {+ const auto& p = latest_[i];+ any_mock = any_mock || p.is_mock;+ const double amount_ui = atomic_to_ui(p.amount_raw, p.decimals);+ const double weight_ui = atomic_to_ui(p.weight_raw, p.decimals);+ total_weight_ui += weight_ui;+ total_yield_ui += p.lifetime_yield_usdc;++ auto* locked = new QTableWidgetItem(+ QStringLiteral("%1 $FNCPT").arg(format_token(amount_ui, 0)));+ locked->setData(Qt::UserRole, p.position_id);+ table_->setItem(i, 0, locked);+ table_->setItem(i, 1, new QTableWidgetItem(format_duration(p.duration_secs)));+ table_->setItem(i, 2, new QTableWidgetItem(format_unlock_date(p.unlock_ts)));+ table_->setItem(i, 3, new QTableWidgetItem(format_token(weight_ui, 1)));+ table_->setItem(i, 4, new QTableWidgetItem(format_usdc(p.lifetime_yield_usdc)));+ }++ // TOTAL row — visually distinct via item-level styling.+ const int total_row = latest_.size();+ auto* tot_label = new QTableWidgetItem(QStringLiteral("TOTAL"));+ tot_label->setData(Qt::UserRole, QString()); // no position id+ table_->setItem(total_row, 0, tot_label);+ table_->setItem(total_row, 1, new QTableWidgetItem(QStringLiteral("—")));+ table_->setItem(total_row, 2, new QTableWidgetItem(QStringLiteral("—")));+ table_->setItem(total_row, 3, new QTableWidgetItem(format_token(total_weight_ui, 1)));+ table_->setItem(total_row, 4, new QTableWidgetItem(format_usdc(total_yield_ui)));++ summary_label_->setText(QStringLiteral("%1 position%2 · %3 veFNCPT")+ .arg(latest_.size())+ .arg(latest_.size() == 1 ? QString() : QStringLiteral("s"))+ .arg(format_token(total_weight_ui, 1)));+ update_demo_chip(any_mock);+ clear_error_strip();+}++void ActiveLocksPanel::on_row_context_menu(const QPoint& pos) {+ auto* item = table_->itemAt(pos);+ if (!item) return;+ const int row = item->row();+ if (row < 0 || row >= latest_.size()) return; // ignore TOTAL row+ const auto& p = latest_[row];++ QMenu menu(this);+ auto* extend = menu.addAction(tr("Extend lock…"));+ auto* withdraw = menu.addAction(tr("Withdraw"));+ withdraw->setEnabled(position_is_expired(p));+ if (!withdraw->isEnabled()) {+ withdraw->setToolTip(tr("Available after %1")+ .arg(format_unlock_date(p.unlock_ts)));+ }++ // Mock-mode disable + tooltip for both. Real-mode lock txs come in+ // when the Anchor program ships.+ if (p.is_mock || !fincept::wallet::StakingService::instance().program_is_configured()) {+ extend->setEnabled(false);+ extend->setToolTip(tr("fincept_lock not deployed — Settings > Lock program ID"));+ withdraw->setEnabled(false);+ withdraw->setToolTip(tr("fincept_lock not deployed — Settings > Lock program ID"));+ }++ QAction* chosen = menu.exec(table_->viewport()->mapToGlobal(pos));+ if (!chosen) return;+ if (chosen == extend) {+ show_error_strip(tr("Extend flow lands with the Anchor program."));+ } else if (chosen == withdraw) {+ show_error_strip(tr("Withdraw flow lands with the Anchor program."));+ }+}++void ActiveLocksPanel::show_error_strip(const QString& msg) {+ if (!error_strip_) return;+ error_text_->setText(msg);+ error_strip_->show();+}++void ActiveLocksPanel::clear_error_strip() {+ if (error_strip_ && error_strip_->isVisible()) {+ error_strip_->hide();+ error_text_->clear();+ }+}++void ActiveLocksPanel::update_demo_chip(bool is_mock) {+ if (is_mock) {+ status_pill_->setText(QStringLiteral("DEMO"));+ status_pill_->setObjectName(QStringLiteral("activeLocksPillDemo"));+ } else {+ status_pill_->setText(QStringLiteral("LIVE"));+ status_pill_->setObjectName(QStringLiteral("activeLocksPill"));+ }+ status_pill_->style()->unpolish(status_pill_);+ status_pill_->style()->polish(status_pill_);+}++} // namespace fincept::screens::panelsdiff --git a/fincept-qt/src/screens/crypto_center/panels/ActiveLocksPanel.h b/fincept-qt/src/screens/crypto_center/panels/ActiveLocksPanel.hnew file mode 100644index 000000000..f3bfdfda6--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/panels/ActiveLocksPanel.h@@ -0,0 +1,77 @@+#pragma once++#include "services/wallet/WalletTypes.h"++#include <QString>+#include <QVariant>+#include <QVector>+#include <QWidget>++class QFrame;+class QHideEvent;+class QLabel;+class QShowEvent;+class QTableWidget;++namespace fincept::screens::panels {++/// ActiveLocksPanel — middle section of the STAKE tab (Phase 3 §3.2).+///+/// Renders the user's `LockPosition`s as a table with columns:+/// LOCKED · DURATION · UNLOCKS · WEIGHT · YIELD (LIFETIME)+/// plus a TOTAL row at the bottom.+///+/// Subscribes (visibility-driven, P3): `wallet:locks:<pubkey>`. Empty state+/// shows "No active locks" with a CTA pointing at LockPanel above.+///+/// Click an unexpired row → menu with Extend (Withdraw disabled with a+/// tooltip "available after <date>"). Click an expired row → Withdraw+/// enabled.+///+/// Mock-mode handling: when published `LockPosition::is_mock` is true, the+/// head pill reads "DEMO" and any Extend/Withdraw click shows a toast+/// "fincept_lock not deployed yet — see Settings" via the error strip.+class ActiveLocksPanel : public QWidget {+ Q_OBJECT+ public:+ explicit ActiveLocksPanel(QWidget* parent = nullptr);+ ~ActiveLocksPanel() override;++ protected:+ void showEvent(QShowEvent* e) override;+ void hideEvent(QHideEvent* e) override;++ private:+ void build_ui();+ void apply_theme();++ void on_wallet_connected(const QString& pubkey, const QString& label);+ void on_wallet_disconnected();+ void on_locks_update(const QVariant& v);+ void on_topic_error(const QString& topic, const QString& error);+ void on_row_context_menu(const QPoint& pos);++ void rebuild_table();+ void show_error_strip(const QString& msg);+ void clear_error_strip();+ void update_demo_chip(bool is_mock);++ // Head+ QLabel* summary_label_ = nullptr;+ QLabel* status_pill_ = nullptr;++ // Body+ QTableWidget* table_ = nullptr;+ QLabel* empty_state_ = nullptr;++ // Error strip+ QFrame* error_strip_ = nullptr;+ QLabel* error_text_ = nullptr;++ // State+ QString current_pubkey_;+ QString current_topic_;+ QVector<fincept::wallet::LockPosition> latest_;+};++} // namespace fincept::screens::panelsdiff --git a/fincept-qt/src/screens/crypto_center/panels/BuybackBurnPanel.cpp b/fincept-qt/src/screens/crypto_center/panels/BuybackBurnPanel.cppnew file mode 100644index 000000000..200c2ccbf--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/panels/BuybackBurnPanel.cpp@@ -0,0 +1,405 @@+#include "screens/crypto_center/panels/BuybackBurnPanel.h"++#include "core/logging/Logger.h"+#include "datahub/DataHub.h"+#include "services/wallet/WalletTypes.h"+#include "ui/theme/Theme.h"++#include <QDateTime>+#include <QDesktopServices>+#include <QFrame>+#include <QHBoxLayout>+#include <QHideEvent>+#include <QLabel>+#include <QLocale>+#include <QPushButton>+#include <QShowEvent>+#include <QStyle>+#include <QUrl>+#include <QVBoxLayout>++namespace fincept::screens::panels {++namespace {++constexpr const char* kTopicEpoch = "treasury:buyback_epoch";+constexpr const char* kTopicBurnTotal = "treasury:burn_total";++QString font_stack() {+ return QStringLiteral(+ "'Consolas','Cascadia Mono','JetBrains Mono','SF Mono',monospace");+}++QString format_usd(double v) {+ if (v <= 0.0) return QStringLiteral("$0");+ return QStringLiteral("$%1").arg(QLocale::system().toString(v, 'f', 0));+}++QString format_usd_precise(double v) {+ if (v <= 0.0) return QStringLiteral("$0.00");+ return QStringLiteral("$%1").arg(QLocale::system().toString(v, 'f', 2));+}++QString format_usd_micro(double v) {+ // Per-unit price for $FNCPT — needs many decimals.+ if (v <= 0.0) return QStringLiteral("—");+ return QStringLiteral("$%1").arg(QLocale::system().toString(v, 'f', 7));+}++/// Convert an integer-string atomic amount into a human-friendly count+/// like "82.4M" / "1.42B" given the token decimals.+QString format_token_compact(const QString& raw, int decimals) {+ if (raw.isEmpty()) return QStringLiteral("—");+ bool ok = false;+ const auto units = raw.toULongLong(&ok);+ if (!ok) return QStringLiteral("—");+ const double ui = static_cast<double>(units) /+ std::pow(10.0, std::max(0, decimals));+ if (ui <= 0.0) return QStringLiteral("0");+ if (ui >= 1e9) return QStringLiteral("%1 B")+ .arg(QLocale::system().toString(ui / 1e9, 'f', 2));+ if (ui >= 1e6) return QStringLiteral("%1 M")+ .arg(QLocale::system().toString(ui / 1e6, 'f', 1));+ if (ui >= 1e3) return QStringLiteral("%1 K")+ .arg(QLocale::system().toString(ui / 1e3, 'f', 1));+ return QLocale::system().toString(ui, 'f', 0);+}++QString format_window(qint64 start_ms, qint64 end_ms) {+ if (start_ms <= 0 || end_ms <= 0) return QStringLiteral("—");+ const auto fmt = QStringLiteral("yyyy-MM-dd");+ return QStringLiteral("%1 → %2")+ .arg(QDateTime::fromMSecsSinceEpoch(start_ms).toString(fmt))+ .arg(QDateTime::fromMSecsSinceEpoch(end_ms).toString(fmt));+}++QString truncate_signature(const QString& sig) {+ if (sig.size() <= 14) return sig;+ return sig.left(8) + QStringLiteral("…") + sig.right(4);+}++} // namespace++BuybackBurnPanel::BuybackBurnPanel(QWidget* parent) : QWidget(parent) {+ setObjectName(QStringLiteral("buybackBurnPanel"));+ build_ui();+ apply_theme();++ auto& hub = fincept::datahub::DataHub::instance();+ connect(&hub, &fincept::datahub::DataHub::topic_error, this,+ &BuybackBurnPanel::on_topic_error);+}++BuybackBurnPanel::~BuybackBurnPanel() = default;++void BuybackBurnPanel::build_ui() {+ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(0, 0, 0, 0);+ root->setSpacing(0);++ // Head+ auto* head = new QWidget(this);+ head->setObjectName(QStringLiteral("buybackBurnHead"));+ head->setFixedHeight(34);+ auto* hl = new QHBoxLayout(head);+ hl->setContentsMargins(12, 0, 12, 0);+ hl->setSpacing(8);+ title_ = new QLabel(QStringLiteral("BUYBACK & BURN"), head);+ title_->setObjectName(QStringLiteral("buybackBurnTitle"));+ epoch_window_ = new QLabel(QStringLiteral("epoch — · — → —"), head);+ epoch_window_->setObjectName(QStringLiteral("buybackBurnHeadCaption"));+ status_pill_ = new QLabel(QStringLiteral("LIVE"), head);+ status_pill_->setObjectName(QStringLiteral("buybackBurnPill"));+ hl->addWidget(title_);+ hl->addWidget(epoch_window_);+ hl->addStretch();+ hl->addWidget(status_pill_);+ root->addWidget(head);++ // Body+ auto* body = new QWidget(this);+ body->setObjectName(QStringLiteral("buybackBurnBody"));+ auto* bl = new QVBoxLayout(body);+ bl->setContentsMargins(14, 14, 14, 14);+ bl->setSpacing(12);++ auto add_kv = [&](QVBoxLayout* parent, const QString& cap, QLabel*& v_out,+ const QString& obj_name = {}) {+ auto* row = new QHBoxLayout;+ row->setSpacing(8);+ auto* k = new QLabel(cap, body);+ k->setObjectName(QStringLiteral("buybackBurnCaption"));+ v_out = new QLabel(QStringLiteral("—"), body);+ v_out->setObjectName(obj_name.isEmpty()+ ? QStringLiteral("buybackBurnValue") : obj_name);+ row->addWidget(k);+ row->addStretch(1);+ row->addWidget(v_out);+ parent->addLayout(row);+ };++ // THIS EPOCH section+ {+ auto* section_title = new QLabel(QStringLiteral("THIS EPOCH"), body);+ section_title->setObjectName(QStringLiteral("buybackBurnSectionTitle"));+ bl->addWidget(section_title);++ add_kv(bl, QStringLiteral("REVENUE"), revenue_total_,+ QStringLiteral("buybackBurnValueAmber"));+ revenue_split_ = new QLabel(QString(), body);+ revenue_split_->setObjectName(QStringLiteral("buybackBurnSubMeta"));+ bl->addWidget(revenue_split_);++ // The 50/25/25 split (plan §5.4) — show all three so the value loop+ // is visible end-to-end. The numbers come from the worker; the+ // panel just renders.+ add_kv(bl, QStringLiteral("BUYBACK (50%)"), buyback_usd_);+ add_kv(bl, QStringLiteral("STAKER YIELD (25%)"), staker_yield_usd_);+ add_kv(bl, QStringLiteral("TREASURY TOPUP (25%)"), treasury_topup_usd_);+ add_kv(bl, QStringLiteral("$FNCPT BOUGHT"), fncpt_bought_);+ add_kv(bl, QStringLiteral("$FNCPT BURNED"), fncpt_burned_,+ QStringLiteral("buybackBurnValueAmber"));++ // Burn signature row — clickable. Use a flat QPushButton so the+ // click is a real button activation (keyboard-accessible), not a+ // mouse-only event filter on a QLabel.+ auto* sig_row = new QHBoxLayout;+ sig_row->setSpacing(8);+ auto* sig_cap = new QLabel(QStringLiteral("BURN TX"), body);+ sig_cap->setObjectName(QStringLiteral("buybackBurnCaption"));+ burn_signature_link_ = new QPushButton(QStringLiteral("—"), body);+ burn_signature_link_->setObjectName(QStringLiteral("buybackBurnSig"));+ burn_signature_link_->setCursor(Qt::PointingHandCursor);+ burn_signature_link_->setFlat(true);+ burn_signature_link_->setToolTip(tr("Open burn transaction in Solscan"));+ connect(burn_signature_link_, &QPushButton::clicked, this,+ &BuybackBurnPanel::on_burn_signature_clicked);+ sig_row->addWidget(sig_cap);+ sig_row->addStretch(1);+ sig_row->addWidget(burn_signature_link_);+ bl->addLayout(sig_row);+ }++ // Separator+ auto* sep = new QFrame(body);+ sep->setObjectName(QStringLiteral("buybackBurnSeparator"));+ sep->setFrameShape(QFrame::HLine);+ sep->setFixedHeight(1);+ bl->addWidget(sep);++ // ALL-TIME section+ {+ auto* section_title = new QLabel(QStringLiteral("ALL-TIME"), body);+ section_title->setObjectName(QStringLiteral("buybackBurnSectionTitle"));+ bl->addWidget(section_title);++ add_kv(bl, QStringLiteral("BURNED"), total_burned_,+ QStringLiteral("buybackBurnValueAmber"));+ add_kv(bl, QStringLiteral("SUPPLY REMAINING"), supply_remaining_);+ add_kv(bl, QStringLiteral("SPENT ON BUYBACK"), spent_on_buyback_);+ }++ // Error strip+ error_strip_ = new QFrame(body);+ error_strip_->setObjectName(QStringLiteral("buybackBurnErrorStrip"));+ auto* es_l = new QHBoxLayout(error_strip_);+ es_l->setContentsMargins(10, 6, 10, 6);+ es_l->setSpacing(8);+ auto* es_icon = new QLabel(QStringLiteral("!"), error_strip_);+ es_icon->setObjectName(QStringLiteral("buybackBurnErrorIcon"));+ error_text_ = new QLabel(QString(), error_strip_);+ error_text_->setObjectName(QStringLiteral("buybackBurnErrorText"));+ error_text_->setWordWrap(true);+ es_l->addWidget(es_icon);+ es_l->addWidget(error_text_, 1);+ error_strip_->hide();+ bl->addWidget(error_strip_);++ bl->addStretch(1);+ root->addWidget(body, 1);+}++void BuybackBurnPanel::apply_theme() {+ using namespace ui::colors;+ const QString font = font_stack();++ const QString ss = QStringLiteral(+ "QWidget#buybackBurnPanel { background:%1; }"+ "QWidget#buybackBurnHead { background:%2; border-bottom:1px solid %3; }"+ "QLabel#buybackBurnTitle { color:%4; font-family:%5; font-size:11px;"+ " font-weight:700; letter-spacing:1.4px; background:transparent; }"+ "QLabel#buybackBurnHeadCaption { color:%6; font-family:%5; font-size:10px;"+ " font-weight:600; letter-spacing:0.8px; background:transparent; }"+ "QLabel#buybackBurnPill { color:%7; background:%8; border:1px solid %3;"+ " font-family:%5; font-size:9px; font-weight:700; letter-spacing:1.2px;"+ " padding:2px 8px; }"+ "QLabel#buybackBurnPillDemo { color:%4; background:rgba(217,119,6,0.10);"+ " border:1px solid %12; font-family:%5; font-size:9px; font-weight:700;"+ " letter-spacing:1.2px; padding:2px 8px; }"++ "QWidget#buybackBurnBody { background:%1; }"+ "QLabel#buybackBurnSectionTitle { color:%4; font-family:%5; font-size:10px;"+ " font-weight:700; letter-spacing:1.5px; background:transparent;"+ " padding:0; margin-top:4px; }"+ "QLabel#buybackBurnCaption { color:%6; font-family:%5; font-size:9px;"+ " font-weight:700; letter-spacing:1.2px; background:transparent; }"+ "QLabel#buybackBurnValue { color:%7; font-family:%5; font-size:12px;"+ " background:transparent; }"+ "QLabel#buybackBurnValueAmber { color:%4; font-family:%5; font-size:13px;"+ " font-weight:700; background:transparent; }"+ "QLabel#buybackBurnSubMeta { color:%6; font-family:%5; font-size:10px;"+ " background:transparent; }"+ "QPushButton#buybackBurnSig { color:%4; font-family:%5; font-size:11px;"+ " text-decoration:underline; background:transparent; border:none;"+ " padding:0; text-align:right; }"+ "QPushButton#buybackBurnSig:hover { color:%11; }"++ "QFrame#buybackBurnSeparator { color:%3; background:%3; }"++ "QFrame#buybackBurnErrorStrip { background:rgba(220,38,38,0.10);"+ " border:1px solid %9; }"+ "QLabel#buybackBurnErrorIcon { color:%9; font-family:%5; font-size:13px;"+ " font-weight:700; background:transparent; }"+ "QLabel#buybackBurnErrorText { color:%9; font-family:%5; font-size:11px;"+ " background:transparent; }"+ )+ .arg(BG_BASE(), // %1+ BG_SURFACE(), // %2+ BORDER_DIM(), // %3+ AMBER(), // %4+ font, // %5+ TEXT_TERTIARY(), // %6+ TEXT_PRIMARY(), // %7+ BG_RAISED(), // %8+ NEGATIVE()) // %9+ .arg(BG_HOVER(), // %10 (unused but reserved)+ BORDER_BRIGHT(), // %11+ QStringLiteral("#78350f")); // %12 darker amber++ setStyleSheet(ss);+}++// ── Lifecycle ──────────────────────────────────────────────────────────────++void BuybackBurnPanel::showEvent(QShowEvent* e) {+ QWidget::showEvent(e);+ auto& hub = fincept::datahub::DataHub::instance();+ hub.subscribe(this, QString::fromLatin1(kTopicEpoch),+ [this](const QVariant& v) { on_epoch_update(v); });+ hub.subscribe(this, QString::fromLatin1(kTopicBurnTotal),+ [this](const QVariant& v) { on_burn_total_update(v); });+ hub.request(QString::fromLatin1(kTopicEpoch), /*force=*/false);+ hub.request(QString::fromLatin1(kTopicBurnTotal), /*force=*/false);+}++void BuybackBurnPanel::hideEvent(QHideEvent* e) {+ QWidget::hideEvent(e);+ fincept::datahub::DataHub::instance().unsubscribe(this);+}++// ── Updates ────────────────────────────────────────────────────────────────++void BuybackBurnPanel::on_epoch_update(const QVariant& v) {+ if (!v.canConvert<fincept::wallet::BuybackEpoch>()) return;+ const auto e = v.value<fincept::wallet::BuybackEpoch>();+ epoch_is_mock_ = e.is_mock;+ update_demo_chip(epoch_is_mock_ || burn_total_is_mock_);++ epoch_window_->setText(QStringLiteral("epoch %1 · %2")+ .arg(e.epoch_no)+ .arg(format_window(e.start_ts_ms, e.end_ts_ms)));++ revenue_total_->setText(format_usd(e.revenue_total_usd));+ revenue_split_->setText(tr("subs %1 · pred-mkt %2 · misc %3")+ .arg(format_usd(e.revenue_subs_usd))+ .arg(format_usd(e.revenue_predmkt_usd))+ .arg(format_usd(e.revenue_misc_usd)));++ auto pct_of_revenue = [&](double v) {+ return (e.revenue_total_usd > 0.0)+ ? (100.0 * v / e.revenue_total_usd) : 0.0;+ };+ auto fmt_pct = [&](double v) {+ return QStringLiteral("%1 (%2%)")+ .arg(format_usd(v))+ .arg(QLocale::system().toString(pct_of_revenue(v), 'f', 0));+ };+ buyback_usd_->setText(fmt_pct(e.buyback_usd));+ staker_yield_usd_->setText(fmt_pct(e.staker_yield_usd));+ treasury_topup_usd_->setText(fmt_pct(e.treasury_topup_usd));++ fncpt_bought_->setText(QStringLiteral("%1 $FNCPT (avg %2)")+ .arg(format_token_compact(e.fncpt_bought_raw, e.fncpt_decimals))+ .arg(format_usd_micro(e.avg_buy_price_usd)));+ fncpt_burned_->setText(QStringLiteral("%1 $FNCPT")+ .arg(format_token_compact(e.fncpt_burned_raw, e.fncpt_decimals)));++ current_burn_signature_ = e.burn_signature;+ burn_signature_link_->setText(e.burn_signature.isEmpty()+ ? QStringLiteral("—")+ : truncate_signature(e.burn_signature));++ clear_error_strip();+}++void BuybackBurnPanel::on_burn_total_update(const QVariant& v) {+ if (!v.canConvert<fincept::wallet::BurnTotal>()) return;+ const auto t = v.value<fincept::wallet::BurnTotal>();+ burn_total_is_mock_ = t.is_mock;+ update_demo_chip(epoch_is_mock_ || burn_total_is_mock_);++ total_burned_->setText(QStringLiteral("%1 $FNCPT")+ .arg(format_token_compact(t.total_burned_raw, t.decimals)));+ supply_remaining_->setText(QStringLiteral("%1 $FNCPT")+ .arg(format_token_compact(t.supply_remaining_raw, t.decimals)));+ spent_on_buyback_->setText(format_usd_precise(t.spent_on_buyback_usd));+}++void BuybackBurnPanel::on_topic_error(const QString& topic, const QString& error) {+ if (topic != QLatin1String(kTopicEpoch)+ && topic != QLatin1String(kTopicBurnTotal)) {+ return;+ }+ show_error_strip(tr("Treasury feed error: %1").arg(error));+}++void BuybackBurnPanel::on_burn_signature_clicked() {+ if (current_burn_signature_.isEmpty()) return;+ if (current_burn_signature_.startsWith(QStringLiteral("FinceptTreasury"))+ || current_burn_signature_.contains(QStringLiteral("Mock"))) {+ // Mock signature — Solscan would 404. Skip the navigation and+ // give a tooltip cue.+ burn_signature_link_->setToolTip(+ tr("Demo signature — connect a treasury endpoint for a real burn tx."));+ return;+ }+ QDesktopServices::openUrl(QUrl(QStringLiteral("https://solscan.io/tx/") ++ current_burn_signature_));+}++void BuybackBurnPanel::show_error_strip(const QString& msg) {+ if (!error_strip_) return;+ error_text_->setText(msg);+ error_strip_->show();+}++void BuybackBurnPanel::clear_error_strip() {+ if (error_strip_ && error_strip_->isVisible()) {+ error_strip_->hide();+ error_text_->clear();+ }+}++void BuybackBurnPanel::update_demo_chip(bool any_mock) {+ if (any_mock) {+ status_pill_->setText(QStringLiteral("DEMO"));+ status_pill_->setObjectName(QStringLiteral("buybackBurnPillDemo"));+ } else {+ status_pill_->setText(QStringLiteral("LIVE"));+ status_pill_->setObjectName(QStringLiteral("buybackBurnPill"));+ }+ status_pill_->style()->unpolish(status_pill_);+ status_pill_->style()->polish(status_pill_);+}++} // namespace fincept::screens::panelsdiff --git a/fincept-qt/src/screens/crypto_center/panels/BuybackBurnPanel.h b/fincept-qt/src/screens/crypto_center/panels/BuybackBurnPanel.hnew file mode 100644index 000000000..e5d164ec9--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/panels/BuybackBurnPanel.h@@ -0,0 +1,80 @@+#pragma once++#include <QString>+#include <QVariant>+#include <QWidget>++class QHideEvent;+class QLabel;+class QPushButton;+class QShowEvent;++namespace fincept::screens::panels {++/// BuybackBurnPanel — top section of the ROADMAP tab (Phase 5 §5.2).+///+/// Renders THIS EPOCH (revenue split, buyback, $FNCPT bought, $FNCPT burned+/// with Solscan-clickable signature) and ALL-TIME (cumulative burn, supply+/// remaining, total spent on buyback).+///+/// Subscribes (visibility-driven, P3):+/// - `treasury:buyback_epoch` → current epoch summary+/// - `treasury:burn_total` → all-time totals+///+/// Both topics are terminal-wide (no <pubkey> segment) — the same numbers+/// are shown to every user. When data is mocked (the worker endpoint isn't+/// configured), the head status pill reads "DEMO" so the user knows.+class BuybackBurnPanel : public QWidget {+ Q_OBJECT+ public:+ explicit BuybackBurnPanel(QWidget* parent = nullptr);+ ~BuybackBurnPanel() override;++ protected:+ void showEvent(QShowEvent* e) override;+ void hideEvent(QHideEvent* e) override;++ private:+ void build_ui();+ void apply_theme();++ void on_epoch_update(const QVariant& v);+ void on_burn_total_update(const QVariant& v);+ void on_topic_error(const QString& topic, const QString& error);+ void on_burn_signature_clicked();++ void show_error_strip(const QString& msg);+ void clear_error_strip();+ void update_demo_chip(bool any_mock);++ // Head+ QLabel* title_ = nullptr;+ QLabel* status_pill_ = nullptr;++ // THIS EPOCH+ QLabel* epoch_window_ = nullptr;+ QLabel* revenue_total_ = nullptr;+ QLabel* revenue_split_ = nullptr;+ QLabel* buyback_usd_ = nullptr;+ QLabel* staker_yield_usd_ = nullptr;+ QLabel* treasury_topup_usd_ = nullptr;+ QLabel* fncpt_bought_ = nullptr;+ QLabel* fncpt_burned_ = nullptr;+ QPushButton* burn_signature_link_ = nullptr;++ // ALL-TIME+ QLabel* total_burned_ = nullptr;+ QLabel* supply_remaining_ = nullptr;+ QLabel* spent_on_buyback_ = nullptr;++ // Error strip+ QWidget* error_strip_ = nullptr;+ QLabel* error_text_ = nullptr;++ // State+ QString current_burn_signature_;+ bool epoch_is_mock_ = false;+ bool burn_total_is_mock_ = false;+};++} // namespace fincept::screens::panelsdiff --git a/fincept-qt/src/screens/crypto_center/panels/LockPanel.cpp b/fincept-qt/src/screens/crypto_center/panels/LockPanel.cppnew file mode 100644index 000000000..b9b19d77e--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/panels/LockPanel.cpp@@ -0,0 +1,646 @@+#include "screens/crypto_center/panels/LockPanel.h"++#include "core/logging/Logger.h"+#include "datahub/DataHub.h"+#include "screens/crypto_center/WalletActionConfirmDialog.h"+#include "screens/crypto_center/WalletActionSummary.h"+#include "services/billing/TierConfig.h"+#include "services/wallet/StakingService.h"+#include "services/wallet/WalletService.h"+#include "services/wallet/WalletTypes.h"+#include "ui/theme/Theme.h"++#include <QButtonGroup>+#include <QDoubleValidator>+#include <QFrame>+#include <QHBoxLayout>+#include <QHideEvent>+#include <QLabel>+#include <QLineEdit>+#include <QLocale>+#include <QPointer>+#include <QPushButton>+#include <QRadioButton>+#include <QShowEvent>+#include <QSignalBlocker>+#include <QStyle>+#include <QVBoxLayout>++#include <cmath>++namespace fincept::screens::panels {++namespace {++QString font_stack() {+ return QStringLiteral(+ "'Consolas','Cascadia Mono','JetBrains Mono','SF Mono',monospace");+}++QString format_token(double v, int dp = 0) {+ if (v <= 0.0) return QStringLiteral("0");+ return QLocale::system().toString(v, 'f', dp);+}++QString format_usd(double v, int dp = 0) {+ if (v <= 0.0) return QStringLiteral("$0");+ return QStringLiteral("$%1").arg(QLocale::system().toString(v, 'f', dp));+}++double atomic_to_ui(quint64 raw, int decimals) {+ return static_cast<double>(raw) / std::pow(10.0, std::max(0, decimals));+}++} // namespace++LockPanel::LockPanel(QWidget* parent) : QWidget(parent) {+ setObjectName(QStringLiteral("lockPanel"));+ build_ui();+ apply_theme();++ auto& svc = fincept::wallet::WalletService::instance();+ connect(&svc, &fincept::wallet::WalletService::wallet_connected, this,+ &LockPanel::on_wallet_connected);+ connect(&svc, &fincept::wallet::WalletService::wallet_disconnected, this,+ &LockPanel::on_wallet_disconnected);++ if (svc.is_connected()) {+ on_wallet_connected(svc.current_pubkey(), svc.state().label);+ } else {+ on_wallet_disconnected();+ }+}++LockPanel::~LockPanel() = default;++void LockPanel::build_ui() {+ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(0, 0, 0, 0);+ root->setSpacing(0);++ // Head+ auto* head = new QWidget(this);+ head->setObjectName(QStringLiteral("lockPanelHead"));+ head->setFixedHeight(34);+ auto* hl = new QHBoxLayout(head);+ hl->setContentsMargins(12, 0, 12, 0);+ hl->setSpacing(8);+ auto* title = new QLabel(QStringLiteral("STAKE / LOCK"), head);+ title->setObjectName(QStringLiteral("lockPanelTitle"));+ auto* subtitle = new QLabel(+ QStringLiteral("veFNCPT — locked $FNCPT earns USDC yield"), head);+ subtitle->setObjectName(QStringLiteral("lockPanelHeadCaption"));+ hl->addWidget(title);+ hl->addStretch();+ hl->addWidget(subtitle);+ root->addWidget(head);++ auto* body = new QWidget(this);+ body->setObjectName(QStringLiteral("lockPanelBody"));+ auto* bl = new QVBoxLayout(body);+ bl->setContentsMargins(14, 14, 14, 14);+ bl->setSpacing(10);++ // AMOUNT row+ {+ auto* row = new QHBoxLayout;+ row->setSpacing(6);+ auto* col_l = new QVBoxLayout;+ col_l->setSpacing(2);+ auto* cap = new QLabel(QStringLiteral("AMOUNT"), body);+ cap->setObjectName(QStringLiteral("lockPanelCaption"));+ col_l->addWidget(cap);+ amount_input_ = new QLineEdit(body);+ amount_input_->setObjectName(QStringLiteral("lockPanelInput"));+ amount_input_->setFixedHeight(34);+ amount_input_->setPlaceholderText(QStringLiteral("0"));+ auto* validator = new QDoubleValidator(0.0, 1e12, 6, this);+ validator->setNotation(QDoubleValidator::StandardNotation);+ amount_input_->setValidator(validator);+ col_l->addWidget(amount_input_);+ row->addLayout(col_l, 1);++ auto* col_t = new QVBoxLayout;+ col_t->setSpacing(2);+ auto* cap_t = new QLabel(QStringLiteral("TOKEN"), body);+ cap_t->setObjectName(QStringLiteral("lockPanelCaption"));+ col_t->addWidget(cap_t);+ auto* token_chip = new QLabel(QStringLiteral("$FNCPT"), body);+ token_chip->setObjectName(QStringLiteral("lockPanelTokenChip"));+ token_chip->setFixedHeight(34);+ token_chip->setAlignment(Qt::AlignCenter);+ token_chip->setMinimumWidth(80);+ col_t->addWidget(token_chip);+ row->addLayout(col_t);++ max_button_ = new QPushButton(tr("MAX"), body);+ max_button_->setObjectName(QStringLiteral("lockPanelButton"));+ max_button_->setFixedHeight(34);+ max_button_->setCursor(Qt::PointingHandCursor);+ row->addWidget(max_button_);+ bl->addLayout(row);++ available_label_ = new QLabel(tr("Available: —"), body);+ available_label_->setObjectName(QStringLiteral("lockPanelMeta"));+ bl->addWidget(available_label_);+ }++ // DURATION row+ {+ auto* cap = new QLabel(QStringLiteral("DURATION"), body);+ cap->setObjectName(QStringLiteral("lockPanelCaption"));+ bl->addWidget(cap);++ auto* dur_row = new QHBoxLayout;+ dur_row->setSpacing(6);+ duration_group_ = new QButtonGroup(this);+ auto add_dur = [this, body, dur_row](Duration d, QRadioButton*& slot,+ const QString& label) {+ slot = new QRadioButton(label, body);+ slot->setObjectName(QStringLiteral("lockPanelDurationRadio"));+ slot->setCursor(Qt::PointingHandCursor);+ duration_group_->addButton(slot, static_cast<int>(d));+ dur_row->addWidget(slot);+ };+ add_dur(Duration::ThreeMonths, dur_3mo_, QStringLiteral("3 MO"));+ add_dur(Duration::SixMonths, dur_6mo_, QStringLiteral("6 MO"));+ add_dur(Duration::OneYear, dur_1yr_, QStringLiteral("1 YR"));+ add_dur(Duration::TwoYears, dur_2yr_, QStringLiteral("2 YR"));+ add_dur(Duration::FourYears, dur_4yr_, QStringLiteral("4 YR"));+ dur_1yr_->setChecked(true);+ dur_row->addStretch(1);+ bl->addLayout(dur_row);+ }++ // Preview block+ {+ auto* preview = new QFrame(body);+ preview->setObjectName(QStringLiteral("lockPanelPreviewBlock"));+ auto* pl = new QVBoxLayout(preview);+ pl->setContentsMargins(10, 8, 10, 8);+ pl->setSpacing(6);++ auto add_kv = [preview, pl, body](const QString& k, QLabel*& v) {+ auto* row = new QHBoxLayout;+ row->setSpacing(8);+ auto* lbl = new QLabel(k, preview);+ lbl->setObjectName(QStringLiteral("lockPanelCaption"));+ v = new QLabel(QStringLiteral("—"), preview);+ v->setObjectName(QStringLiteral("lockPanelPreviewValue"));+ row->addWidget(lbl);+ row->addStretch(1);+ row->addWidget(v);+ pl->addLayout(row);+ };+ add_kv(QStringLiteral("WEIGHT"), weight_calc_);+ add_kv(QStringLiteral("EST. YIELD"), est_yield_);+ add_kv(QStringLiteral("TIER"), tier_preview_);+ bl->addWidget(preview);+ }++ // Error strip+ error_strip_ = new QFrame(body);+ error_strip_->setObjectName(QStringLiteral("lockPanelErrorStrip"));+ auto* es_l = new QHBoxLayout(error_strip_);+ es_l->setContentsMargins(10, 6, 10, 6);+ es_l->setSpacing(8);+ auto* es_icon = new QLabel(QStringLiteral("!"), error_strip_);+ es_icon->setObjectName(QStringLiteral("lockPanelErrorIcon"));+ error_text_ = new QLabel(QString(), error_strip_);+ error_text_->setObjectName(QStringLiteral("lockPanelErrorText"));+ error_text_->setWordWrap(true);+ es_l->addWidget(es_icon);+ es_l->addWidget(error_text_, 1);+ error_strip_->hide();+ bl->addWidget(error_strip_);++ // Submit row+ {+ auto* row = new QHBoxLayout;+ row->setSpacing(8);+ status_label_ = new QLabel(tr("Choose an amount and duration."), body);+ status_label_->setObjectName(QStringLiteral("lockPanelMeta"));+ lock_button_ = new QPushButton(tr("LOCK"), body);+ lock_button_->setObjectName(QStringLiteral("lockPanelPrimaryButton"));+ lock_button_->setFixedHeight(34);+ lock_button_->setCursor(Qt::PointingHandCursor);+ lock_button_->setEnabled(false);+ row->addWidget(status_label_, 1);+ row->addWidget(lock_button_);+ bl->addLayout(row);+ }++ bl->addStretch(1);+ root->addWidget(body, 1);++ connect(amount_input_, &QLineEdit::textEdited, this,+ &LockPanel::on_amount_changed);+ connect(duration_group_, QOverload<int>::of(&QButtonGroup::idClicked), this,+ &LockPanel::on_duration_changed);+ connect(max_button_, &QPushButton::clicked, this, &LockPanel::on_max_clicked);+ connect(lock_button_, &QPushButton::clicked, this, &LockPanel::on_lock_clicked);+}++void LockPanel::apply_theme() {+ using namespace ui::colors;+ const QString font = font_stack();++ const QString ss = QStringLiteral(+ "QWidget#lockPanel { background:%1; }"+ "QWidget#lockPanelHead { background:%2; border-bottom:1px solid %3; }"+ "QLabel#lockPanelTitle { color:%4; font-family:%5; font-size:11px;"+ " font-weight:700; letter-spacing:1.4px; background:transparent; }"+ "QLabel#lockPanelHeadCaption { color:%6; font-family:%5; font-size:10px;"+ " font-weight:600; letter-spacing:0.8px; background:transparent; }"+ "QWidget#lockPanelBody { background:%1; }"+ "QLabel#lockPanelCaption { color:%6; font-family:%5; font-size:9px;"+ " font-weight:700; letter-spacing:1.4px; background:transparent; }"+ "QLabel#lockPanelMeta { color:%6; font-family:%5; font-size:10px;"+ " background:transparent; }"+ "QLineEdit#lockPanelInput { background:%2; color:%7; border:1px solid %3;"+ " font-family:%5; font-size:16px; padding:0 8px; }"+ "QLineEdit#lockPanelInput:focus { border-color:%4; }"+ "QLabel#lockPanelTokenChip { background:%8; color:%4; border:1px solid %3;"+ " font-family:%5; font-size:13px; font-weight:700; letter-spacing:1.2px; }"++ "QRadioButton#lockPanelDurationRadio { color:%7; font-family:%5;"+ " font-size:11px; font-weight:700; letter-spacing:1px;"+ " background:transparent; padding:6px 10px; border:1px solid %3; }"+ "QRadioButton#lockPanelDurationRadio:checked { color:%4; border-color:%12;"+ " background:rgba(217,119,6,0.10); }"+ "QRadioButton#lockPanelDurationRadio::indicator { width:0; height:0; }"++ "QFrame#lockPanelPreviewBlock { background:%8; border:1px solid %3; }"+ "QLabel#lockPanelPreviewValue { color:%7; font-family:%5; font-size:11px;"+ " background:transparent; }"++ "QFrame#lockPanelErrorStrip { background:rgba(220,38,38,0.10);"+ " border:1px solid %9; }"+ "QLabel#lockPanelErrorIcon { color:%9; font-family:%5; font-size:13px;"+ " font-weight:700; background:transparent; }"+ "QLabel#lockPanelErrorText { color:%9; font-family:%5; font-size:11px;"+ " background:transparent; }"++ "QPushButton#lockPanelButton { background:%8; color:%6; border:1px solid %3;"+ " font-family:%5; font-size:11px; font-weight:700; letter-spacing:1px;"+ " padding:0 14px; }"+ "QPushButton#lockPanelButton:hover { background:%10; color:%7; border-color:%11; }"+ "QPushButton#lockPanelPrimaryButton { background:rgba(217,119,6,0.10); color:%4;"+ " border:1px solid %12; font-family:%5; font-size:12px; font-weight:700;"+ " letter-spacing:1.5px; padding:0 18px; }"+ "QPushButton#lockPanelPrimaryButton:hover { background:%4; color:%1; }"+ "QPushButton#lockPanelPrimaryButton:disabled { background:%8; color:%6;"+ " border-color:%3; }"+ )+ .arg(BG_BASE(), // %1+ BG_SURFACE(), // %2+ BORDER_DIM(), // %3+ AMBER(), // %4+ font, // %5+ TEXT_TERTIARY(), // %6+ TEXT_PRIMARY(), // %7+ BG_RAISED(), // %8+ NEGATIVE()) // %9+ .arg(BG_HOVER(), // %10+ BORDER_BRIGHT(), // %11+ QStringLiteral("#78350f")); // %12 darker amber+ setStyleSheet(ss);+}++// ── Lifecycle ──────────────────────────────────────────────────────────────++void LockPanel::on_wallet_connected(const QString& pubkey, const QString& /*label*/) {+ current_pubkey_ = pubkey;+ if (isVisible()) resubscribe();+ set_busy(false);+ recompute_preview();+}++void LockPanel::on_wallet_disconnected() {+ fincept::datahub::DataHub::instance().unsubscribe(this);+ current_balance_topic_.clear();+ current_vefncpt_topic_.clear();+ current_tier_topic_.clear();+ current_pubkey_.clear();+ fncpt_balance_ui_ = 0.0;+ current_user_weight_raw_ = 0;+ current_tier_ = fincept::wallet::TierStatus::Tier::Free;+ available_label_->setText(tr("Available: —"));+ status_label_->setText(tr("Connect a wallet to lock $FNCPT."));+ lock_button_->setEnabled(false);+ clear_error_strip();+}++void LockPanel::showEvent(QShowEvent* e) {+ QWidget::showEvent(e);+ resubscribe();+}++void LockPanel::hideEvent(QHideEvent* e) {+ QWidget::hideEvent(e);+ fincept::datahub::DataHub::instance().unsubscribe(this);+ current_balance_topic_.clear();+ current_vefncpt_topic_.clear();+ current_tier_topic_.clear();+}++void LockPanel::resubscribe() {+ auto& hub = fincept::datahub::DataHub::instance();+ hub.unsubscribe(this);+ current_balance_topic_.clear();+ current_vefncpt_topic_.clear();+ current_tier_topic_.clear();++ if (!current_pubkey_.isEmpty()) {+ current_balance_topic_ =+ QStringLiteral("wallet:balance:%1").arg(current_pubkey_);+ hub.subscribe(this, current_balance_topic_,+ [this](const QVariant& v) { on_balance_update(v); });+ hub.request(current_balance_topic_, /*force=*/false);++ current_vefncpt_topic_ =+ QStringLiteral("wallet:vefncpt:%1").arg(current_pubkey_);+ hub.subscribe(this, current_vefncpt_topic_,+ [this](const QVariant& v) { on_vefncpt_update(v); });+ hub.request(current_vefncpt_topic_, /*force=*/false);++ current_tier_topic_ =+ QStringLiteral("billing:tier:%1").arg(current_pubkey_);+ hub.subscribe(this, current_tier_topic_,+ [this](const QVariant& v) { on_tier_update(v); });+ hub.request(current_tier_topic_, /*force=*/false);+ }++ // Terminal-wide topics — same for all users.+ hub.subscribe(this, QStringLiteral("treasury:revenue"),+ [this](const QVariant& v) { on_revenue_update(v); });+ hub.request(QStringLiteral("treasury:revenue"), /*force=*/false);++ hub.subscribe(this, QStringLiteral("market:price:fncpt"),+ [this](const QVariant& v) { on_price_update(v); });+ hub.request(QStringLiteral("market:price:fncpt"), /*force=*/false);+}++// ── Hub callbacks ──────────────────────────────────────────────────────────++void LockPanel::on_balance_update(const QVariant& v) {+ if (!v.canConvert<fincept::wallet::WalletBalance>()) return;+ const auto bal = v.value<fincept::wallet::WalletBalance>();+ fncpt_balance_ui_ = bal.fncpt_ui();+ fncpt_decimals_ = bal.fncpt_decimals();+ available_label_->setText(tr("Available: %1 $FNCPT")+ .arg(format_token(fncpt_balance_ui_, 0)));+ recompute_preview();+}++void LockPanel::on_vefncpt_update(const QVariant& v) {+ if (!v.canConvert<fincept::wallet::VeFncptAggregate>()) return;+ const auto agg = v.value<fincept::wallet::VeFncptAggregate>();+ bool ok = false;+ current_user_weight_raw_ = agg.total_weight_raw.toULongLong(&ok);+ if (!ok) current_user_weight_raw_ = 0;+ recompute_preview();+}++void LockPanel::on_revenue_update(const QVariant& v) {+ if (!v.canConvert<fincept::wallet::TreasuryRevenue>()) return;+ weekly_revenue_usd_ = v.value<fincept::wallet::TreasuryRevenue>().total_usd;+ recompute_preview();+}++void LockPanel::on_price_update(const QVariant& v) {+ if (!v.canConvert<fincept::wallet::TokenPrice>()) return;+ const auto p = v.value<fincept::wallet::TokenPrice>();+ if (p.valid) fncpt_usd_price_ = p.usd;+ recompute_preview();+}++void LockPanel::on_tier_update(const QVariant& v) {+ if (!v.canConvert<fincept::wallet::TierStatus>()) return;+ current_tier_ = v.value<fincept::wallet::TierStatus>().tier;+ recompute_preview();+}++void LockPanel::on_amount_changed(const QString& /*s*/) {+ clear_error_strip();+ recompute_preview();+}++void LockPanel::on_duration_changed(int /*id*/) {+ recompute_preview();+}++void LockPanel::on_max_clicked() {+ if (fncpt_balance_ui_ <= 0.0) return;+ QSignalBlocker b(amount_input_);+ amount_input_->setText(format_token(fncpt_balance_ui_, 0));+ recompute_preview();+}++// ── Preview ────────────────────────────────────────────────────────────────++LockPanel::Duration LockPanel::current_duration() const {+ const int id = duration_group_->checkedId();+ return static_cast<Duration>(id);+}++void LockPanel::recompute_preview() {+ bool ok = false;+ const double amount_ui = QLocale::system().toDouble(amount_input_->text(), &ok);+ const Duration d = current_duration();+ const double mult = fincept::wallet::StakingService::multiplier_for(d);+ const QString dur_label = fincept::wallet::StakingService::label_for(d);++ if (!ok || amount_ui <= 0.0) {+ weight_calc_->setText(QStringLiteral("—"));+ est_yield_->setText(QStringLiteral("—"));+ tier_preview_->setText(QStringLiteral("—"));+ lock_button_->setEnabled(false);+ return;+ }++ // WEIGHT line: "1,000 veFNCPT × 0.25 (1 yr) = 250 veFNCPT"+ const double new_weight_ui = amount_ui * mult;+ weight_calc_->setText(QStringLiteral("%1 × %2 (%3) = %4 veFNCPT")+ .arg(format_token(amount_ui, 0))+ .arg(QString::number(mult, 'f', 4))+ .arg(dur_label)+ .arg(format_token(new_weight_ui, 1)));++ // EST. YIELD: project against the next epoch's distribution.+ // distribution_usdc = weekly_revenue_usd × 25 % (staker share, plan §3.4)+ // user_share = (current_weight + new_weight) / (current_weight + new_weight + global_other_weight)+ // We don't have the global weight published yet (would need a separate+ // topic from the program), so we model the conservative case+ // "user is the only locker" — projection ≤ this in any real scenario.+ constexpr double kStakerShare = 0.25;+ const double total_user_weight_after =+ atomic_to_ui(current_user_weight_raw_, fncpt_decimals_) + new_weight_ui;+ const double distribution = weekly_revenue_usd_ * kStakerShare;+ const double est_weekly = (total_user_weight_after > 0.0)+ ? distribution+ : 0.0;+ // Real-yield % expressed against the user's USD stake value at lock time.+ const double stake_usd = amount_ui * fncpt_usd_price_;+ const double pct_weekly = (stake_usd > 0.0)+ ? (100.0 * est_weekly / stake_usd) : 0.0;+ if (weekly_revenue_usd_ > 0.0 && fncpt_usd_price_ > 0.0) {+ est_yield_->setText(tr("%1 / week (USDC) — %2% weekly real yield at %3 stake")+ .arg(format_usd(est_weekly, 0))+ .arg(QString::number(pct_weekly, 'f', 2))+ .arg(format_usd(stake_usd, 0)));+ } else {+ est_yield_->setText(tr("waiting for revenue + spot price…"));+ }++ // TIER preview: current → tier-after-lock.+ const quint64 new_weight_raw =+ static_cast<quint64>(new_weight_ui * std::pow(10.0, fncpt_decimals_));+ const auto tier_after = fincept::billing::TierConfig::tier_from_weight(+ current_user_weight_raw_ + new_weight_raw);+ if (tier_after == current_tier_) {+ tier_preview_->setText(fincept::billing::TierConfig::label_for(current_tier_));+ } else {+ tier_preview_->setText(QStringLiteral("%1 → %2 (after lock)")+ .arg(fincept::billing::TierConfig::label_for(current_tier_))+ .arg(fincept::billing::TierConfig::label_for(tier_after)));+ }++ // Submit gating+ bool can_submit = !busy_+ && !current_pubkey_.isEmpty()+ && amount_ui > 0.0+ && amount_ui <= fncpt_balance_ui_;+ lock_button_->setEnabled(can_submit);+ if (!fincept::wallet::StakingService::instance().program_is_configured()) {+ status_label_->setText(+ tr("DEMO — fincept_lock not deployed; configure SecureStorage "+ "fincept.lock_program_id to enable real locks."));+ } else if (can_submit) {+ status_label_->setText(tr("Ready. Click LOCK to build the transaction."));+ } else if (amount_ui > fncpt_balance_ui_) {+ status_label_->setText(tr("Amount exceeds available $FNCPT."));+ } else {+ status_label_->setText(tr("Choose an amount and duration."));+ }+}++void LockPanel::show_error_strip(const QString& msg) {+ if (!error_strip_) return;+ error_text_->setText(msg);+ error_strip_->show();+}++void LockPanel::clear_error_strip() {+ if (error_strip_ && error_strip_->isVisible()) {+ error_strip_->hide();+ error_text_->clear();+ }+}++void LockPanel::set_busy(bool busy) {+ busy_ = busy;+ amount_input_->setEnabled(!busy);+ if (duration_group_) {+ for (auto* btn : duration_group_->buttons()) btn->setEnabled(!busy);+ }+ max_button_->setEnabled(!busy);+ lock_button_->setEnabled(!busy);+}++// ── Submit flow ────────────────────────────────────────────────────────────++void LockPanel::on_lock_clicked() {+ bool ok = false;+ const double amount_ui = QLocale::system().toDouble(amount_input_->text(), &ok);+ if (!ok || amount_ui <= 0.0) return;+ const Duration d = current_duration();++ // Build the atomic amount string for the program. Multiply at full+ // precision via integer math to avoid double-rounding.+ const auto power = std::pow(10.0, fncpt_decimals_);+ const QString amount_raw =+ QString::number(static_cast<quint64>(amount_ui * power));++ set_busy(true);+ clear_error_strip();+ status_label_->setText(tr("Building lock transaction…"));++ QPointer<LockPanel> self = this;+ fincept::wallet::StakingService::instance().build_lock_tx(+ current_pubkey_, amount_raw, d,+ [self, amount_ui, d](Result<QString> r) {+ if (!self) return;+ if (r.is_err()) {+ self->set_busy(false);+ self->show_error_strip(QString::fromStdString(r.error()));+ self->status_label_->setText(self->tr("Aborted."));+ return;+ }+ const QString tx_b64 = r.value();++ // Build the user-facing decoded summary. The wallet shows its own+ // decoded preview independently; this is the pre-sign sanity check.+ WalletActionSummary summary;+ summary.title = QStringLiteral("LOCK $FNCPT");+ summary.lede = self->tr(+ "Approve in your wallet to escrow $FNCPT under the fincept_lock "+ "program. The terminal does not hold your funds — the on-chain "+ "program does, and only releases them after the unlock date.");+ summary.rows.append({QStringLiteral("AMOUNT"),+ QStringLiteral("%1 $FNCPT").arg(format_token(amount_ui, 0)),+ true});+ summary.rows.append({QStringLiteral("DURATION"),+ fincept::wallet::StakingService::label_for(d), true});+ const double mult = fincept::wallet::StakingService::multiplier_for(d);+ summary.rows.append({QStringLiteral("WEIGHT"),+ QStringLiteral("%1 veFNCPT")+ .arg(format_token(amount_ui * mult, 1)),+ true});+ summary.warnings.append(self->tr(+ "Locked $FNCPT cannot be withdrawn before the unlock date. "+ "If you need liquidity sooner, do not lock."));+ summary.primary_button_text = QStringLiteral("LOCK");+ summary.primary_is_safe = false; // irreversible action — extra emphasis+ summary.arm_delay_ms = 2500;++ auto* dlg = new WalletActionConfirmDialog(summary, self);+ QObject::connect(dlg, &WalletActionConfirmDialog::confirmed, self,+ [self, tx_b64]() {+ if (!self) return;+ self->status_label_->setText(self->tr("Awaiting wallet signature…"));+ fincept::wallet::WalletService::instance().sign_and_send(+ tx_b64,+ QObject::tr("Sign lock"),+ QObject::tr("Approve the lock in your wallet."),+ self,+ [self](Result<QString> sr) {+ if (!self) return;+ if (sr.is_err()) {+ self->set_busy(false);+ self->show_error_strip(QObject::tr("Signing failed: %1")+ .arg(QString::fromStdString(sr.error())));+ self->status_label_->setText(QObject::tr("Cancelled."));+ return;+ }+ const auto sig = sr.value();+ LOG_INFO("LockPanel", "submitted: " + sig);+ self->status_label_->setText(+ QObject::tr("Sent: %1…").arg(sig.left(12)));+ self->set_busy(false);+ self->amount_input_->clear();+ fincept::wallet::WalletService::instance().force_balance_refresh();+ });+ });+ QObject::connect(dlg, &WalletActionConfirmDialog::cancelled, self,+ [self]() {+ if (!self) return;+ self->set_busy(false);+ self->status_label_->setText(self->tr("Cancelled."));+ });+ dlg->setAttribute(Qt::WA_DeleteOnClose);+ dlg->open();+ });+}++} // namespace fincept::screens::panelsdiff --git a/fincept-qt/src/screens/crypto_center/panels/LockPanel.h b/fincept-qt/src/screens/crypto_center/panels/LockPanel.hnew file mode 100644index 000000000..812e2b848--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/panels/LockPanel.h@@ -0,0 +1,120 @@+#pragma once++#include "services/wallet/StakingService.h"+#include "services/wallet/WalletTypes.h"++#include <QString>+#include <QVariant>+#include <QWidget>++class QButtonGroup;+class QFrame;+class QHideEvent;+class QLabel;+class QLineEdit;+class QPushButton;+class QRadioButton;+class QShowEvent;++namespace fincept::screens::panels {++/// LockPanel — top section of the STAKE tab (Phase 3 §3.2).+///+/// Plan ASCII spec:+/// AMOUNT [ 1,000 ] $FNCPT AVAILABLE 12,304+/// DURATION ◯ 3 MO ◯ 6 MO ● 1 YR ◯ 2 YR ◯ 4 YR+/// WEIGHT 1,000 veFNCPT × 0.25 (1 yr) = 250 veFNCPT+/// EST. YIELD $42 / week (USDC) — 2.18% weekly real yield at $341 stake+/// TIER Silver → Gold (after lock)+/// [PREVIEW LOCK] [LOCK]+///+/// Subscribes (visibility-driven, P3):+/// - `wallet:balance:<pubkey>` for AVAILABLE+/// - `wallet:vefncpt:<pubkey>` for current weight (tier preview)+/// - `treasury:revenue` for EST. YIELD (terminal-wide)+/// - `market:price:fncpt` for $FNCPT → USD conversion+/// - `billing:tier:<pubkey>` for current tier+///+/// LOCK click:+/// 1. Calls `StakingService::build_lock_tx(...)` — fails fast in mock mode.+/// 2. On success, opens `WalletActionConfirmDialog` with decoded summary.+/// 3. On confirm, forwards to `WalletService::sign_and_send`.+/// 4. Polls `getSignatureStatuses` until confirmed (reuses the SwapPanel+/// pattern; encapsulated in `start_status_poll`).+///+/// In mock mode the LOCK button is disabled with status "DEMO — fincept_lock+/// not deployed yet" and clicking it shows the explanation in the error strip.+class LockPanel : public QWidget {+ Q_OBJECT+ public:+ explicit LockPanel(QWidget* parent = nullptr);+ ~LockPanel() override;++ protected:+ void showEvent(QShowEvent* e) override;+ void hideEvent(QHideEvent* e) override;++ private:+ using Duration = fincept::wallet::StakingService::Duration;++ void build_ui();+ void apply_theme();++ void on_wallet_connected(const QString& pubkey, const QString& label);+ void on_wallet_disconnected();+ void on_balance_update(const QVariant& v);+ void on_vefncpt_update(const QVariant& v);+ void on_revenue_update(const QVariant& v);+ void on_price_update(const QVariant& v);+ void on_tier_update(const QVariant& v);+ void on_amount_changed(const QString& s);+ void on_duration_changed(int id);+ void on_max_clicked();+ void on_lock_clicked();++ void resubscribe();+ void recompute_preview();+ void show_error_strip(const QString& msg);+ void clear_error_strip();+ void set_busy(bool busy);++ /// Resolve the currently-selected duration from the radio group.+ Duration current_duration() const;++ // UI+ QLineEdit* amount_input_ = nullptr;+ QLabel* available_label_ = nullptr;+ QPushButton* max_button_ = nullptr;+ QButtonGroup* duration_group_ = nullptr;+ QRadioButton* dur_3mo_ = nullptr;+ QRadioButton* dur_6mo_ = nullptr;+ QRadioButton* dur_1yr_ = nullptr;+ QRadioButton* dur_2yr_ = nullptr;+ QRadioButton* dur_4yr_ = nullptr;++ QLabel* weight_calc_ = nullptr;+ QLabel* est_yield_ = nullptr;+ QLabel* tier_preview_ = nullptr;++ QFrame* error_strip_ = nullptr;+ QLabel* error_text_ = nullptr;+ QPushButton* lock_button_ = nullptr;+ QLabel* status_label_ = nullptr;++ // Hub state — last-seen values, used during preview math.+ QString current_pubkey_;+ QString current_balance_topic_;+ QString current_vefncpt_topic_;+ QString current_tier_topic_;+ double fncpt_balance_ui_ = 0.0;+ int fncpt_decimals_ = 6;+ double fncpt_usd_price_ = 0.0;+ double weekly_revenue_usd_ = 0.0;+ quint64 current_user_weight_raw_ = 0;+ fincept::wallet::TierStatus::Tier current_tier_ =+ fincept::wallet::TierStatus::Tier::Free;++ bool busy_ = false;+};++} // namespace fincept::screens::panelsdiff --git a/fincept-qt/src/screens/crypto_center/panels/MarketsListPanel.cpp b/fincept-qt/src/screens/crypto_center/panels/MarketsListPanel.cppnew file mode 100644index 000000000..27ad8af21--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/panels/MarketsListPanel.cpp@@ -0,0 +1,260 @@+#include "screens/crypto_center/panels/MarketsListPanel.h"++#include "core/logging/Logger.h"+#include "services/prediction/PredictionExchangeAdapter.h"+#include "services/prediction/PredictionExchangeRegistry.h"+#include "services/prediction/fincept_internal/FinceptInternalAdapter.h"+#include "ui/theme/Theme.h"++#include <QDateTime>+#include <QDesktopServices>+#include <QHBoxLayout>+#include <QHeaderView>+#include <QHideEvent>+#include <QLabel>+#include <QLocale>+#include <QShowEvent>+#include <QStyle>+#include <QTableWidget>+#include <QTableWidgetItem>+#include <QUrl>+#include <QVBoxLayout>+#include <QWidget>++namespace fincept::screens::panels {++namespace {++namespace pr = fincept::services::prediction;++QString font_stack() {+ return QStringLiteral(+ "'Consolas','Cascadia Mono','JetBrains Mono','SF Mono',monospace");+}++QString format_volume(double v) {+ if (v >= 1e9) return QStringLiteral("%1B").arg(QLocale::system().toString(v / 1e9, 'f', 1));+ if (v >= 1e6) return QStringLiteral("%1M").arg(QLocale::system().toString(v / 1e6, 'f', 1));+ if (v >= 1e3) return QStringLiteral("%1k").arg(QLocale::system().toString(v / 1e3, 'f', 0));+ return QLocale::system().toString(v, 'f', 0);+}++QString format_price(double p) {+ if (p < 0.0) p = 0.0;+ if (p > 1.0) p = 1.0;+ return QStringLiteral("%1").arg(QLocale::system().toString(p, 'f', 2));+}++pr::fincept_internal::FinceptInternalAdapter* fincept_adapter() {+ auto* base = pr::PredictionExchangeRegistry::instance().adapter(+ QStringLiteral("fincept"));+ return dynamic_cast<pr::fincept_internal::FinceptInternalAdapter*>(base);+}++} // namespace++MarketsListPanel::MarketsListPanel(QWidget* parent) : QWidget(parent) {+ setObjectName(QStringLiteral("marketsListPanel"));+ build_ui();+ apply_theme();+}++MarketsListPanel::~MarketsListPanel() = default;++// ── Layout ─────────────────────────────────────────────────────────────────++void MarketsListPanel::build_ui() {+ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(0, 0, 0, 0);+ root->setSpacing(0);++ auto* head = new QWidget(this);+ head->setObjectName(QStringLiteral("marketsListHead"));+ head->setFixedHeight(34);+ auto* hl = new QHBoxLayout(head);+ hl->setContentsMargins(12, 0, 12, 0);+ hl->setSpacing(0);++ title_ = new QLabel(QStringLiteral("MARKETS"), head);+ title_->setObjectName(QStringLiteral("marketsListTitle"));+ status_pill_ = new QLabel(QStringLiteral("DEMO"), head);+ status_pill_->setObjectName(QStringLiteral("marketsListStatusDemo"));++ hl->addWidget(title_);+ hl->addStretch();+ hl->addWidget(status_pill_);+ root->addWidget(head);++ table_ = new QTableWidget(this);+ table_->setObjectName(QStringLiteral("marketsListTable"));+ table_->setColumnCount(5);+ table_->setHorizontalHeaderLabels({+ tr("MARKET"), tr("YES"), tr("NO"), tr("24h VOL"), tr("EXPIRES")+ });+ table_->verticalHeader()->setVisible(false);+ table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ table_->setSelectionMode(QAbstractItemView::SingleSelection);+ table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table_->setAlternatingRowColors(false);+ table_->setShowGrid(false);+ table_->setMinimumHeight(220);++ auto* h = table_->horizontalHeader();+ h->setSectionResizeMode(0, QHeaderView::Stretch);+ for (int i = 1; i <= 4; ++i) {+ h->setSectionResizeMode(i, QHeaderView::ResizeToContents);+ }++ connect(table_, &QTableWidget::cellDoubleClicked, this,+ &MarketsListPanel::on_row_double_clicked);++ root->addWidget(table_, 1);++ footer_note_ = new QLabel(this);+ footer_note_->setObjectName(QStringLiteral("marketsListFooter"));+ footer_note_->setWordWrap(true);+ footer_note_->setContentsMargins(12, 8, 12, 12);+ footer_note_->setText(tr(+ "Demo dataset. Set `fincept.markets_endpoint` in SecureStorage and "+ "deploy the fincept_market Anchor program for live trading."));+ root->addWidget(footer_note_);+}++void MarketsListPanel::apply_theme() {+ using namespace ui::colors;+ const QString font = font_stack();++ const QString ss = QStringLiteral(+ "QWidget#marketsListPanel { background:%1; }"+ "QWidget#marketsListHead { background:%2; border-bottom:1px solid %3; }"+ "QLabel#marketsListTitle { color:%4; font-family:%5; font-size:11px;"+ " font-weight:700; letter-spacing:1.2px; background:transparent; }"+ "QLabel#marketsListStatusLive { color:%6; font-family:%5; font-size:10px;"+ " font-weight:700; letter-spacing:1.2px; background:transparent; }"+ "QLabel#marketsListStatusDemo { color:%7; font-family:%5; font-size:10px;"+ " font-weight:700; letter-spacing:1.2px; background:transparent; }"+ "QLabel#marketsListStatusError { color:%8; font-family:%5; font-size:10px;"+ " font-weight:700; letter-spacing:1.2px; background:transparent; }"+ "QTableWidget#marketsListTable { background:%1; color:%9;"+ " font-family:%5; font-size:11px; gridline-color:%3; border:none; }"+ "QTableWidget#marketsListTable::item { padding:6px 10px; }"+ "QTableWidget#marketsListTable::item:selected { background:rgba(217,119,6,0.10);"+ " color:%4; }"+ "QHeaderView::section { background:%2; color:%7; font-family:%5;"+ " font-size:10px; font-weight:700; letter-spacing:1.2px; padding:6px 10px;"+ " border:none; border-bottom:1px solid %3; }"+ "QLabel#marketsListFooter { color:%7; font-family:%5; font-size:10px;"+ " background:transparent; }"+ )+ .arg(BG_BASE(), // %1+ BG_SURFACE(), // %2 (panel chrome bg lives outside; this matches table header)+ BORDER_DIM(), // %3+ AMBER(), // %4+ font, // %5+ POSITIVE(), // %6+ TEXT_TERTIARY(), // %7+ NEGATIVE(), // %8+ TEXT_PRIMARY()); // %9++ setStyleSheet(ss);+}++// ── Lifecycle ──────────────────────────────────────────────────────────────++void MarketsListPanel::showEvent(QShowEvent* e) {+ QWidget::showEvent(e);+ if (subscribed_) return;+ auto* adapter = fincept_adapter();+ if (!adapter) {+ set_status_error(tr("FinceptInternalAdapter not registered"));+ return;+ }+ set_status_demo(adapter->is_demo_mode());+ connect(adapter,+ &fincept::services::prediction::PredictionExchangeAdapter::markets_ready,+ this, &MarketsListPanel::on_markets_ready);+ connect(adapter,+ &fincept::services::prediction::PredictionExchangeAdapter::error_occurred,+ this, &MarketsListPanel::on_error);+ subscribed_ = true;+ adapter->list_markets({}, {}, /*limit=*/50, /*offset=*/0);+}++void MarketsListPanel::hideEvent(QHideEvent* e) {+ QWidget::hideEvent(e);+ if (!subscribed_) return;+ auto* adapter = fincept_adapter();+ if (adapter) {+ disconnect(adapter, nullptr, this, nullptr);+ }+ subscribed_ = false;+}++// ── Adapter callbacks ──────────────────────────────────────────────────────++void MarketsListPanel::on_markets_ready(+ const QVector<pr::PredictionMarket>& markets) {+ rebuild_table(markets);+}++void MarketsListPanel::on_error(const QString& context, const QString& message) {+ Q_UNUSED(context);+ set_status_error(message);+}++void MarketsListPanel::on_row_double_clicked(int row, int /*column*/) {+ auto* item = table_->item(row, 0);+ if (!item) return;+ const auto data = item->data(Qt::UserRole).toString();+ if (data.isEmpty()) return;+ LOG_INFO("MarketsListPanel",+ QString("market double-clicked: %1").arg(data));+ // The order-entry panel is part of Phase 4 polish — wired via a+ // signal in the next iteration. For now, surface the click via the+ // log so the seam is testable.+}++// ── Rendering ──────────────────────────────────────────────────────────────++void MarketsListPanel::set_status_demo(bool demo) {+ if (demo) {+ status_pill_->setText(QStringLiteral("DEMO"));+ status_pill_->setObjectName(QStringLiteral("marketsListStatusDemo"));+ } else {+ status_pill_->setText(QStringLiteral("● LIVE"));+ status_pill_->setObjectName(QStringLiteral("marketsListStatusLive"));+ }+ status_pill_->style()->unpolish(status_pill_);+ status_pill_->style()->polish(status_pill_);+}++void MarketsListPanel::set_status_error(const QString& message) {+ status_pill_->setText(QStringLiteral("ERROR"));+ status_pill_->setObjectName(QStringLiteral("marketsListStatusError"));+ status_pill_->setToolTip(message);+ status_pill_->style()->unpolish(status_pill_);+ status_pill_->style()->polish(status_pill_);+ LOG_WARN("MarketsListPanel", QString("error: %1").arg(message));+}++void MarketsListPanel::rebuild_table(+ const QVector<pr::PredictionMarket>& markets) {+ table_->setRowCount(markets.size());+ int row = 0;+ for (const auto& m : markets) {+ auto* q = new QTableWidgetItem(m.question);+ q->setData(Qt::UserRole, m.key.market_id);+ table_->setItem(row, 0, q);++ const double yes = m.outcomes.size() >= 1 ? m.outcomes[0].price : 0.0;+ const double no = m.outcomes.size() >= 2 ? m.outcomes[1].price : (1.0 - yes);++ table_->setItem(row, 1, new QTableWidgetItem(format_price(yes)));+ table_->setItem(row, 2, new QTableWidgetItem(format_price(no)));+ table_->setItem(row, 3, new QTableWidgetItem(format_volume(m.volume)));+ table_->setItem(row, 4, new QTableWidgetItem(m.end_date_iso));+ ++row;+ }+}++} // namespace fincept::screens::panelsdiff --git a/fincept-qt/src/screens/crypto_center/panels/MarketsListPanel.h b/fincept-qt/src/screens/crypto_center/panels/MarketsListPanel.hnew file mode 100644index 000000000..bc86b346d--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/panels/MarketsListPanel.h@@ -0,0 +1,65 @@+#pragma once++#include "services/prediction/PredictionTypes.h"++#include <QString>+#include <QVector>+#include <QWidget>++class QHideEvent;+class QLabel;+class QPushButton;+class QShowEvent;+class QTableWidget;++namespace fincept::screens::panels {++/// MarketsListPanel — top section of the MARKETS tab (Phase 4 §4.2).+///+/// Lists the curated (or live, if `fincept.markets_endpoint` is configured)+/// prediction markets that settle in $FNCPT. Columns: MARKET, YES, NO,+/// 24h VOL, EXPIRES.+///+/// Wires to `FinceptInternalAdapter::markets_ready` and to the standard+/// error_occurred signal. The status pill on the panel head reads:+/// - "LIVE" when the adapter has a configured endpoint+/// - "DEMO" when running on the curated mock dataset+/// - "ERROR" when the most recent fetch surfaced a problem+///+/// Visibility-driven lifecycle (P3): on `showEvent` the panel asks the+/// adapter to `list_markets`; on `hideEvent` it disconnects and clears any+/// pending state. No `QTimer` for refresh — Phase 4's matching engine will+/// provide WS push when it ships.+class MarketsListPanel : public QWidget {+ Q_OBJECT+ public:+ explicit MarketsListPanel(QWidget* parent = nullptr);+ ~MarketsListPanel() override;++ protected:+ void showEvent(QShowEvent* e) override;+ void hideEvent(QHideEvent* e) override;++ private:+ void build_ui();+ void apply_theme();++ void on_markets_ready(+ const QVector<fincept::services::prediction::PredictionMarket>& markets);+ void on_error(const QString& context, const QString& message);+ void on_row_double_clicked(int row, int column);++ void set_status_demo(bool demo);+ void set_status_error(const QString& message);+ void rebuild_table(+ const QVector<fincept::services::prediction::PredictionMarket>& markets);++ QLabel* title_ = nullptr;+ QLabel* status_pill_ = nullptr;+ QLabel* footer_note_ = nullptr;+ QTableWidget* table_ = nullptr;++ bool subscribed_ = false;+};++} // namespace fincept::screens::panelsdiff --git a/fincept-qt/src/screens/crypto_center/panels/SupplyChartPanel.cpp b/fincept-qt/src/screens/crypto_center/panels/SupplyChartPanel.cppnew file mode 100644index 000000000..434665510--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/panels/SupplyChartPanel.cpp@@ -0,0 +1,305 @@+#include "screens/crypto_center/panels/SupplyChartPanel.h"++#include "core/logging/Logger.h"+#include "datahub/DataHub.h"+#include "services/wallet/WalletTypes.h"+#include "ui/theme/Theme.h"++#include <QChart>+#include <QChartView>+#include <QColor>+#include <QDateTime>+#include <QDateTimeAxis>+#include <QFrame>+#include <QHBoxLayout>+#include <QHideEvent>+#include <QLabel>+#include <QLineSeries>+#include <QPainter>+#include <QPen>+#include <QShowEvent>+#include <QStyle>+#include <QValueAxis>+#include <QVBoxLayout>++#include <cmath>++namespace fincept::screens::panels {++namespace {++constexpr const char* kTopicSupplyHistory = "treasury:supply_history";++QString font_stack() {+ return QStringLiteral(+ "'Consolas','Cascadia Mono','JetBrains Mono','SF Mono',monospace");+}++double atomic_to_billions(const QString& raw, int decimals) {+ if (raw.isEmpty()) return 0.0;+ bool ok = false;+ const auto units = raw.toULongLong(&ok);+ if (!ok) return 0.0;+ return (static_cast<double>(units) / std::pow(10.0, std::max(0, decimals))) / 1e9;+}++} // namespace++SupplyChartPanel::SupplyChartPanel(QWidget* parent) : QWidget(parent) {+ setObjectName(QStringLiteral("supplyChartPanel"));+ build_ui();+ apply_theme();++ auto& hub = fincept::datahub::DataHub::instance();+ connect(&hub, &fincept::datahub::DataHub::topic_error, this,+ &SupplyChartPanel::on_topic_error);+}++SupplyChartPanel::~SupplyChartPanel() = default;++void SupplyChartPanel::build_ui() {+ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(0, 0, 0, 0);+ root->setSpacing(0);++ // Head+ auto* head = new QWidget(this);+ head->setObjectName(QStringLiteral("supplyChartHead"));+ head->setFixedHeight(34);+ auto* hl = new QHBoxLayout(head);+ hl->setContentsMargins(12, 0, 12, 0);+ hl->setSpacing(8);+ auto* title = new QLabel(QStringLiteral("SUPPLY CHART · 12 MONTHS"), head);+ title->setObjectName(QStringLiteral("supplyChartTitle"));+ auto* legend = new QLabel(+ QStringLiteral("● TOTAL ● CIRCULATING ● BURNED"), head);+ legend->setObjectName(QStringLiteral("supplyChartLegend"));+ status_pill_ = new QLabel(QStringLiteral("LIVE"), head);+ status_pill_->setObjectName(QStringLiteral("supplyChartPill"));+ hl->addWidget(title);+ hl->addStretch();+ hl->addWidget(legend);+ hl->addSpacing(12);+ hl->addWidget(status_pill_);+ root->addWidget(head);++ // Body+ auto* body = new QWidget(this);+ body->setObjectName(QStringLiteral("supplyChartBody"));+ auto* bl = new QVBoxLayout(body);+ bl->setContentsMargins(8, 8, 8, 8);+ bl->setSpacing(8);++ // Chart+ chart_ = new QChart;+ chart_->setBackgroundVisible(false);+ chart_->setMargins(QMargins(0, 0, 0, 0));+ chart_->legend()->hide(); // we render our own in the head+ chart_->setBackgroundRoundness(0);++ using namespace ui::colors;+ total_series_ = new QLineSeries;+ total_series_->setName(QStringLiteral("Total"));+ total_series_->setPen(QPen(QColor(QString(BORDER_BRIGHT())), 2));++ circulating_series_ = new QLineSeries;+ circulating_series_->setName(QStringLiteral("Circulating"));+ circulating_series_->setPen(QPen(QColor(QString(TEXT_TERTIARY())), 2));++ burned_series_ = new QLineSeries;+ burned_series_->setName(QStringLiteral("Burned"));+ burned_series_->setPen(QPen(QColor(QString(AMBER())), 2));++ chart_->addSeries(total_series_);+ chart_->addSeries(circulating_series_);+ chart_->addSeries(burned_series_);++ x_axis_ = new QDateTimeAxis;+ x_axis_->setFormat(QStringLiteral("MMM yy"));+ x_axis_->setLabelsColor(QColor(QString(TEXT_TERTIARY())));+ x_axis_->setGridLineColor(QColor(QString(BORDER_DIM())));+ x_axis_->setLinePen(QPen(QColor(QString(BORDER_DIM()))));+ x_axis_->setTickCount(7);+ chart_->addAxis(x_axis_, Qt::AlignBottom);++ y_axis_ = new QValueAxis;+ y_axis_->setLabelFormat(QStringLiteral("%.1f B"));+ y_axis_->setLabelsColor(QColor(QString(TEXT_TERTIARY())));+ y_axis_->setGridLineColor(QColor(QString(BORDER_DIM())));+ y_axis_->setLinePen(QPen(QColor(QString(BORDER_DIM()))));+ y_axis_->setRange(0.0, 12.0); // placeholder; update_inputs sets real range+ chart_->addAxis(y_axis_, Qt::AlignLeft);++ total_series_->attachAxis(x_axis_);+ total_series_->attachAxis(y_axis_);+ circulating_series_->attachAxis(x_axis_);+ circulating_series_->attachAxis(y_axis_);+ burned_series_->attachAxis(x_axis_);+ burned_series_->attachAxis(y_axis_);++ chart_view_ = new QChartView(chart_, body);+ // No QPainter::Antialiasing render hint per P9 — large fills here are+ // expensive and the line series are 12 segments, so the staircase is+ // imperceptible.+ chart_view_->setMinimumHeight(220);+ bl->addWidget(chart_view_, 1);++ // Error strip+ error_strip_ = new QFrame(body);+ error_strip_->setObjectName(QStringLiteral("supplyChartErrorStrip"));+ auto* es_l = new QHBoxLayout(error_strip_);+ es_l->setContentsMargins(10, 6, 10, 6);+ es_l->setSpacing(8);+ auto* es_icon = new QLabel(QStringLiteral("!"), error_strip_);+ es_icon->setObjectName(QStringLiteral("supplyChartErrorIcon"));+ error_text_ = new QLabel(QString(), error_strip_);+ error_text_->setObjectName(QStringLiteral("supplyChartErrorText"));+ error_text_->setWordWrap(true);+ es_l->addWidget(es_icon);+ es_l->addWidget(error_text_, 1);+ error_strip_->hide();+ bl->addWidget(error_strip_);++ root->addWidget(body, 1);+}++void SupplyChartPanel::apply_theme() {+ using namespace ui::colors;+ const QString font = font_stack();++ const QString ss = QStringLiteral(+ "QWidget#supplyChartPanel { background:%1; }"+ "QWidget#supplyChartHead { background:%2; border-bottom:1px solid %3; }"+ "QLabel#supplyChartTitle { color:%4; font-family:%5; font-size:11px;"+ " font-weight:700; letter-spacing:1.4px; background:transparent; }"+ "QLabel#supplyChartLegend { color:%6; font-family:%5; font-size:10px;"+ " font-weight:600; letter-spacing:0.8px; background:transparent; }"+ "QLabel#supplyChartPill { color:%7; background:%8; border:1px solid %3;"+ " font-family:%5; font-size:9px; font-weight:700; letter-spacing:1.2px;"+ " padding:2px 8px; }"+ "QLabel#supplyChartPillDemo { color:%4; background:rgba(217,119,6,0.10);"+ " border:1px solid %12; font-family:%5; font-size:9px; font-weight:700;"+ " letter-spacing:1.2px; padding:2px 8px; }"+ "QWidget#supplyChartBody { background:%1; }"++ "QFrame#supplyChartErrorStrip { background:rgba(220,38,38,0.10);"+ " border:1px solid %9; }"+ "QLabel#supplyChartErrorIcon { color:%9; font-family:%5; font-size:13px;"+ " font-weight:700; background:transparent; }"+ "QLabel#supplyChartErrorText { color:%9; font-family:%5; font-size:11px;"+ " background:transparent; }"+ )+ .arg(BG_BASE(), // %1+ BG_SURFACE(), // %2+ BORDER_DIM(), // %3+ AMBER(), // %4+ font, // %5+ TEXT_TERTIARY(), // %6+ TEXT_PRIMARY(), // %7+ BG_RAISED(), // %8+ NEGATIVE()) // %9+ .arg(BG_HOVER(), // %10+ BORDER_BRIGHT(), // %11+ QStringLiteral("#78350f")); // %12 darker amber++ setStyleSheet(ss);+}++// ── Lifecycle ──────────────────────────────────────────────────────────────++void SupplyChartPanel::showEvent(QShowEvent* e) {+ QWidget::showEvent(e);+ auto& hub = fincept::datahub::DataHub::instance();+ hub.subscribe(this, QString::fromLatin1(kTopicSupplyHistory),+ [this](const QVariant& v) { on_supply_history_update(v); });+ hub.request(QString::fromLatin1(kTopicSupplyHistory), /*force=*/false);+}++void SupplyChartPanel::hideEvent(QHideEvent* e) {+ QWidget::hideEvent(e);+ fincept::datahub::DataHub::instance().unsubscribe(this);+}++// ── Updates ────────────────────────────────────────────────────────────────++void SupplyChartPanel::on_supply_history_update(const QVariant& v) {+ if (!v.canConvert<QVector<fincept::wallet::SupplyHistoryPoint>>()) return;+ const auto pts = v.value<QVector<fincept::wallet::SupplyHistoryPoint>>();+ if (pts.isEmpty()) return;++ // Mock detection: the supply-history vector itself carries no flag, but+ // both treasury:* topics share a producer (BuybackBurnService) and a+ // refresh path. Peek treasury:buyback_epoch — the canonical mock signal+ // — and mirror its flag onto our pill so all three panels read DEMO+ // together when the worker endpoint is unconfigured.+ bool is_mock = false;+ const auto epoch_v = fincept::datahub::DataHub::instance().peek(+ QStringLiteral("treasury:buyback_epoch"));+ if (epoch_v.canConvert<fincept::wallet::BuybackEpoch>()) {+ is_mock = epoch_v.value<fincept::wallet::BuybackEpoch>().is_mock;+ }+ update_demo_chip(is_mock);++ total_series_->clear();+ circulating_series_->clear();+ burned_series_->clear();++ double y_min = std::numeric_limits<double>::max();+ double y_max = std::numeric_limits<double>::lowest();+ qint64 x_min = std::numeric_limits<qint64>::max();+ qint64 x_max = std::numeric_limits<qint64>::lowest();++ for (const auto& p : pts) {+ const double t = atomic_to_billions(p.total_raw, p.decimals);+ const double c = atomic_to_billions(p.circulating_raw, p.decimals);+ const double b = atomic_to_billions(p.burned_raw, p.decimals);+ total_series_->append(static_cast<double>(p.ts_ms), t);+ circulating_series_->append(static_cast<double>(p.ts_ms), c);+ burned_series_->append(static_cast<double>(p.ts_ms), b);+ y_min = std::min({y_min, t, c, b});+ y_max = std::max({y_max, t, c, b});+ x_min = std::min(x_min, p.ts_ms);+ x_max = std::max(x_max, p.ts_ms);+ }++ if (x_min == std::numeric_limits<qint64>::max()) return; // nothing valid+ if (y_min == y_max) y_max = y_min + 1.0; // avoid degenerate axis++ x_axis_->setRange(QDateTime::fromMSecsSinceEpoch(x_min),+ QDateTime::fromMSecsSinceEpoch(x_max));+ const double pad = (y_max - y_min) * 0.05;+ y_axis_->setRange(std::max(0.0, y_min - pad), y_max + pad);+ clear_error_strip();+}++void SupplyChartPanel::on_topic_error(const QString& topic, const QString& error) {+ if (topic != QLatin1String(kTopicSupplyHistory)) return;+ show_error_strip(tr("Supply history feed error: %1").arg(error));+}++void SupplyChartPanel::show_error_strip(const QString& msg) {+ if (!error_strip_) return;+ error_text_->setText(msg);+ error_strip_->show();+}++void SupplyChartPanel::clear_error_strip() {+ if (error_strip_ && error_strip_->isVisible()) {+ error_strip_->hide();+ error_text_->clear();+ }+}++void SupplyChartPanel::update_demo_chip(bool is_mock) {+ if (is_mock) {+ status_pill_->setText(QStringLiteral("DEMO"));+ status_pill_->setObjectName(QStringLiteral("supplyChartPillDemo"));+ } else {+ status_pill_->setText(QStringLiteral("LIVE"));+ status_pill_->setObjectName(QStringLiteral("supplyChartPill"));+ }+ status_pill_->style()->unpolish(status_pill_);+ status_pill_->style()->polish(status_pill_);+}++} // namespace fincept::screens::panelsdiff --git a/fincept-qt/src/screens/crypto_center/panels/SupplyChartPanel.h b/fincept-qt/src/screens/crypto_center/panels/SupplyChartPanel.hnew file mode 100644index 000000000..ff156579c--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/panels/SupplyChartPanel.h@@ -0,0 +1,68 @@+#pragma once++#include <QString>+#include <QVariant>+#include <QWidget>++class QHideEvent;+class QLabel;+class QShowEvent;+class QChartView;+QT_FORWARD_DECLARE_CLASS(QChart)+QT_FORWARD_DECLARE_CLASS(QLineSeries)+QT_FORWARD_DECLARE_CLASS(QDateTimeAxis)+QT_FORWARD_DECLARE_CLASS(QValueAxis)++namespace fincept::screens::panels {++/// SupplyChartPanel — middle section of the ROADMAP tab (Phase 5 §5.2).+///+/// QChartView with three QLineSeries over the last 12 months:+/// - **Total** (flat, supply ceiling)+/// - **Circulating** (decreases as burns accumulate)+/// - **Burned** (increases monotonically — amber, the headline)+///+/// Subscribes (visibility-driven, P3): `treasury:supply_history`. Topic+/// payload is `QVector<SupplyHistoryPoint>`.+///+/// Per P9 the chart is rebuilt only on data change or resize — not on+/// repaint. QtCharts itself caches the series rendering; we just avoid+/// rebuilding the chart from scratch unless the underlying data changed.+class SupplyChartPanel : public QWidget {+ Q_OBJECT+ public:+ explicit SupplyChartPanel(QWidget* parent = nullptr);+ ~SupplyChartPanel() override;++ protected:+ void showEvent(QShowEvent* e) override;+ void hideEvent(QHideEvent* e) override;++ private:+ void build_ui();+ void apply_theme();++ void on_supply_history_update(const QVariant& v);+ void on_topic_error(const QString& topic, const QString& error);+ void show_error_strip(const QString& msg);+ void clear_error_strip();+ void update_demo_chip(bool is_mock);++ // Head+ QLabel* status_pill_ = nullptr;++ // Chart+ QChartView* chart_view_ = nullptr;+ QChart* chart_ = nullptr;+ QLineSeries* total_series_ = nullptr;+ QLineSeries* circulating_series_ = nullptr;+ QLineSeries* burned_series_ = nullptr;+ QDateTimeAxis* x_axis_ = nullptr;+ QValueAxis* y_axis_ = nullptr;++ // Error strip+ QWidget* error_strip_ = nullptr;+ QLabel* error_text_ = nullptr;+};++} // namespace fincept::screens::panelsdiff --git a/fincept-qt/src/screens/crypto_center/panels/SwapPanel.cpp b/fincept-qt/src/screens/crypto_center/panels/SwapPanel.cppindex 945c3d4cd..9e85867be 100644--- a/fincept-qt/src/screens/crypto_center/panels/SwapPanel.cpp+++ b/fincept-qt/src/screens/crypto_center/panels/SwapPanel.cpp@@ -6,6 +6,7 @@#include "screens/crypto_center/WalletActionSummary.h"#include "services/wallet/PumpFunSwapService.h"#include "services/wallet/SolanaRpcClient.h"+#include "services/wallet/TokenMetadataService.h"#include "services/wallet/WalletService.h"#include "services/wallet/WalletTypes.h"#include "storage/secure/SecureStorage.h"@@ -26,11 +27,12 @@#include <QTimer>#include <QVBoxLayout>+#include <algorithm>+namespace fincept::screens::panels {namespace {-constexpr const char* kFncptMint = "9LUqJ5aQTjQiUCL93gi33LZcscUoSBJNhVCYpPzEpump";constexpr int kDebounceMs = 250;constexpr int kDefaultSlippageBps = 100;constexpr int kMaxSlippageBps = 500;@@ -54,6 +56,27 @@ QString format_bps(int bps) {.arg(bps % 100, 2, 10, QChar('0'));}+bool is_native_sol(const QString& mint) {+ return mint == QString::fromLatin1(fincept::wallet::kWrappedSolMint);+}++bool is_fncpt(const QString& mint) {+ return mint == QString::fromLatin1(fincept::wallet::kFncptMint);+}++QString price_topic_for(const QString& mint) {+ return QStringLiteral("market:price:token:%1").arg(mint);+}++QString resolve_symbol(const QString& mint) {+ if (is_native_sol(mint)) return QStringLiteral("SOL");+ if (is_fncpt(mint)) return QStringLiteral("$FNCPT");+ auto md = fincept::wallet::TokenMetadataService::instance().lookup(mint);+ if (md && !md->symbol.isEmpty()) return md->symbol;+ if (mint.size() <= 8) return mint;+ return mint.left(4) + QStringLiteral("…") + mint.right(4);+}+} // namespaceSwapPanel::SwapPanel(QWidget* parent) : QWidget(parent) {@@ -61,6 +84,19 @@ SwapPanel::SwapPanel(QWidget* parent) : QWidget(parent) {build_ui();apply_theme();+ // Pre-seed the synthetic SOL holding once. amount_raw is updated on each+ // balance publish so MAX/can_submit reflect live SOL.+ sol_holding_.mint = QString::fromLatin1(fincept::wallet::kWrappedSolMint);+ sol_holding_.symbol = QStringLiteral("SOL");+ sol_holding_.name = QStringLiteral("Solana");+ sol_holding_.decimals = 9;+ sol_holding_.verified = true;+ sol_holding_.amount_raw = QStringLiteral("0");++ // Default selection: BUY $FNCPT direction.+ from_mint_ = QString::fromLatin1(fincept::wallet::kWrappedSolMint);+ to_mint_ = QString::fromLatin1(fincept::wallet::kFncptMint);+debounce_timer_ = new QTimer(this);debounce_timer_->setSingleShot(true);debounce_timer_->setInterval(kDebounceMs);@@ -76,6 +112,9 @@ SwapPanel::SwapPanel(QWidget* parent) : QWidget(parent) {connect(&hub, &fincept::datahub::DataHub::topic_error, this,&SwapPanel::on_topic_error);+ rebuild_from_combo();+ rebuild_to_combo();+if (svc.is_connected()) {on_wallet_connected(svc.current_pubkey(), svc.state().label);} else {@@ -98,7 +137,8 @@ void SwapPanel::build_ui() {head_l->setSpacing(8);auto* title = new QLabel(QStringLiteral("SWAP"), head);title->setObjectName(QStringLiteral("swapPanelTitle"));- auto* head_status = new QLabel(QStringLiteral("via Jupiter"), head);+ auto* head_status =+ new QLabel(QStringLiteral("via PumpPortal · pool=auto"), head);head_status->setObjectName(QStringLiteral("swapPanelHeadStatus"));head_l->addWidget(title);head_l->addStretch();@@ -111,26 +151,11 @@ void SwapPanel::build_ui() {bl->setContentsMargins(14, 14, 14, 14);bl->setSpacing(10);- // Mode (BUY $FNCPT / SELL $FNCPT)- {- auto* row = new QHBoxLayout;- row->setSpacing(8);- auto* lbl = new QLabel(QStringLiteral("DIRECTION"), body);- lbl->setObjectName(QStringLiteral("swapPanelCaption"));- mode_combo_ = new QComboBox(body);- mode_combo_->setObjectName(QStringLiteral("swapPanelCombo"));- mode_combo_->addItem(tr("BUY $FNCPT (SOL → $FNCPT)"));- mode_combo_->addItem(tr("SELL $FNCPT ($FNCPT → SOL)"));- mode_combo_->setFixedHeight(28);- row->addWidget(lbl);- row->addWidget(mode_combo_, 1);- bl->addLayout(row);- }-- // FROM amount+ // FROM (token + amount + MAX){auto* row = new QHBoxLayout;row->setSpacing(6);+auto* col_l = new QVBoxLayout;col_l->setSpacing(2);auto* cap = new QLabel(QStringLiteral("YOU PAY"), body);@@ -148,15 +173,14 @@ void SwapPanel::build_ui() {auto* col_t = new QVBoxLayout;col_t->setSpacing(2);- auto* cap_t = new QLabel(QStringLiteral("TOKEN"), body);+ auto* cap_t = new QLabel(QStringLiteral("FROM"), body);cap_t->setObjectName(QStringLiteral("swapPanelCaption"));col_t->addWidget(cap_t);- in_token_label_ = new QLabel(QStringLiteral("SOL"), body);- in_token_label_->setObjectName(QStringLiteral("swapPanelTokenChip"));- in_token_label_->setFixedHeight(34);- in_token_label_->setAlignment(Qt::AlignCenter);- in_token_label_->setMinimumWidth(80);- col_t->addWidget(in_token_label_);+ from_combo_ = new QComboBox(body);+ from_combo_->setObjectName(QStringLiteral("swapPanelCombo"));+ from_combo_->setFixedHeight(34);+ from_combo_->setMinimumWidth(140);+ col_t->addWidget(from_combo_);row->addLayout(col_t);max_button_ = new QPushButton(tr("MAX"), body);@@ -171,10 +195,11 @@ void SwapPanel::build_ui() {bl->addWidget(in_balance_label_);}- // TO (quoted)+ // TO (estimate + token combo){auto* row = new QHBoxLayout;row->setSpacing(6);+auto* col_l = new QVBoxLayout;col_l->setSpacing(2);auto* cap = new QLabel(QStringLiteral("YOU RECEIVE (EST.)"), body);@@ -188,20 +213,19 @@ void SwapPanel::build_ui() {auto* col_t = new QVBoxLayout;col_t->setSpacing(2);- auto* cap_t = new QLabel(QStringLiteral("TOKEN"), body);+ auto* cap_t = new QLabel(QStringLiteral("TO"), body);cap_t->setObjectName(QStringLiteral("swapPanelCaption"));col_t->addWidget(cap_t);- out_token_label_ = new QLabel(QStringLiteral("$FNCPT"), body);- out_token_label_->setObjectName(QStringLiteral("swapPanelTokenChip"));- out_token_label_->setFixedHeight(34);- out_token_label_->setAlignment(Qt::AlignCenter);- out_token_label_->setMinimumWidth(80);- col_t->addWidget(out_token_label_);+ to_combo_ = new QComboBox(body);+ to_combo_->setObjectName(QStringLiteral("swapPanelCombo"));+ to_combo_->setFixedHeight(34);+ to_combo_->setMinimumWidth(140);+ col_t->addWidget(to_combo_);row->addLayout(col_t);bl->addLayout(row);}- // Quote details (route, impact, slippage)+ // Quote details{auto* details = new QFrame(body);details->setObjectName(QStringLiteral("swapPanelDetailsBlock"));@@ -262,8 +286,10 @@ void SwapPanel::build_ui() {bl->addStretch(1);root->addWidget(body, 1);- connect(mode_combo_, QOverload<int>::of(&QComboBox::currentIndexChanged), this,- &SwapPanel::on_mode_changed);+ connect(from_combo_, QOverload<int>::of(&QComboBox::currentIndexChanged),+ this, &SwapPanel::on_from_changed);+ connect(to_combo_, QOverload<int>::of(&QComboBox::currentIndexChanged),+ this, &SwapPanel::on_to_changed);connect(amount_input_, &QLineEdit::textEdited, this, &SwapPanel::on_amount_changed);connect(max_button_, &QPushButton::clicked, this, &SwapPanel::on_max_clicked);connect(swap_button_, &QPushButton::clicked, this, &SwapPanel::on_swap_clicked);@@ -294,10 +320,6 @@ void SwapPanel::apply_theme() {" font-family:%5; font-size:11px; padding:0 8px; }""QComboBox#swapPanelCombo::drop-down { border:none; width:18px; }"- // Token chip (read-only, looks like an inert pill)- "QLabel#swapPanelTokenChip { background:%8; color:%4; border:1px solid %3;"- " font-family:%5; font-size:13px; font-weight:700; letter-spacing:1.2px; }"-// Out amount"QLabel#swapPanelOutAmount { background:%8; color:%7; border:1px solid %3;"" font-family:%5; font-size:16px; padding:0 8px; }"@@ -343,6 +365,21 @@ void SwapPanel::apply_theme() {setStyleSheet(ss);}+// ── Public API ─────────────────────────────────────────────────────────────++void SwapPanel::set_from_mint(const QString& mint) {+ if (mint.isEmpty()) return;+ // Try to apply now; if the mint isn't in the combo yet, queue it for the+ // next rebuild_from_combo() (which fires on every balance publish).+ int idx = from_combo_ ? from_combo_->findData(mint) : -1;+ if (idx >= 0 && from_combo_) {+ from_combo_->setCurrentIndex(idx);+ pending_from_mint_.clear();+ } else {+ pending_from_mint_ = mint;+ }+}+// ── Lifecycle ──────────────────────────────────────────────────────────────void SwapPanel::on_wallet_connected(const QString& pubkey, const QString& /*label*/) {@@ -355,13 +392,11 @@ void SwapPanel::on_wallet_connected(const QString& pubkey, const QString& /*labe[this](const QVariant& v) { on_balance_update(v); });hub.request(current_balance_topic_, /*force=*/true);}- hub.subscribe(this, QStringLiteral("market:price:fncpt"),- [this](const QVariant& v) { on_price_update(v); });- hub.request(QStringLiteral("market:price:fncpt"), /*force=*/true);+ resubscribe_prices();}set_busy(false);+ update_balance_label();swap_button_->setEnabled(can_submit());- update_inputs_from_balance();}void SwapPanel::on_wallet_disconnected() {@@ -369,9 +404,13 @@ void SwapPanel::on_wallet_disconnected() {hub.unsubscribe(this);current_balance_topic_.clear();current_pubkey_.clear();- sol_balance_ = 0.0;- fncpt_balance_ = 0.0;- last_fncpt_usd_price_ = 0.0;+ latest_balance_ = {};+ sol_holding_.amount_raw = QStringLiteral("0");+ price_usd_.clear();+ price_sol_.clear();+ price_topic_.clear();+ rebuild_from_combo();+ rebuild_to_combo();in_balance_label_->setText(tr("Balance: —"));out_amount_label_->setText(QStringLiteral("—"));route_label_->setText(QStringLiteral("—"));@@ -389,9 +428,9 @@ void SwapPanel::showEvent(QShowEvent* e) {current_balance_topic_ = QStringLiteral("wallet:balance:%1").arg(current_pubkey_);hub.subscribe(this, current_balance_topic_,[this](const QVariant& v) { on_balance_update(v); });+ hub.request(current_balance_topic_, /*force=*/true);}- hub.subscribe(this, QStringLiteral("market:price:fncpt"),- [this](const QVariant& v) { on_price_update(v); });+ resubscribe_prices();slippage_label_->setText(format_bps(slippage_bps()));route_label_->setText(QStringLiteral("PumpSwap (auto)"));}@@ -399,10 +438,10 @@ void SwapPanel::showEvent(QShowEvent* e) {void SwapPanel::hideEvent(QHideEvent* e) {QWidget::hideEvent(e);auto& hub = fincept::datahub::DataHub::instance();- // unsubscribe(this) detaches us from every topic in one call —- // covers both the balance topic and market:price:fncpt.+ // unsubscribe(this) detaches us from every topic (balance + every price).hub.unsubscribe(this);current_balance_topic_.clear();+ price_topic_.clear();debounce_timer_->stop();}@@ -410,71 +449,217 @@ void SwapPanel::hideEvent(QHideEvent* e) {void SwapPanel::on_balance_update(const QVariant& v) {if (!v.canConvert<fincept::wallet::WalletBalance>()) return;- const auto bal = v.value<fincept::wallet::WalletBalance>();- sol_balance_ = bal.sol();- fncpt_balance_ = bal.fncpt_ui();- fncpt_decimals_ = bal.fncpt_decimals();- update_inputs_from_balance();-}--void SwapPanel::update_inputs_from_balance() {- if (mode_ == Mode::BuyFncpt) {- in_token_label_->setText(QStringLiteral("SOL"));- out_token_label_->setText(QStringLiteral("$FNCPT"));- in_balance_label_->setText(tr("Balance: %1 SOL").arg(format_token(sol_balance_, 4)));- } else {- in_token_label_->setText(QStringLiteral("$FNCPT"));- out_token_label_->setText(QStringLiteral("SOL"));- in_balance_label_->setText(- tr("Balance: %1 $FNCPT").arg(format_token(fncpt_balance_, 2)));- }+ latest_balance_ = v.value<fincept::wallet::WalletBalance>();+ // Mirror native SOL into the synthetic holding so MAX & balance label+ // can read it the same way as any SPL token.+ sol_holding_.amount_raw = QString::number(latest_balance_.sol_lamports);+ rebuild_from_combo();+ rebuild_to_combo();+ if (isVisible()) resubscribe_prices();+ update_balance_label();+ recompute_estimate();+ swap_button_->setEnabled(can_submit());}-void SwapPanel::on_price_update(const QVariant& v) {- if (!v.canConvert<fincept::wallet::FncptPrice>()) return;- const auto p = v.value<fincept::wallet::FncptPrice>();+void SwapPanel::on_price_update(const QString& mint, const QVariant& v) {+ if (!v.canConvert<fincept::wallet::TokenPrice>()) return;+ const auto p = v.value<fincept::wallet::TokenPrice>();if (!p.valid) return;- last_fncpt_usd_price_ = p.usd;- last_fncpt_sol_price_ = p.sol; // FNCPT denominated in SOL+ price_usd_.insert(mint, p.usd);+ price_sol_.insert(mint, p.sol);recompute_estimate();}void SwapPanel::on_topic_error(const QString& topic, const QString& error) {- if (topic == QStringLiteral("market:price:fncpt")) {- // Without a price we can't estimate output — disable submit and warn.- show_error_strip(tr("Spot price unavailable: %1. Try again in a moment.")+ // Surface only the active leg's price errors. Other topic errors are+ // handled by HoldingsBar / HomeTab.+ const auto from_topic = price_topic_for(from_mint_);+ const auto to_topic = price_topic_for(to_mint_);+ if (topic == from_topic || topic == to_topic) {+ show_error_strip(tr("Price unavailable: %1. Try again in a moment.").arg(error));swap_button_->setEnabled(false);}- // Balance errors handled by HoldingsBar / HomeTab; ignore here.}void SwapPanel::on_amount_changed(const QString& /*s*/) {- // Debounce the local estimate recompute so we don't thrash on every- // keystroke (mostly cosmetic — the math is cheap, but it gives the- // user a chance to finish typing before we paint the output).debounce_timer_->start();out_amount_label_->setText(QStringLiteral("…"));swap_button_->setEnabled(false);clear_error_strip();}-void SwapPanel::on_mode_changed(int idx) {- mode_ = (idx == 0) ? Mode::BuyFncpt : Mode::SellFncpt;- update_inputs_from_balance();+void SwapPanel::on_from_changed(int idx) {+ if (!from_combo_ || idx < 0) return;+ const auto mint = from_combo_->itemData(idx).toString();+ if (mint.isEmpty() || mint == from_mint_) return;+ from_mint_ = mint;+ // If FROM == TO, flip the TO to the canonical counterpart so the user+ // never sees a same-token "swap".+ if (to_mint_ == from_mint_) {+ to_mint_ = is_fncpt(from_mint_)+ ? QString::fromLatin1(fincept::wallet::kWrappedSolMint)+ : QString::fromLatin1(fincept::wallet::kFncptMint);+ rebuild_to_combo();+ }+ resubscribe_prices();+ update_balance_label();debounce_timer_->start();+ swap_button_->setEnabled(can_submit());+}++void SwapPanel::on_to_changed(int idx) {+ if (!to_combo_ || idx < 0) return;+ const auto mint = to_combo_->itemData(idx).toString();+ if (mint.isEmpty() || mint == to_mint_) return;+ to_mint_ = mint;+ resubscribe_prices();+ debounce_timer_->start();+ swap_button_->setEnabled(can_submit());}void SwapPanel::on_max_clicked() {- const double bal = (mode_ == Mode::BuyFncpt) ? sol_balance_ : fncpt_balance_;+ const auto* h = holding_for(from_mint_);+ if (!h) return;+ double bal = h->ui_amount();if (bal <= 0.0) return;- // Leave a small SOL reserve for fees. 0.005 SOL covers a swap + rent.- const double safe = (mode_ == Mode::BuyFncpt) ? std::max(0.0, bal - 0.005) : bal;+ // Reserve a small SOL cushion for fees only when paying in SOL.+ if (is_native_sol(from_mint_)) bal = std::max(0.0, bal - 0.005);QSignalBlocker b(amount_input_);- amount_input_->setText(format_token(safe, 6));+ amount_input_->setText(format_token(bal, 6));on_amount_changed(amount_input_->text());}+// ── Combo population ───────────────────────────────────────────────────────++void SwapPanel::rebuild_from_combo() {+ if (!from_combo_) return;+ QSignalBlocker b(from_combo_);+ from_combo_->clear();++ // Always include native SOL at the top so an empty wallet still has a+ // recognisable FROM (matches how PumpPortal frames trades — SOL is the+ // canonical paying side).+ from_combo_->addItem(resolve_symbol(QString::fromLatin1(fincept::wallet::kWrappedSolMint)),+ QString::fromLatin1(fincept::wallet::kWrappedSolMint));++ // Holdings sorted by USD value (already done at publish time in+ // WalletBalanceProducer); skip the wSOL entry from `tokens` to avoid a+ // duplicate (native SOL is already at index 0). Same for unverified+ // tokens unless the user opted in via SettingsTab.+ bool show_unverified = false;+ auto sr = SecureStorage::instance().retrieve(+ QStringLiteral("wallet.show_unverified_tokens"));+ if (sr.is_ok()) show_unverified = (sr.value() == QLatin1String("1"));++ for (const auto& t : latest_balance_.tokens) {+ if (is_native_sol(t.mint)) continue;+ if (!t.verified && !show_unverified && !is_fncpt(t.mint)) continue;+ if (t.ui_amount() <= 0.0) continue;+ from_combo_->addItem(resolve_symbol(t.mint), t.mint);+ }++ // Also ensure FNCPT is always present (so the user can SELL even if they+ // hold zero — e.g. just to see the UI), positioned after holdings.+ if (from_combo_->findData(QString::fromLatin1(fincept::wallet::kFncptMint)) < 0) {+ from_combo_->addItem(resolve_symbol(QString::fromLatin1(fincept::wallet::kFncptMint)),+ QString::fromLatin1(fincept::wallet::kFncptMint));+ }++ // Restore selection: pending override > current from_mint_ > index 0.+ QString want = !pending_from_mint_.isEmpty() ? pending_from_mint_ : from_mint_;+ int idx = from_combo_->findData(want);+ if (idx < 0 && !pending_from_mint_.isEmpty()) {+ // Pending mint isn't in the combo yet — keep the queue and pick+ // current from_mint_ (or first row).+ idx = from_combo_->findData(from_mint_);+ }+ if (idx < 0) idx = 0;+ from_combo_->setCurrentIndex(idx);+ if (idx >= 0) {+ const auto picked = from_combo_->itemData(idx).toString();+ if (!picked.isEmpty()) from_mint_ = picked;+ }+ if (!pending_from_mint_.isEmpty() && from_mint_ == pending_from_mint_) {+ pending_from_mint_.clear();+ }+}++void SwapPanel::rebuild_to_combo() {+ if (!to_combo_) return;+ QSignalBlocker b(to_combo_);+ to_combo_->clear();++ // Phase 2 valid TO targets are the counterpart of FROM. Even though+ // PumpPortal only supports SOL↔FNCPT, we expose the combo so the user+ // sees the surface area; can_submit() gates the actual SWAP.+ auto add = [this](const QString& mint) {+ if (mint == from_mint_) return; // never list FROM==TO+ const int idx = to_combo_->findData(mint);+ if (idx < 0) to_combo_->addItem(resolve_symbol(mint), mint);+ };+ add(QString::fromLatin1(fincept::wallet::kFncptMint));+ add(QString::fromLatin1(fincept::wallet::kWrappedSolMint));++ // Append other holdings as TO targets (display-only for Phase 2; SWAP+ // gated for unsupported pairs).+ for (const auto& t : latest_balance_.tokens) {+ if (is_native_sol(t.mint)) continue;+ if (is_fncpt(t.mint)) continue;+ if (!t.verified) continue;+ add(t.mint);+ }++ int idx = to_combo_->findData(to_mint_);+ if (idx < 0) idx = 0;+ to_combo_->setCurrentIndex(idx);+ if (idx >= 0) {+ const auto picked = to_combo_->itemData(idx).toString();+ if (!picked.isEmpty()) to_mint_ = picked;+ }+}++// ── Subscriptions ──────────────────────────────────────────────────────────++void SwapPanel::resubscribe_prices() {+ if (!isVisible()) return;+ auto& hub = fincept::datahub::DataHub::instance();+ // Drop any prior price subs we own before resubscribing the active legs.+ // (We can't selectively unsubscribe by topic; unsubscribe(this) drops+ // everything including the balance topic. Resubscribe both legs ++ // balance every time — it's cheap and keeps lifetimes obvious.)+ hub.unsubscribe(this);+ price_topic_.clear();++ if (!current_balance_topic_.isEmpty()) {+ hub.subscribe(this, current_balance_topic_,+ [this](const QVariant& v) { on_balance_update(v); });+ }++ auto sub_price = [this, &hub](const QString& mint) {+ if (mint.isEmpty()) return;+ const auto topic = price_topic_for(mint);+ price_topic_.insert(mint, topic);+ hub.subscribe(this, topic,+ [this, mint](const QVariant& v) { on_price_update(mint, v); });+ hub.request(topic, /*force=*/false);+ };+ sub_price(from_mint_);+ sub_price(to_mint_);+}++void SwapPanel::update_balance_label() {+ const auto* h = holding_for(from_mint_);+ const QString sym = resolve_symbol(from_mint_);+ if (!h) {+ in_balance_label_->setText(tr("Balance: 0 %1").arg(sym));+ return;+ }+ const int dp = is_native_sol(from_mint_) ? 4 : (is_fncpt(from_mint_) ? 2 : 4);+ in_balance_label_->setText(+ tr("Balance: %1 %2").arg(format_token(h->ui_amount(), dp)).arg(sym));+}+void SwapPanel::recompute_estimate() {bool ok = false;const double ui_amount = QLocale::system().toDouble(amount_input_->text(), &ok);@@ -483,46 +668,42 @@ void SwapPanel::recompute_estimate() {swap_button_->setEnabled(false);return;}- if (last_fncpt_sol_price_ <= 0.0 || last_fncpt_usd_price_ <= 0.0) {- out_amount_label_->setText(QStringLiteral("…"));- status_label_->setText(tr("Waiting for spot price…"));++ const double from_sol = price_sol_.value(from_mint_, 0.0);+ const double from_usd = price_usd_.value(from_mint_, 0.0);+ const double to_sol = price_sol_.value(to_mint_, 0.0);+ const double to_usd = price_usd_.value(to_mint_, 0.0);++ if (from_sol <= 0.0 || from_usd <= 0.0 || to_sol <= 0.0 || to_usd <= 0.0) {+ out_amount_label_->setText(QStringLiteral("estimate unavailable"));+ status_label_->setText(tr("Waiting for spot prices…"));swap_button_->setEnabled(false);return;}- // Local estimate from spot. PumpPortal returns the exact output at- // build_swap time; this is just the user-facing preview.- //- // Spot inputs:- // last_fncpt_usd_price_ = USD per 1 FNCPT- // last_fncpt_sol_price_ = SOL per 1 FNCPT- //- // BUY (SOL → FNCPT): user types SOL_in- // est_fncpt_out = SOL_in / SOL_per_FNCPT- // SELL (FNCPT → SOL): user types FNCPT_in- // est_sol_out = FNCPT_in * SOL_per_FNCPT- //- // Slippage is the user-set lower bound on what they'll accept; show the- // worst-case to set expectations correctly.+ // SOL-denominated cross: out_units = in_units * (from_sol / to_sol).const double slippage_factor = 1.0 - (slippage_pct() / 100.0);- QString out_text;- if (mode_ == Mode::BuyFncpt) {- const double est_fncpt = (ui_amount / last_fncpt_sol_price_) * slippage_factor;- const double est_usd = ui_amount * last_fncpt_usd_price_ / last_fncpt_sol_price_;- out_text = QStringLiteral("≈ %1 $FNCPT (~$%2)")- .arg(format_token(est_fncpt, 2))- .arg(format_token(est_usd, 2));- } else {- const double est_sol = ui_amount * last_fncpt_sol_price_ * slippage_factor;- const double est_usd = ui_amount * last_fncpt_usd_price_;- out_text = QStringLiteral("≈ %1 SOL (~$%2)")- .arg(format_token(est_sol, 6))- .arg(format_token(est_usd, 2));- }+ const double est_out = ui_amount * (from_sol / to_sol) * slippage_factor;+ const double est_usd = ui_amount * from_usd;++ const QString to_sym = resolve_symbol(to_mint_);+ const int dp = is_native_sol(to_mint_) ? 6 : (is_fncpt(to_mint_) ? 2 : 4);+ const QString out_text = QStringLiteral("≈ %1 %2 (~$%3)")+ .arg(format_token(est_out, dp))+ .arg(to_sym)+ .arg(format_token(est_usd, 2));out_amount_label_->setText(out_text);route_label_->setText(QStringLiteral("PumpSwap (auto)"));impact_label_->setText(tr("set by PumpSwap; capped by slippage"));slippage_label_->setText(format_bps(slippage_bps()));++ if (!is_supported_pair()) {+ // Show the estimate so the user understands what they're trying to+ // do, but block submit and explain.+ status_label_->setText(unsupported_pair_message());+ swap_button_->setEnabled(false);+ return;+ }status_label_->setText(tr("Ready. Click SWAP to build the transaction."));clear_error_strip();swap_button_->setEnabled(can_submit());@@ -544,26 +725,48 @@ void SwapPanel::clear_error_strip() {void SwapPanel::set_busy(bool busy) {busy_ = busy;amount_input_->setEnabled(!busy);- mode_combo_->setEnabled(!busy);+ if (from_combo_) from_combo_->setEnabled(!busy);+ if (to_combo_) to_combo_->setEnabled(!busy);max_button_->setEnabled(!busy);swap_button_->setEnabled(!busy && can_submit());}+bool SwapPanel::is_supported_pair() const {+ // PumpPortal `trade-local` only routes SOL↔FNCPT for $FNCPT trades.+ const bool sol_to_fncpt = is_native_sol(from_mint_) && is_fncpt(to_mint_);+ const bool fncpt_to_sol = is_fncpt(from_mint_) && is_native_sol(to_mint_);+ return sol_to_fncpt || fncpt_to_sol;+}++QString SwapPanel::unsupported_pair_message() const {+ return tr("This pair isn't routable in Phase 2. PumpPortal supports "+ "SOL ↔ $FNCPT only; a generalised router lands in Phase 3.");+}+bool SwapPanel::can_submit() const {if (busy_) return false;if (current_pubkey_.isEmpty()) return false;- if (last_fncpt_sol_price_ <= 0.0) return false;- if (last_fncpt_usd_price_ <= 0.0) return false;+ if (!is_supported_pair()) return false;+ if (price_sol_.value(from_mint_, 0.0) <= 0.0) return false;+ if (price_sol_.value(to_mint_, 0.0) <= 0.0) return false;bool ok = false;const double ui_amount = QLocale::system().toDouble(amount_input_->text(), &ok);if (!ok || ui_amount <= 0.0) return false;- // Don't let the user buy/sell more than they have. PumpPortal would- // reject the tx anyway; this is the friendlier early-exit.- const double bal = (mode_ == Mode::BuyFncpt) ? sol_balance_ : fncpt_balance_;- if (ui_amount > bal) return false;+ const auto* h = holding_for(from_mint_);+ if (!h) return false;+ if (ui_amount > h->ui_amount()) return false;return true;}+const fincept::wallet::TokenHolding* SwapPanel::holding_for(const QString& mint) const {+ if (mint.isEmpty()) return nullptr;+ if (is_native_sol(mint)) return &sol_holding_;+ for (const auto& t : latest_balance_.tokens) {+ if (t.mint == mint) return &t;+ }+ return nullptr;+}+int SwapPanel::slippage_bps() const {auto r = SecureStorage::instance().retrieve(QStringLiteral("wallet.default_slippage_bps"));if (r.is_ok()) {@@ -584,6 +787,75 @@ int SwapPanel::slippage_pct() const {}// ── Submit flow ────────────────────────────────────────────────────────────+//+// Sequence:+// 1. build_swap → returns the unsigned tx body from PumpPortal.+// 2. simulate_transaction → MITM gate (Phase 2 plan §2). If simulation+// reports an `err`, bail before the wallet ever pops.+// 3. WalletActionConfirmDialog → user reviews decoded summary.+// 4. sign_and_send → wallet signs and forwards to RPC.+// 5. Poll getSignatureStatuses until confirmed.+//+// Each step checks the QPointer guard and surfaces failures to the error+// strip / status label. set_busy(true) at step 1; set_busy(false) on any+// terminal outcome.++void SwapPanel::start_status_poll(const QString& sig) {+ auto* rpc = new fincept::wallet::SolanaRpcClient(this);+ rpc->reload_endpoint();+ auto attempts = std::make_shared<int>(0);+ auto* poll_timer = new QTimer(this);+ poll_timer->setInterval(kStatusPollMs);+ QPointer<SwapPanel> guard = this;+ QObject::connect(poll_timer, &QTimer::timeout, this,+ [guard, rpc, sig, attempts, poll_timer]() {+ if (!guard) {+ poll_timer->stop();+ poll_timer->deleteLater();+ return;+ }+ if (++(*attempts) > kStatusPollMaxAttempts) {+ poll_timer->stop();+ poll_timer->deleteLater();+ guard->set_busy(false);+ guard->show_error_strip(+ QObject::tr("No confirmation after 60 s. Check Solscan."));+ guard->status_label_->setText(QObject::tr("Timed out."));+ return;+ }+ rpc->get_signature_statuses(QStringList{sig},+ [guard, sig, poll_timer](+ Result<std::vector<fincept::wallet::SolanaRpcClient::SignatureStatus>> r) {+ if (!guard) return;+ if (r.is_err()) return; // transient — keep polling+ const auto& vec = r.value();+ if (vec.empty() || !vec[0].found) return;+ const auto& s = vec[0];+ if (!s.err.isEmpty()) {+ poll_timer->stop();+ poll_timer->deleteLater();+ guard->set_busy(false);+ guard->show_error_strip(+ QObject::tr("Tx failed on-chain: %1").arg(s.err));+ guard->status_label_->setText(QObject::tr("Reverted."));+ return;+ }+ if (s.confirmation_status == QStringLiteral("confirmed")+ || s.confirmation_status == QStringLiteral("finalized")) {+ poll_timer->stop();+ poll_timer->deleteLater();+ guard->set_busy(false);+ guard->amount_input_->clear();+ guard->out_amount_label_->setText(QStringLiteral("—"));+ guard->status_label_->setText(+ QObject::tr("Confirmed: %1…").arg(sig.left(12)));+ fincept::wallet::WalletService::instance()+ .force_balance_refresh();+ }+ });+ });+ poll_timer->start();+}void SwapPanel::on_swap_clicked() {if (!can_submit()) return;@@ -592,177 +864,204 @@ void SwapPanel::on_swap_clicked() {show_error_strip(tr("Swap service unavailable."));return;}- bool ok = false;- const double ui_amount = QLocale::system().toDouble(amount_input_->text(), &ok);- if (!ok || ui_amount <= 0.0) return;+ bool ok_d = false;+ const double ui_amount = QLocale::system().toDouble(amount_input_->text(), &ok_d);+ if (!ok_d || ui_amount <= 0.0) return;const auto pubkey = current_pubkey_;const int slip_pct = slippage_pct();const int slip_bps_for_display = slippage_bps();- const auto action = (mode_ == Mode::BuyFncpt)+ // The supported-pair gate above guarantees this is SOL→FNCPT or FNCPT→SOL.+ const bool buying_fncpt = is_native_sol(from_mint_) && is_fncpt(to_mint_);+ const auto action = buying_fncpt? fincept::wallet::PumpFunSwapService::Action::Buy: fincept::wallet::PumpFunSwapService::Action::Sell;// BUY: amount is in SOL (denominatedInSol=true).// SELL: amount is in FNCPT (denominatedInSol=false).- const bool denom_in_sol = (mode_ == Mode::BuyFncpt);-- // Build the user-facing summary from local estimate. PumpPortal will- // produce the canonical numbers when build_swap returns; the wallet- // shows the decoded transaction independently. Confirm dialog values- // here are the panel's expectation; mismatches with PumpPortal's- // result would be visible in the wallet popup.- WalletActionSummary summary;- summary.title = QStringLiteral("SWAP");- summary.lede = tr("Approve in your wallet to forward this transaction "- "to the network. The terminal does not hold any funds.");- if (mode_ == Mode::BuyFncpt) {- const double est_fncpt = ui_amount / last_fncpt_sol_price_;- summary.rows.append({QStringLiteral("ROUTE"),- QStringLiteral("PumpSwap (pool=auto)"), true});- summary.rows.append({QStringLiteral("YOU PAY"),- QStringLiteral("%1 SOL").arg(format_token(ui_amount, 6)),- true});- summary.rows.append({QStringLiteral("YOU RECEIVE"),- tr("≈ %1 $FNCPT (PumpSwap fills at execution)")- .arg(format_token(est_fncpt, 2)),- true});- } else {- const double est_sol = ui_amount * last_fncpt_sol_price_;- summary.rows.append({QStringLiteral("ROUTE"),- QStringLiteral("PumpSwap (pool=auto)"), true});- summary.rows.append({QStringLiteral("YOU PAY"),- QStringLiteral("%1 $FNCPT").arg(format_token(ui_amount, 2)),- true});- summary.rows.append({QStringLiteral("YOU RECEIVE"),- tr("≈ %1 SOL (PumpSwap fills at execution)")- .arg(format_token(est_sol, 6)),- true});- }- summary.rows.append({QStringLiteral("MAX SLIPPAGE"),- format_bps(slip_bps_for_display), true});- summary.rows.append({QStringLiteral("PRIORITY FEE"),- QStringLiteral("%1 SOL")- .arg(format_token(kDefaultPriorityFeeSol, 6)),- true});- summary.warnings.append(- tr("PumpSwap will reject the trade if execution drifts more than "- "the slippage tolerance above. Your funds stay in your wallet."));- summary.primary_button_text = QStringLiteral("SWAP");- summary.primary_is_safe = true;- summary.arm_delay_ms = 1500;-- auto* dlg = new WalletActionConfirmDialog(summary, this);+ const bool denom_in_sol = buying_fncpt;++ const double from_sol_p = price_sol_.value(from_mint_, 0.0);+ const double to_sol_p = price_sol_.value(to_mint_, 0.0);+ const double est_out = (to_sol_p > 0.0) ? (ui_amount * from_sol_p / to_sol_p) : 0.0;++ set_busy(true);+ clear_error_strip();+ status_label_->setText(tr("Building swap transaction…"));+QPointer<SwapPanel> self = this;- connect(dlg, &WalletActionConfirmDialog::confirmed, this,- [self, svc, pubkey, ui_amount, action, denom_in_sol, slip_pct]() {+ svc->build_swap(action,+ QString::fromLatin1(fincept::wallet::kFncptMint),+ ui_amount,+ denom_in_sol,+ pubkey,+ slip_pct,+ kDefaultPriorityFeeSol,+ [self, ui_amount, buying_fncpt, est_out, slip_bps_for_display](+ Result<fincept::wallet::PumpFunSwapService::SwapTransaction> r) {if (!self) return;- self->set_busy(true);- self->status_label_->setText(self->tr("Building swap transaction…"));-- QPointer<SwapPanel> guard = self;- svc->build_swap(action,- QString::fromLatin1(kFncptMint),- ui_amount,- denom_in_sol,- pubkey,- slip_pct,- kDefaultPriorityFeeSol,- [guard](Result<fincept::wallet::PumpFunSwapService::SwapTransaction> r) {- if (!guard) return;- if (r.is_err()) {- guard->set_busy(false);- guard->show_error_strip(- QObject::tr("build_swap failed: %1")- .arg(QString::fromStdString(r.error())));- guard->status_label_->setText(QObject::tr("Failed."));+ if (r.is_err()) {+ self->set_busy(false);+ self->show_error_strip(+ QObject::tr("build_swap failed: %1")+ .arg(QString::fromStdString(r.error())));+ self->status_label_->setText(QObject::tr("Failed."));+ return;+ }+ const auto tx = r.value();++ // ── MITM gate (Phase 2 §2) ──────────────────────────────────────+ // Simulate the unsigned tx against the user's RPC. If it would+ // revert, refuse to show the wallet — a malicious PumpPortal+ // response that built a draining or malformed tx is caught here.+ self->status_label_->setText(QObject::tr("Validating with RPC…"));+ auto* rpc = new fincept::wallet::SolanaRpcClient(self);+ rpc->reload_endpoint();+ rpc->simulate_transaction(tx.tx_base64,+ [self, tx, ui_amount, buying_fncpt, est_out, slip_bps_for_display, rpc](+ Result<fincept::wallet::SolanaRpcClient::SimulationResult> sr) {+ rpc->deleteLater();+ if (!self) return;+ if (sr.is_err()) {+ self->set_busy(false);+ self->show_error_strip(+ QObject::tr("Simulation failed: %1. Refusing to sign.")+ .arg(QString::fromStdString(sr.error())));+ self->status_label_->setText(QObject::tr("Aborted."));return;}- const auto tx = r.value();- guard->status_label_->setText(QObject::tr("Awaiting wallet signature…"));- fincept::wallet::WalletService::instance().sign_and_send(- tx.tx_base64,- QObject::tr("Sign swap"),- QObject::tr("Approve the swap in your wallet to complete the trade."),- guard,- [guard](Result<QString> sr) {- if (!guard) return;- if (sr.is_err()) {- guard->set_busy(false);- guard->show_error_strip(- QObject::tr("Signing failed: %1")- .arg(QString::fromStdString(sr.error())));- guard->status_label_->setText(QObject::tr("Cancelled."));+ const auto sim = sr.value();+ if (!sim.ok) {+ LOG_WARN("SwapPanel",+ "simulateTransaction reported err: " + sim.err);+ self->set_busy(false);+ self->show_error_strip(+ QObject::tr("This swap would fail on-chain: %1. "+ "Refusing to sign.").arg(sim.err));+ self->status_label_->setText(QObject::tr("Aborted."));+ return;+ }++ // ── Confirm dialog ──────────────────────────────────────────+ WalletActionSummary summary;+ summary.title = QStringLiteral("SWAP");+ summary.lede = QObject::tr(+ "Approve in your wallet to forward this transaction "+ "to the network. The terminal does not hold any funds.");+ summary.rows.append({QStringLiteral("ROUTE"),+ QStringLiteral("PumpSwap (pool=auto)"), true});+ if (buying_fncpt) {+ summary.rows.append({QStringLiteral("YOU PAY"),+ QStringLiteral("%1 SOL")+ .arg(format_token(ui_amount, 6)),+ true});+ summary.rows.append({QStringLiteral("YOU RECEIVE"),+ QObject::tr("≈ %1 $FNCPT (PumpSwap fills at execution)")+ .arg(format_token(est_out, 2)),+ true});+ } else {+ summary.rows.append({QStringLiteral("YOU PAY"),+ QStringLiteral("%1 $FNCPT")+ .arg(format_token(ui_amount, 2)),+ true});+ summary.rows.append({QStringLiteral("YOU RECEIVE"),+ QObject::tr("≈ %1 SOL (PumpSwap fills at execution)")+ .arg(format_token(est_out, 6)),+ true});+ }+ summary.rows.append({QStringLiteral("MAX SLIPPAGE"),+ format_bps(slip_bps_for_display), true});+ summary.rows.append({QStringLiteral("PRIORITY FEE"),+ QStringLiteral("%1 SOL")+ .arg(format_token(kDefaultPriorityFeeSol, 6)),+ true});+ summary.rows.append({QStringLiteral("RPC SIMULATION"),+ QStringLiteral("OK · %1 CU")+ .arg(QString::number(sim.units_consumed)),+ true});+ summary.warnings.append(QObject::tr(+ "PumpSwap will reject the trade if execution drifts more than "+ "the slippage tolerance above. Your funds stay in your wallet."));+ summary.primary_button_text = QStringLiteral("SWAP");+ summary.primary_is_safe = true;+ summary.arm_delay_ms = 1500;++ auto* dlg = new WalletActionConfirmDialog(summary, self);+ const QString tx_b64 = tx.tx_base64;+ QObject::connect(dlg, &WalletActionConfirmDialog::confirmed, self,+ [self, tx_b64]() {+ if (!self) return;++ // ── Freshness gate (Phase 2 §2) ───────────────────────────+ // The tx may have been sitting in the dialog for several+ // seconds. Re-simulate with replace=false so an expired+ // blockhash is caught before the wallet signs. If the+ // simulation fails with BlockhashNotFound (or any other+ // freshness-related error), abort and ask the user to retry.+ self->status_label_->setText(QObject::tr("Re-checking freshness…"));+ auto* fresh_rpc = new fincept::wallet::SolanaRpcClient(self);+ fresh_rpc->reload_endpoint();+ fresh_rpc->simulate_transaction(tx_b64,+ [self, tx_b64, fresh_rpc](+ Result<fincept::wallet::SolanaRpcClient::SimulationResult> fr) {+ fresh_rpc->deleteLater();+ if (!self) return;+ if (fr.is_err()) {+ self->set_busy(false);+ self->show_error_strip(+ QObject::tr("Could not verify freshness: %1. "+ "Try the swap again.")+ .arg(QString::fromStdString(fr.error())));+ self->status_label_->setText(QObject::tr("Aborted."));+ return;+ }+ const auto fsim = fr.value();+ if (!fsim.ok) {+ // BlockhashNotFound is the canonical staleness error.+ // Anything else here also means "don't sign."+ self->set_busy(false);+ self->show_error_strip(+ QObject::tr("This swap is no longer fresh: %1. "+ "Click SWAP again to rebuild.")+ .arg(fsim.err));+ self->status_label_->setText(QObject::tr("Stale."));return;}- const auto sig = sr.value();- guard->status_label_->setText(- QObject::tr("Sent. Waiting for confirmation…"));- LOG_INFO("SwapPanel", "submitted: " + sig);-- // Poll getSignatureStatuses until confirmed (or give up).- auto* rpc = new fincept::wallet::SolanaRpcClient(guard);- rpc->reload_endpoint();- auto attempts = std::make_shared<int>(0);- auto* poll_timer = new QTimer(guard);- poll_timer->setInterval(kStatusPollMs);- QPointer<SwapPanel> poll_guard = guard;- QObject::connect(poll_timer, &QTimer::timeout, guard,- [poll_guard, rpc, sig, attempts, poll_timer]() {- if (!poll_guard) {- poll_timer->stop();- poll_timer->deleteLater();- return;- }- if (++(*attempts) > kStatusPollMaxAttempts) {- poll_timer->stop();- poll_timer->deleteLater();- poll_guard->set_busy(false);- poll_guard->show_error_strip(- QObject::tr("No confirmation after 60 s. Check Solscan."));- poll_guard->status_label_->setText(QObject::tr("Timed out."));- return;- }- rpc->get_signature_statuses(QStringList{sig},- [poll_guard, sig, poll_timer](- Result<std::vector<fincept::wallet::SolanaRpcClient::SignatureStatus>> r) {- if (!poll_guard) return;- if (r.is_err()) return; // transient — keep polling- const auto& vec = r.value();- if (vec.empty() || !vec[0].found) return;- const auto& s = vec[0];- if (!s.err.isEmpty()) {- poll_timer->stop();- poll_timer->deleteLater();- poll_guard->set_busy(false);- poll_guard->show_error_strip(- QObject::tr("Tx failed on-chain: %1").arg(s.err));- poll_guard->status_label_->setText(QObject::tr("Reverted."));++ // ── Sign and send ─────────────────────────────────────+ self->status_label_->setText(QObject::tr("Awaiting wallet signature…"));+ fincept::wallet::WalletService::instance().sign_and_send(+ tx_b64,+ QObject::tr("Sign swap"),+ QObject::tr("Approve the swap in your wallet to complete the trade."),+ self,+ [self](Result<QString> sr2) {+ if (!self) return;+ if (sr2.is_err()) {+ self->set_busy(false);+ self->show_error_strip(+ QObject::tr("Signing failed: %1")+ .arg(QString::fromStdString(sr2.error())));+ self->status_label_->setText(QObject::tr("Cancelled."));return;}- if (s.confirmation_status == QStringLiteral("confirmed")- || s.confirmation_status == QStringLiteral("finalized")) {- poll_timer->stop();- poll_timer->deleteLater();- poll_guard->set_busy(false);- poll_guard->amount_input_->clear();- poll_guard->out_amount_label_->setText(QStringLiteral("—"));- poll_guard->status_label_->setText(- QObject::tr("Confirmed: %1…").arg(sig.left(12)));- fincept::wallet::WalletService::instance()- .force_balance_refresh();- }+ const auto sig = sr2.value();+ self->status_label_->setText(+ QObject::tr("Sent. Waiting for confirmation…"));+ LOG_INFO("SwapPanel", "submitted: " + sig);+ self->start_status_poll(sig);});- });- poll_timer->start();- });+ }, /*replace_recent_blockhash=*/false);+ });+ QObject::connect(dlg, &WalletActionConfirmDialog::cancelled, self,+ [self]() {+ if (!self) return;+ self->set_busy(false);+ self->status_label_->setText(self->tr("Cancelled."));+ });+ dlg->setAttribute(Qt::WA_DeleteOnClose);+ dlg->open();});});- connect(dlg, &WalletActionConfirmDialog::cancelled, this, [self]() {- if (!self) return;- self->status_label_->setText(self->tr("Cancelled."));- });- dlg->setAttribute(Qt::WA_DeleteOnClose);- dlg->open();}} // namespace fincept::screens::panelsdiff --git a/fincept-qt/src/screens/crypto_center/panels/SwapPanel.h b/fincept-qt/src/screens/crypto_center/panels/SwapPanel.hindex 90370e1c3..ae6248139 100644--- a/fincept-qt/src/screens/crypto_center/panels/SwapPanel.h+++ b/fincept-qt/src/screens/crypto_center/panels/SwapPanel.h@@ -1,7 +1,9 @@#pragma once#include "core/result/Result.h"+#include "services/wallet/WalletTypes.h"+#include <QHash>#include <QString>#include <QVariant>#include <QWidget>@@ -19,64 +21,93 @@ namespace fincept::screens::panels {/// SWAP panel inside the TRADE tab. Phase 2 rev 2 — PumpPortal-backed.///+/// Stage 2A.5.10 generalised the FROM/TO selectors to combos populated from+/// real holdings. PumpPortal `trade-local` only routes SOL ↔ $FNCPT (it's the+/// issuer's own endpoint, not a generalised router), so the SWAP button is+/// gated to those two pairs in Phase 2. Selecting any other FROM mint shows+/// a "Phase 3 supports arbitrary pairs" message and disables submit. The+/// combo plumbing is forward-compatible: when Stage 2C lifts the constraint,+/// no UI rework is needed.+////// Flow:-/// 1. User edits the YOU PAY amount. The panel computes the **estimated-/// output** locally from the live `market:price:fncpt` spot times the-/// slippage budget. There is no quote-API round-trip — PumpPortal has-/// no quote endpoint, only "build me a tx now."-/// 2. User clicks SWAP → SwapPanel calls-/// `PumpFunSwapService::build_swap(action, mint, amount, …)` to-/// materialise the unsigned versioned tx body, then constructs a-/// `WalletActionConfirmDialog`. On Confirm, it forwards to-/// `WalletService::sign_and_send` and polls `getSignatureStatuses`-/// until `confirmed`.+/// 1. User picks FROM and TO from combos populated by `wallet:balance:<pk>`+/// and the Jupiter verified list (TO only). Default selection mirrors a+/// BUY $FNCPT direction (FROM=SOL, TO=$FNCPT).+/// 2. User edits the YOU PAY amount. The panel computes estimated output+/// locally from `market:price:token:<mint>` for both legs, times the+/// slippage budget. PumpPortal has no quote endpoint.+/// 3. User clicks SWAP → `PumpFunSwapService::build_swap(...)` returns the+/// unsigned tx → `WalletActionConfirmDialog` → `sign_and_send` → poll+/// `getSignatureStatuses` until confirmed.///-/// Refuses to enable SWAP if there's no spot price yet or no wallet is-/// connected. All visual error reporting goes through the panel's own-/// error strip, not stderr or LOG_*.+/// Public `set_from_mint(mint)` lets `HomeTab::select_token` pre-fill the+/// FROM combo when the user clicks a row in the holdings table.class SwapPanel : public QWidget {Q_OBJECTpublic:explicit SwapPanel(QWidget* parent = nullptr);~SwapPanel() override;+ /// Pre-fill the FROM combo with the given mint. If the mint isn't in the+ /// FROM combo yet (e.g. holdings haven't published), it's queued and+ /// applied as soon as the next `wallet:balance:<pk>` publish lands.+ /// No-op if `mint` is empty.+ void set_from_mint(const QString& mint);+protected:void showEvent(QShowEvent* e) override;void hideEvent(QHideEvent* e) override;private:- enum class Mode { BuyFncpt, SellFncpt };-void build_ui();void apply_theme();void on_wallet_connected(const QString& pubkey, const QString& label);void on_wallet_disconnected();void on_balance_update(const QVariant& v);- void on_price_update(const QVariant& v);+ void on_price_update(const QString& mint, const QVariant& v);void on_topic_error(const QString& topic, const QString& error);void on_amount_changed(const QString& s);- void on_mode_changed(int idx);+ void on_from_changed(int idx);+ void on_to_changed(int idx);void on_max_clicked();void on_swap_clicked();- void update_inputs_from_balance();+ void rebuild_from_combo();+ void rebuild_to_combo();+ void resubscribe_prices();+ void update_balance_label();void recompute_estimate();void show_error_strip(const QString& msg);void clear_error_strip();void set_busy(bool busy);bool can_submit() const;+ bool is_supported_pair() const;+ QString unsupported_pair_message() const;int slippage_pct() const;int slippage_bps() const;+ /// Poll `getSignatureStatuses` after `sign_and_send` until the tx is+ /// confirmed, errored, or the attempt cap is reached. Owned by a parented+ /// QTimer; auto-cleans on destruction.+ void start_status_poll(const QString& sig);++ /// Find a holding by mint in `latest_balance_.tokens`, returning nullopt+ /// if not held. Native SOL (sol_lamports) is surfaced as a synthetic+ /// `TokenHolding` for the wrapped-SOL mint.+ const fincept::wallet::TokenHolding* holding_for(const QString& mint) const;++ /// Native-SOL holding wrapped as a TokenHolding for combo display.+ /// Stored on the panel so we can return a stable pointer from holding_for.+ mutable fincept::wallet::TokenHolding sol_holding_;+// UI- QComboBox* mode_combo_ = nullptr; // BUY $FNCPT / SELL $FNCPT+ QComboBox* from_combo_ = nullptr;+ QComboBox* to_combo_ = nullptr;QLineEdit* amount_input_ = nullptr;QPushButton* max_button_ = nullptr;- QLabel* in_token_label_ = nullptr;QLabel* in_balance_label_ = nullptr;QLabel* out_amount_label_ = nullptr;- QLabel* out_token_label_ = nullptr;QLabel* route_label_ = nullptr;QLabel* impact_label_ = nullptr;QLabel* slippage_label_ = nullptr;@@ -85,18 +116,22 @@ class SwapPanel : public QWidget {QPushButton* swap_button_ = nullptr;QLabel* status_label_ = nullptr;- // Debounce timer for amount input → quote topic switch.+ // Debounce for estimate recompute on every keystroke.QTimer* debounce_timer_ = nullptr;// StateQString current_pubkey_;QString current_balance_topic_;- Mode mode_ = Mode::BuyFncpt;- double sol_balance_ = 0.0;- double fncpt_balance_ = 0.0;- int fncpt_decimals_ = 6; // pump.fun default; refreshed on balance publish- double last_fncpt_usd_price_ = 0.0; // refreshed on market:price:fncpt publish- double last_fncpt_sol_price_ = 0.0; // FNCPT priced in SOL+ fincept::wallet::WalletBalance latest_balance_;+ QString from_mint_;+ QString to_mint_;+ /// Set when a caller (HomeTab::select_token) wants the FROM combo+ /// switched to a specific mint that may not be present in the combo yet.+ /// Cleared once applied.+ QString pending_from_mint_;+ QHash<QString, double> price_usd_; ///< mint → USD per 1 token+ QHash<QString, double> price_sol_; ///< mint → SOL per 1 token+ QHash<QString, QString> price_topic_; ///< mint → topic (for unsubscribe)bool busy_ = false;};diff --git a/fincept-qt/src/screens/crypto_center/panels/TierPanel.cpp b/fincept-qt/src/screens/crypto_center/panels/TierPanel.cppnew file mode 100644index 000000000..94a005ba6--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/panels/TierPanel.cpp@@ -0,0 +1,279 @@+#include "screens/crypto_center/panels/TierPanel.h"++#include "core/logging/Logger.h"+#include "datahub/DataHub.h"+#include "services/billing/TierConfig.h"+#include "services/wallet/WalletService.h"+#include "services/wallet/WalletTypes.h"+#include "ui/theme/Theme.h"++#include <QFrame>+#include <QHBoxLayout>+#include <QHideEvent>+#include <QLabel>+#include <QLocale>+#include <QShowEvent>+#include <QStyle>+#include <QVBoxLayout>++#include <cmath>++namespace fincept::screens::panels {++namespace {++QString font_stack() {+ return QStringLiteral(+ "'Consolas','Cascadia Mono','JetBrains Mono','SF Mono',monospace");+}++double atomic_to_ui(const QString& raw, int decimals) {+ if (raw.isEmpty()) return 0.0;+ bool ok = false;+ const auto u = raw.toULongLong(&ok);+ if (!ok) return 0.0;+ return static_cast<double>(u) / std::pow(10.0, std::max(0, decimals));+}++QString format_token(double v, int dp = 0) {+ if (v <= 0.0) return QStringLiteral("0");+ return QLocale::system().toString(v, 'f', dp);+}++} // namespace++TierPanel::TierPanel(QWidget* parent) : QWidget(parent) {+ setObjectName(QStringLiteral("tierPanel"));+ build_ui();+ apply_theme();++ auto& svc = fincept::wallet::WalletService::instance();+ connect(&svc, &fincept::wallet::WalletService::wallet_connected, this,+ &TierPanel::on_wallet_connected);+ connect(&svc, &fincept::wallet::WalletService::wallet_disconnected, this,+ &TierPanel::on_wallet_disconnected);++ if (svc.is_connected()) {+ on_wallet_connected(svc.current_pubkey(), svc.state().label);+ } else {+ on_wallet_disconnected();+ }+}++TierPanel::~TierPanel() = default;++void TierPanel::build_ui() {+ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(0, 0, 0, 0);+ root->setSpacing(0);++ // Head+ auto* head = new QWidget(this);+ head->setObjectName(QStringLiteral("tierHead"));+ head->setFixedHeight(34);+ auto* hl = new QHBoxLayout(head);+ hl->setContentsMargins(12, 0, 12, 0);+ hl->setSpacing(8);+ auto* title = new QLabel(QStringLiteral("TIER"), head);+ title->setObjectName(QStringLiteral("tierTitle"));+ current_label_ = new QLabel(QStringLiteral("current FREE"), head);+ current_label_->setObjectName(QStringLiteral("tierHeadCaption"));+ hl->addWidget(title);+ hl->addStretch();+ hl->addWidget(current_label_);+ root->addWidget(head);++ auto* body = new QWidget(this);+ body->setObjectName(QStringLiteral("tierBody"));+ auto* bl = new QVBoxLayout(body);+ bl->setContentsMargins(14, 14, 14, 14);+ bl->setSpacing(8);++ auto build_row = [body, bl](TierRow& row, const QString& label,+ const QString& threshold,+ const QString& unlocks) {+ row.host = new QFrame(body);+ row.host->setObjectName(QStringLiteral("tierRow"));+ auto* row_l = new QHBoxLayout(row.host);+ row_l->setContentsMargins(10, 8, 10, 8);+ row_l->setSpacing(12);+ row.label = new QLabel(label, row.host);+ row.label->setObjectName(QStringLiteral("tierRowLabel"));+ row.label->setMinimumWidth(80);+ row.threshold = new QLabel(threshold, row.host);+ row.threshold->setObjectName(QStringLiteral("tierRowThreshold"));+ row.threshold->setMinimumWidth(140);+ row.unlocks = new QLabel(unlocks, row.host);+ row.unlocks->setObjectName(QStringLiteral("tierRowUnlocks"));+ row.chip = new QLabel(QStringLiteral("[locked]"), row.host);+ row.chip->setObjectName(QStringLiteral("tierRowChipLocked"));+ row_l->addWidget(row.label);+ row_l->addWidget(row.threshold);+ row_l->addWidget(row.unlocks, 1);+ row_l->addWidget(row.chip);+ bl->addWidget(row.host);+ };++ build_row(bronze_row_, QStringLiteral("BRONZE"),+ QStringLiteral("100+ veFNCPT"),+ tr("basic API quota"));+ build_row(silver_row_, QStringLiteral("SILVER"),+ QStringLiteral("1,000+ veFNCPT"),+ tr("premium screens"));+ build_row(gold_row_, QStringLiteral("GOLD"),+ QStringLiteral("10,000+ veFNCPT"),+ tr("all agents + arena"));++ footer_ = new QLabel(tr("Connect a wallet to see your tier."), body);+ footer_->setObjectName(QStringLiteral("tierFooter"));+ footer_->setAlignment(Qt::AlignLeft);+ bl->addWidget(footer_);++ bl->addStretch(1);+ root->addWidget(body, 1);+}++void TierPanel::apply_theme() {+ using namespace ui::colors;+ const QString font = font_stack();++ const QString ss = QStringLiteral(+ "QWidget#tierPanel { background:%1; }"+ "QWidget#tierHead { background:%2; border-bottom:1px solid %3; }"+ "QLabel#tierTitle { color:%4; font-family:%5; font-size:11px;"+ " font-weight:700; letter-spacing:1.4px; background:transparent; }"+ "QLabel#tierHeadCaption { color:%6; font-family:%5; font-size:10px;"+ " font-weight:600; letter-spacing:1.2px; background:transparent; }"+ "QWidget#tierBody { background:%1; }"+ "QFrame#tierRow { background:%8; border:1px solid %3; }"+ "QFrame#tierRowCurrent { background:rgba(217,119,6,0.10); border:1px solid %12; }"+ "QLabel#tierRowLabel { color:%4; font-family:%5; font-size:11px;"+ " font-weight:700; letter-spacing:1.4px; background:transparent; }"+ "QLabel#tierRowThreshold { color:%7; font-family:%5; font-size:11px;"+ " background:transparent; }"+ "QLabel#tierRowUnlocks { color:%6; font-family:%5; font-size:11px;"+ " background:transparent; }"+ "QLabel#tierRowChipAchieved { color:%4; background:rgba(217,119,6,0.10);"+ " border:1px solid %12; font-family:%5; font-size:9px; font-weight:700;"+ " letter-spacing:1.2px; padding:2px 6px; }"+ "QLabel#tierRowChipLocked { color:%6; background:transparent;"+ " border:1px solid %3; font-family:%5; font-size:9px; font-weight:700;"+ " letter-spacing:1.2px; padding:2px 6px; }"+ "QLabel#tierFooter { color:%6; font-family:%5; font-size:10px;"+ " background:transparent; padding-top:6px; }"+ )+ .arg(BG_BASE(), // %1+ BG_SURFACE(), // %2+ BORDER_DIM(), // %3+ AMBER(), // %4+ font, // %5+ TEXT_TERTIARY(), // %6+ TEXT_PRIMARY(), // %7+ BG_RAISED(), // %8+ NEGATIVE()) // %9+ .arg(BG_HOVER(), // %10+ BORDER_BRIGHT(), // %11+ QStringLiteral("#78350f")); // %12 darker amber+ setStyleSheet(ss);+}++// ── Lifecycle ──────────────────────────────────────────────────────────────++void TierPanel::on_wallet_connected(const QString& pubkey, const QString& /*label*/) {+ current_pubkey_ = pubkey;+ if (isVisible() && current_topic_.isEmpty()) {+ current_topic_ = QStringLiteral("billing:tier:%1").arg(pubkey);+ auto& hub = fincept::datahub::DataHub::instance();+ hub.subscribe(this, current_topic_,+ [this](const QVariant& v) { on_tier_update(v); });+ hub.request(current_topic_, /*force=*/false);+ }+}++void TierPanel::on_wallet_disconnected() {+ fincept::datahub::DataHub::instance().unsubscribe(this);+ current_topic_.clear();+ current_pubkey_.clear();+ render_state(fincept::wallet::TierStatus::Tier::Free,+ QString(), QString(), false);+ footer_->setText(tr("Connect a wallet to see your tier."));+ footer_->show();+}++void TierPanel::showEvent(QShowEvent* e) {+ QWidget::showEvent(e);+ if (!current_pubkey_.isEmpty() && current_topic_.isEmpty()) {+ current_topic_ = QStringLiteral("billing:tier:%1").arg(current_pubkey_);+ auto& hub = fincept::datahub::DataHub::instance();+ hub.subscribe(this, current_topic_,+ [this](const QVariant& v) { on_tier_update(v); });+ hub.request(current_topic_, /*force=*/false);+ }+}++void TierPanel::hideEvent(QHideEvent* e) {+ QWidget::hideEvent(e);+ fincept::datahub::DataHub::instance().unsubscribe(this);+ current_topic_.clear();+}++void TierPanel::on_tier_update(const QVariant& v) {+ if (!v.canConvert<fincept::wallet::TierStatus>()) return;+ const auto s = v.value<fincept::wallet::TierStatus>();+ const double weight_ui = atomic_to_ui(s.weight_raw, s.decimals);+ const double next_ui = atomic_to_ui(s.next_threshold_raw, s.decimals);+ render_state(s.tier,+ QStringLiteral("%1 veFNCPT").arg(format_token(weight_ui, 1)),+ next_ui > 0.0+ ? QStringLiteral("%1 veFNCPT").arg(format_token(next_ui, 0))+ : QString(),+ s.is_mock);+}++void TierPanel::render_state(fincept::wallet::TierStatus::Tier current,+ const QString& weight_ui_str,+ const QString& next_threshold_ui_str,+ bool is_mock) {+ using Tier = fincept::wallet::TierStatus::Tier;++ auto set_row = [](TierRow& row, bool achieved, bool is_current) {+ row.chip->setText(achieved ? QStringLiteral("[achieved]")+ : QStringLiteral("[locked]"));+ row.chip->setObjectName(achieved ? QStringLiteral("tierRowChipAchieved")+ : QStringLiteral("tierRowChipLocked"));+ row.host->setObjectName(is_current ? QStringLiteral("tierRowCurrent")+ : QStringLiteral("tierRow"));+ row.chip->style()->unpolish(row.chip);+ row.chip->style()->polish(row.chip);+ row.host->style()->unpolish(row.host);+ row.host->style()->polish(row.host);+ };++ set_row(bronze_row_, current >= Tier::Bronze, current == Tier::Bronze);+ set_row(silver_row_, current >= Tier::Silver, current == Tier::Silver);+ set_row(gold_row_, current >= Tier::Gold, current == Tier::Gold);++ QString head_text = QStringLiteral("current %1")+ .arg(fincept::billing::TierConfig::label_for(current));+ if (is_mock) head_text += QStringLiteral(" · DEMO");+ if (!weight_ui_str.isEmpty()) {+ head_text += QStringLiteral(" · %1").arg(weight_ui_str);+ }+ current_label_->setText(head_text);++ if (current_pubkey_.isEmpty()) {+ footer_->setText(tr("Connect a wallet to see your tier."));+ footer_->show();+ } else if (!next_threshold_ui_str.isEmpty()) {+ footer_->setText(tr("Next: lock %1 to reach the next tier.")+ .arg(next_threshold_ui_str));+ footer_->show();+ } else if (current == Tier::Gold) {+ footer_->setText(tr("All Fincept Terminal features unlocked."));+ footer_->show();+ } else {+ footer_->hide();+ }+}++} // namespace fincept::screens::panelsdiff --git a/fincept-qt/src/screens/crypto_center/panels/TierPanel.h b/fincept-qt/src/screens/crypto_center/panels/TierPanel.hnew file mode 100644index 000000000..a164629c7--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/panels/TierPanel.h@@ -0,0 +1,72 @@+#pragma once++#include "services/wallet/WalletTypes.h"++#include <QString>+#include <QVariant>+#include <QWidget>++class QFrame;+class QHideEvent;+class QLabel;+class QShowEvent;++namespace fincept::screens::panels {++/// TierPanel — bottom section of the STAKE tab (Phase 3 §3.2).+///+/// Three rows:+/// BRONZE 100+ veFNCPT basic API quota+/// SILVER 1k+ veFNCPT premium screens+/// GOLD 10k+ veFNCPT all agents + arena+///+/// Each row shows an [achieved] / [locked] chip on the right, and the+/// current tier's row is highlighted (amber border). Subscribes+/// `billing:tier:<pubkey>`. Empty state (no wallet) shows all rows in+/// "[locked]" with a small "Connect a wallet to see your tier" footnote.+class TierPanel : public QWidget {+ Q_OBJECT+ public:+ explicit TierPanel(QWidget* parent = nullptr);+ ~TierPanel() override;++ protected:+ void showEvent(QShowEvent* e) override;+ void hideEvent(QHideEvent* e) override;++ private:+ void build_ui();+ void apply_theme();++ void on_wallet_connected(const QString& pubkey, const QString& label);+ void on_wallet_disconnected();+ void on_tier_update(const QVariant& v);++ void render_state(fincept::wallet::TierStatus::Tier current,+ const QString& weight_ui_str,+ const QString& next_threshold_ui_str,+ bool is_mock);++ struct TierRow {+ QFrame* host = nullptr;+ QLabel* label = nullptr;+ QLabel* threshold = nullptr;+ QLabel* unlocks = nullptr;+ QLabel* chip = nullptr;+ };++ // Head+ QLabel* current_label_ = nullptr;++ // Body+ TierRow bronze_row_;+ TierRow silver_row_;+ TierRow gold_row_;+ QLabel* footer_ = nullptr;++ // State+ QString current_pubkey_;+ QString current_topic_;+};++} // namespace fincept::screens::panelsdiff --git a/fincept-qt/src/screens/crypto_center/panels/TreasuryPanel.cpp b/fincept-qt/src/screens/crypto_center/panels/TreasuryPanel.cppnew file mode 100644index 000000000..85669363e--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/panels/TreasuryPanel.cpp@@ -0,0 +1,297 @@+#include "screens/crypto_center/panels/TreasuryPanel.h"++#include "core/logging/Logger.h"+#include "datahub/DataHub.h"+#include "services/wallet/WalletTypes.h"+#include "ui/theme/Theme.h"++#include <QDesktopServices>+#include <QFrame>+#include <QHBoxLayout>+#include <QHideEvent>+#include <QLabel>+#include <QLocale>+#include <QPushButton>+#include <QShowEvent>+#include <QStyle>+#include <QUrl>+#include <QVBoxLayout>++namespace fincept::screens::panels {++namespace {++constexpr const char* kTopicReserves = "treasury:reserves";+constexpr const char* kTopicRunway = "treasury:runway";++QString font_stack() {+ return QStringLiteral(+ "'Consolas','Cascadia Mono','JetBrains Mono','SF Mono',monospace");+}++QString format_usd(double v, int dp = 0) {+ if (v <= 0.0) return QStringLiteral("$0");+ return QStringLiteral("$%1").arg(QLocale::system().toString(v, 'f', dp));+}++QString format_usd_compact(double v) {+ if (v <= 0.0) return QStringLiteral("$0");+ if (v >= 1e9) return QStringLiteral("$%1B")+ .arg(QLocale::system().toString(v / 1e9, 'f', 2));+ if (v >= 1e6) return QStringLiteral("$%1M")+ .arg(QLocale::system().toString(v / 1e6, 'f', 2));+ if (v >= 1e3) return QStringLiteral("$%1k")+ .arg(QLocale::system().toString(v / 1e3, 'f', 1));+ return format_usd(v, 0);+}++QString format_sol(quint64 lamports) {+ const double sol = static_cast<double>(lamports) / 1e9;+ return QLocale::system().toString(sol, 'f', 2);+}++} // namespace++TreasuryPanel::TreasuryPanel(QWidget* parent) : QWidget(parent) {+ setObjectName(QStringLiteral("treasuryPanel"));+ build_ui();+ apply_theme();++ auto& hub = fincept::datahub::DataHub::instance();+ connect(&hub, &fincept::datahub::DataHub::topic_error, this,+ &TreasuryPanel::on_topic_error);+}++TreasuryPanel::~TreasuryPanel() = default;++void TreasuryPanel::build_ui() {+ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(0, 0, 0, 0);+ root->setSpacing(0);++ // Head+ auto* head = new QWidget(this);+ head->setObjectName(QStringLiteral("treasuryHead"));+ head->setFixedHeight(34);+ auto* hl = new QHBoxLayout(head);+ hl->setContentsMargins(12, 0, 12, 0);+ hl->setSpacing(8);+ auto* title = new QLabel(QStringLiteral("TREASURY"), head);+ title->setObjectName(QStringLiteral("treasuryTitle"));+ status_pill_ = new QLabel(QStringLiteral("LIVE"), head);+ status_pill_->setObjectName(QStringLiteral("treasuryPill"));+ hl->addWidget(title);+ hl->addStretch();+ hl->addWidget(status_pill_);+ root->addWidget(head);++ // Body+ auto* body = new QWidget(this);+ body->setObjectName(QStringLiteral("treasuryBody"));+ auto* bl = new QVBoxLayout(body);+ bl->setContentsMargins(14, 14, 14, 14);+ bl->setSpacing(10);++ auto add_kv = [&](const QString& cap, QLabel*& v_out,+ const QString& obj_name = {}) {+ auto* row = new QHBoxLayout;+ row->setSpacing(8);+ auto* k = new QLabel(cap, body);+ k->setObjectName(QStringLiteral("treasuryCaption"));+ v_out = new QLabel(QStringLiteral("—"), body);+ v_out->setObjectName(obj_name.isEmpty()+ ? QStringLiteral("treasuryValue") : obj_name);+ row->addWidget(k);+ row->addStretch(1);+ row->addWidget(v_out);+ bl->addLayout(row);+ };++ add_kv(QStringLiteral("USDC RESERVES"), usdc_value_);+ add_kv(QStringLiteral("SOL RESERVES"), sol_value_);+ add_kv(QStringLiteral("TOTAL USD"), total_usd_value_,+ QStringLiteral("treasuryValueAmber"));+ add_kv(QStringLiteral("RUNWAY @ CURRENT"), runway_value_);++ // Multisig row — clickable button styled as a link.+ auto* ms_row = new QHBoxLayout;+ ms_row->setSpacing(8);+ auto* ms_cap = new QLabel(QStringLiteral("MULTI-SIG"), body);+ ms_cap->setObjectName(QStringLiteral("treasuryCaption"));+ multisig_button_ = new QPushButton(QStringLiteral("—"), body);+ multisig_button_->setObjectName(QStringLiteral("treasuryMultisig"));+ multisig_button_->setCursor(Qt::PointingHandCursor);+ multisig_button_->setFlat(true);+ multisig_button_->setToolTip(tr("Open Squads vault in browser"));+ connect(multisig_button_, &QPushButton::clicked, this,+ &TreasuryPanel::on_multisig_clicked);+ ms_row->addWidget(ms_cap);+ ms_row->addStretch(1);+ ms_row->addWidget(multisig_button_);+ bl->addLayout(ms_row);++ // Error strip+ error_strip_ = new QFrame(body);+ error_strip_->setObjectName(QStringLiteral("treasuryErrorStrip"));+ auto* es_l = new QHBoxLayout(error_strip_);+ es_l->setContentsMargins(10, 6, 10, 6);+ es_l->setSpacing(8);+ auto* es_icon = new QLabel(QStringLiteral("!"), error_strip_);+ es_icon->setObjectName(QStringLiteral("treasuryErrorIcon"));+ error_text_ = new QLabel(QString(), error_strip_);+ error_text_->setObjectName(QStringLiteral("treasuryErrorText"));+ error_text_->setWordWrap(true);+ es_l->addWidget(es_icon);+ es_l->addWidget(error_text_, 1);+ error_strip_->hide();+ bl->addWidget(error_strip_);++ bl->addStretch(1);+ root->addWidget(body, 1);+}++void TreasuryPanel::apply_theme() {+ using namespace ui::colors;+ const QString font = font_stack();++ const QString ss = QStringLiteral(+ "QWidget#treasuryPanel { background:%1; }"+ "QWidget#treasuryHead { background:%2; border-bottom:1px solid %3; }"+ "QLabel#treasuryTitle { color:%4; font-family:%5; font-size:11px;"+ " font-weight:700; letter-spacing:1.4px; background:transparent; }"+ "QLabel#treasuryPill { color:%7; background:%8; border:1px solid %3;"+ " font-family:%5; font-size:9px; font-weight:700; letter-spacing:1.2px;"+ " padding:2px 8px; }"+ "QLabel#treasuryPillDemo { color:%4; background:rgba(217,119,6,0.10);"+ " border:1px solid %12; font-family:%5; font-size:9px; font-weight:700;"+ " letter-spacing:1.2px; padding:2px 8px; }"+ "QWidget#treasuryBody { background:%1; }"+ "QLabel#treasuryCaption { color:%6; font-family:%5; font-size:9px;"+ " font-weight:700; letter-spacing:1.2px; background:transparent; }"+ "QLabel#treasuryValue { color:%7; font-family:%5; font-size:12px;"+ " background:transparent; }"+ "QLabel#treasuryValueAmber { color:%4; font-family:%5; font-size:13px;"+ " font-weight:700; background:transparent; }"++ "QPushButton#treasuryMultisig { color:%4; font-family:%5; font-size:11px;"+ " text-decoration:underline; background:transparent; border:none;"+ " padding:0; text-align:right; }"+ "QPushButton#treasuryMultisig:hover { color:%11; }"++ "QFrame#treasuryErrorStrip { background:rgba(220,38,38,0.10);"+ " border:1px solid %9; }"+ "QLabel#treasuryErrorIcon { color:%9; font-family:%5; font-size:13px;"+ " font-weight:700; background:transparent; }"+ "QLabel#treasuryErrorText { color:%9; font-family:%5; font-size:11px;"+ " background:transparent; }"+ )+ .arg(BG_BASE(), // %1+ BG_SURFACE(), // %2+ BORDER_DIM(), // %3+ AMBER(), // %4+ font, // %5+ TEXT_TERTIARY(), // %6+ TEXT_PRIMARY(), // %7+ BG_RAISED(), // %8+ NEGATIVE()) // %9+ .arg(BG_HOVER(), // %10+ BORDER_BRIGHT(), // %11+ QStringLiteral("#78350f")); // %12 darker amber++ setStyleSheet(ss);+}++// ── Lifecycle ──────────────────────────────────────────────────────────────++void TreasuryPanel::showEvent(QShowEvent* e) {+ QWidget::showEvent(e);+ auto& hub = fincept::datahub::DataHub::instance();+ hub.subscribe(this, QString::fromLatin1(kTopicReserves),+ [this](const QVariant& v) { on_reserves_update(v); });+ hub.subscribe(this, QString::fromLatin1(kTopicRunway),+ [this](const QVariant& v) { on_runway_update(v); });+ hub.request(QString::fromLatin1(kTopicReserves), /*force=*/false);+ hub.request(QString::fromLatin1(kTopicRunway), /*force=*/false);+}++void TreasuryPanel::hideEvent(QHideEvent* e) {+ QWidget::hideEvent(e);+ fincept::datahub::DataHub::instance().unsubscribe(this);+}++// ── Updates ────────────────────────────────────────────────────────────────++void TreasuryPanel::on_reserves_update(const QVariant& v) {+ if (!v.canConvert<fincept::wallet::TreasuryReserves>()) return;+ const auto r = v.value<fincept::wallet::TreasuryReserves>();+ reserves_is_mock_ = r.is_mock;+ update_demo_chip();++ usdc_value_->setText(format_usd_compact(r.usdc_amount));+ sol_value_->setText(QStringLiteral("%1 SOL (%2)")+ .arg(format_sol(r.sol_lamports))+ .arg(format_usd_compact(static_cast<double>(r.sol_lamports) / 1e9 *+ r.sol_usd_price)));+ total_usd_value_->setText(format_usd_compact(r.total_usd));++ multisig_url_ = r.multisig_url;+ multisig_button_->setText(r.multisig_label.isEmpty()+ ? QStringLiteral("—") : r.multisig_label);+ clear_error_strip();+}++void TreasuryPanel::on_runway_update(const QVariant& v) {+ if (!v.canConvert<fincept::wallet::TreasuryRunway>()) return;+ const auto w = v.value<fincept::wallet::TreasuryRunway>();+ runway_is_mock_ = w.is_mock;+ update_demo_chip();++ if (w.months <= 0.0) {+ runway_value_->setText(QStringLiteral("—"));+ return;+ }+ runway_value_->setText(QStringLiteral("%1 months ($%2/mo)")+ .arg(QLocale::system().toString(w.months, 'f', 0))+ .arg(QLocale::system().toString(w.monthly_opex_usd, 'f', 0)));+}++void TreasuryPanel::on_topic_error(const QString& topic, const QString& error) {+ if (topic != QLatin1String(kTopicReserves)+ && topic != QLatin1String(kTopicRunway)) {+ return;+ }+ show_error_strip(tr("Treasury feed error: %1").arg(error));+}++void TreasuryPanel::on_multisig_clicked() {+ if (multisig_url_.isEmpty()) return;+ QDesktopServices::openUrl(QUrl(multisig_url_));+}++void TreasuryPanel::show_error_strip(const QString& msg) {+ if (!error_strip_) return;+ error_text_->setText(msg);+ error_strip_->show();+}++void TreasuryPanel::clear_error_strip() {+ if (error_strip_ && error_strip_->isVisible()) {+ error_strip_->hide();+ error_text_->clear();+ }+}++void TreasuryPanel::update_demo_chip() {+ const bool any_mock = reserves_is_mock_ || runway_is_mock_;+ if (any_mock) {+ status_pill_->setText(QStringLiteral("DEMO"));+ status_pill_->setObjectName(QStringLiteral("treasuryPillDemo"));+ } else {+ status_pill_->setText(QStringLiteral("LIVE"));+ status_pill_->setObjectName(QStringLiteral("treasuryPill"));+ }+ status_pill_->style()->unpolish(status_pill_);+ status_pill_->style()->polish(status_pill_);+}++} // namespace fincept::screens::panelsdiff --git a/fincept-qt/src/screens/crypto_center/panels/TreasuryPanel.h b/fincept-qt/src/screens/crypto_center/panels/TreasuryPanel.hnew file mode 100644index 000000000..3dbd9e9dc--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/panels/TreasuryPanel.h@@ -0,0 +1,67 @@+#pragma once++#include <QString>+#include <QVariant>+#include <QWidget>++class QHideEvent;+class QLabel;+class QPushButton;+class QShowEvent;++namespace fincept::screens::panels {++/// TreasuryPanel — bottom section of the ROADMAP tab (Phase 5 §5.2).+///+/// Renders treasury reserves (USDC, SOL + USD value), runway months at+/// current burn, and a multi-sig label that deeplinks to Squads.+///+/// Subscribes (visibility-driven, P3):+/// - `treasury:reserves` → USDC / SOL / total / multisig label/url+/// - `treasury:runway` → months derived from reserves+///+/// When data is mocked the head pill reads "DEMO".+class TreasuryPanel : public QWidget {+ Q_OBJECT+ public:+ explicit TreasuryPanel(QWidget* parent = nullptr);+ ~TreasuryPanel() override;++ protected:+ void showEvent(QShowEvent* e) override;+ void hideEvent(QHideEvent* e) override;++ private:+ void build_ui();+ void apply_theme();++ void on_reserves_update(const QVariant& v);+ void on_runway_update(const QVariant& v);+ void on_topic_error(const QString& topic, const QString& error);+ void on_multisig_clicked();++ void show_error_strip(const QString& msg);+ void clear_error_strip();+ void update_demo_chip();++ // Head+ QLabel* status_pill_ = nullptr;++ // Body+ QLabel* usdc_value_ = nullptr;+ QLabel* sol_value_ = nullptr;+ QLabel* total_usd_value_ = nullptr;+ QLabel* runway_value_ = nullptr;+ QPushButton* multisig_button_ = nullptr;++ // Error strip+ QWidget* error_strip_ = nullptr;+ QLabel* error_text_ = nullptr;++ // State+ QString multisig_url_;+ bool reserves_is_mock_ = false;+ bool runway_is_mock_ = false;+};++} // namespace fincept::screens::panelsdiff --git a/fincept-qt/src/screens/crypto_center/tabs/MarketsTab.cpp b/fincept-qt/src/screens/crypto_center/tabs/MarketsTab.cppnew file mode 100644index 000000000..2ab1590c9--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/tabs/MarketsTab.cpp@@ -0,0 +1,65 @@+#include "screens/crypto_center/tabs/MarketsTab.h"++#include "screens/crypto_center/panels/MarketsListPanel.h"+#include "ui/theme/Theme.h"++#include <QFrame>+#include <QScrollArea>+#include <QVBoxLayout>++namespace fincept::screens {++MarketsTab::MarketsTab(QWidget* parent) : QWidget(parent) {+ setObjectName(QStringLiteral("marketsTab"));+ build_ui();+ apply_theme();+}++MarketsTab::~MarketsTab() = default;++void MarketsTab::build_ui() {+ auto* outer = new QVBoxLayout(this);+ outer->setContentsMargins(0, 0, 0, 0);+ outer->setSpacing(0);++ auto* scroll = new QScrollArea(this);+ scroll->setObjectName(QStringLiteral("marketsTabScroll"));+ scroll->setWidgetResizable(true);+ scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);+ scroll->setFrameShape(QFrame::NoFrame);+ outer->addWidget(scroll);++ auto* content = new QWidget(scroll);+ content->setObjectName(QStringLiteral("marketsTabContent"));+ auto* root = new QVBoxLayout(content);+ root->setContentsMargins(14, 14, 14, 14);+ root->setSpacing(10);++ auto* host = new QFrame(content);+ host->setObjectName(QStringLiteral("marketsTabPanelHost"));+ auto* hl = new QVBoxLayout(host);+ hl->setContentsMargins(0, 0, 0, 0);+ hl->setSpacing(0);+ list_panel_ = new panels::MarketsListPanel(host);+ hl->addWidget(list_panel_);+ root->addWidget(host);++ root->addStretch(1);+ scroll->setWidget(content);+}++void MarketsTab::apply_theme() {+ using namespace ui::colors;+ const QString ss = QStringLiteral(+ "QWidget#marketsTab { background:%1; }"+ "QScrollArea#marketsTabScroll { background:%1; border:none; }"+ "QWidget#marketsTabContent { background:%1; }"+ "QFrame#marketsTabPanelHost { background:%2; border:1px solid %3; }"+ )+ .arg(BG_BASE(),+ BG_SURFACE(),+ BORDER_DIM());+ setStyleSheet(ss);+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/crypto_center/tabs/MarketsTab.h b/fincept-qt/src/screens/crypto_center/tabs/MarketsTab.hnew file mode 100644index 000000000..469b59c84--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/tabs/MarketsTab.h@@ -0,0 +1,38 @@+#pragma once++#include <QWidget>++class QHideEvent;+class QShowEvent;++namespace fincept::screens {++namespace panels {+class MarketsListPanel;+}++/// MARKETS tab — internal prediction-market entry point (Phase 4 §4.2).+///+/// Wraps `MarketsListPanel` (curated/live market list, YES/NO prices, status+/// pill) inside the standard Crypto Center panel chrome. The tab itself owns+/// no data subscriptions — those live in the inner panel and respect P3+/// (visibility-driven lifecycle).+///+/// Phase 4 ships in **demo mode** until the Fincept matching engine and the+/// `fincept_market` Anchor program are deployed. The+/// `FinceptInternalAdapter` returns a curated three-market dataset; the+/// status pill in the panel head reads "DEMO" to make the state explicit.+class MarketsTab : public QWidget {+ Q_OBJECT+ public:+ explicit MarketsTab(QWidget* parent = nullptr);+ ~MarketsTab() override;++ private:+ void build_ui();+ void apply_theme();++ panels::MarketsListPanel* list_panel_ = nullptr;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/crypto_center/tabs/RoadmapTab.cpp b/fincept-qt/src/screens/crypto_center/tabs/RoadmapTab.cppnew file mode 100644index 000000000..fdddac15d--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/tabs/RoadmapTab.cpp@@ -0,0 +1,92 @@+#include "screens/crypto_center/tabs/RoadmapTab.h"++#include "screens/crypto_center/panels/BuybackBurnPanel.h"+#include "screens/crypto_center/panels/SupplyChartPanel.h"+#include "screens/crypto_center/panels/TreasuryPanel.h"+#include "ui/theme/Theme.h"++#include <QFrame>+#include <QScrollArea>+#include <QVBoxLayout>++namespace fincept::screens {++namespace {++QString roadmap_font_stack() {+ return QStringLiteral(+ "'Consolas','Cascadia Mono','JetBrains Mono','SF Mono',monospace");+}++} // namespace++RoadmapTab::RoadmapTab(QWidget* parent) : QWidget(parent) {+ setObjectName(QStringLiteral("roadmapTab"));+ build_ui();+ apply_theme();+}++RoadmapTab::~RoadmapTab() = default;++void RoadmapTab::build_ui() {+ auto* outer = new QVBoxLayout(this);+ outer->setContentsMargins(0, 0, 0, 0);+ outer->setSpacing(0);++ // Scroll area — keeps the treasury panel reachable on short windows.+ auto* scroll = new QScrollArea(this);+ scroll->setObjectName(QStringLiteral("roadmapTabScroll"));+ scroll->setWidgetResizable(true);+ scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);+ scroll->setFrameShape(QFrame::NoFrame);+ outer->addWidget(scroll);++ auto* content = new QWidget(scroll);+ content->setObjectName(QStringLiteral("roadmapTabContent"));+ auto* root = new QVBoxLayout(content);+ root->setContentsMargins(14, 14, 14, 14);+ root->setSpacing(10);++ // Each panel is wrapped in its own outer frame to inherit the panel+ // chrome the rest of the Crypto Center uses.+ auto wrap_panel = [content, root](QWidget* inner) {+ auto* host = new QFrame(content);+ host->setObjectName(QStringLiteral("roadmapTabPanelHost"));+ auto* hl = new QVBoxLayout(host);+ hl->setContentsMargins(0, 0, 0, 0);+ hl->setSpacing(0);+ hl->addWidget(inner);+ root->addWidget(host);+ };++ buyback_burn_ = new panels::BuybackBurnPanel(content);+ wrap_panel(buyback_burn_);++ supply_chart_ = new panels::SupplyChartPanel(content);+ wrap_panel(supply_chart_);++ treasury_ = new panels::TreasuryPanel(content);+ wrap_panel(treasury_);++ root->addStretch(1);+ scroll->setWidget(content);+}++void RoadmapTab::apply_theme() {+ using namespace ui::colors;+ const QString font = roadmap_font_stack();++ const QString ss = QStringLiteral(+ "QWidget#roadmapTab { background:%1; }"+ "QScrollArea#roadmapTabScroll { background:%1; border:none; }"+ "QWidget#roadmapTabContent { background:%1; }"+ "QFrame#roadmapTabPanelHost { background:%2; border:1px solid %3; }"+ )+ .arg(BG_BASE(),+ BG_SURFACE(),+ BORDER_DIM());++ setStyleSheet(ss);+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/crypto_center/tabs/RoadmapTab.h b/fincept-qt/src/screens/crypto_center/tabs/RoadmapTab.hnew file mode 100644index 000000000..e3c7882e4--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/tabs/RoadmapTab.h@@ -0,0 +1,37 @@+#pragma once++#include <QWidget>++namespace fincept::screens::panels {+class BuybackBurnPanel;+class SupplyChartPanel;+class TreasuryPanel;+}++namespace fincept::screens {++/// ROADMAP tab — Phase 5 buyback & burn dashboard.+///+/// Stack: BuybackBurnPanel (top) → SupplyChartPanel (middle) →+/// TreasuryPanel (bottom). Wrapped in a QScrollArea per P9 + Phase 1.5 U4+/// so short windows don't push the treasury card off-screen.+///+/// Replaces the Phase 1 ComingSoonTab placeholder. Subscribes nothing+/// itself; each panel owns its own lifecycle (subscribe in showEvent,+/// unsubscribe in hideEvent).+class RoadmapTab : public QWidget {+ Q_OBJECT+ public:+ explicit RoadmapTab(QWidget* parent = nullptr);+ ~RoadmapTab() override;++ private:+ void build_ui();+ void apply_theme();++ panels::BuybackBurnPanel* buyback_burn_ = nullptr;+ panels::SupplyChartPanel* supply_chart_ = nullptr;+ panels::TreasuryPanel* treasury_ = nullptr;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/crypto_center/tabs/StakeTab.cpp b/fincept-qt/src/screens/crypto_center/tabs/StakeTab.cppnew file mode 100644index 000000000..b3ea88b65--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/tabs/StakeTab.cpp@@ -0,0 +1,77 @@+#include "screens/crypto_center/tabs/StakeTab.h"++#include "screens/crypto_center/panels/ActiveLocksPanel.h"+#include "screens/crypto_center/panels/LockPanel.h"+#include "screens/crypto_center/panels/TierPanel.h"+#include "ui/theme/Theme.h"++#include <QFrame>+#include <QScrollArea>+#include <QVBoxLayout>++namespace fincept::screens {++StakeTab::StakeTab(QWidget* parent) : QWidget(parent) {+ setObjectName(QStringLiteral("stakeTab"));+ build_ui();+ apply_theme();+}++StakeTab::~StakeTab() = default;++void StakeTab::build_ui() {+ auto* outer = new QVBoxLayout(this);+ outer->setContentsMargins(0, 0, 0, 0);+ outer->setSpacing(0);++ auto* scroll = new QScrollArea(this);+ scroll->setObjectName(QStringLiteral("stakeTabScroll"));+ scroll->setWidgetResizable(true);+ scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);+ scroll->setFrameShape(QFrame::NoFrame);+ outer->addWidget(scroll);++ auto* content = new QWidget(scroll);+ content->setObjectName(QStringLiteral("stakeTabContent"));+ auto* root = new QVBoxLayout(content);+ root->setContentsMargins(14, 14, 14, 14);+ root->setSpacing(10);++ auto wrap_panel = [content, root](QWidget* inner) {+ auto* host = new QFrame(content);+ host->setObjectName(QStringLiteral("stakeTabPanelHost"));+ auto* hl = new QVBoxLayout(host);+ hl->setContentsMargins(0, 0, 0, 0);+ hl->setSpacing(0);+ hl->addWidget(inner);+ root->addWidget(host);+ };++ lock_panel_ = new panels::LockPanel(content);+ wrap_panel(lock_panel_);++ active_locks_ = new panels::ActiveLocksPanel(content);+ wrap_panel(active_locks_);++ tier_panel_ = new panels::TierPanel(content);+ wrap_panel(tier_panel_);++ root->addStretch(1);+ scroll->setWidget(content);+}++void StakeTab::apply_theme() {+ using namespace ui::colors;+ const QString ss = QStringLiteral(+ "QWidget#stakeTab { background:%1; }"+ "QScrollArea#stakeTabScroll { background:%1; border:none; }"+ "QWidget#stakeTabContent { background:%1; }"+ "QFrame#stakeTabPanelHost { background:%2; border:1px solid %3; }"+ )+ .arg(BG_BASE(),+ BG_SURFACE(),+ BORDER_DIM());+ setStyleSheet(ss);+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/crypto_center/tabs/StakeTab.h b/fincept-qt/src/screens/crypto_center/tabs/StakeTab.hnew file mode 100644index 000000000..bdd8d97fc--- /dev/null+++ b/fincept-qt/src/screens/crypto_center/tabs/StakeTab.h@@ -0,0 +1,37 @@+#pragma once++#include <QWidget>++namespace fincept::screens::panels {+class LockPanel;+class ActiveLocksPanel;+class TierPanel;+}++namespace fincept::screens {++/// STAKE tab — Phase 3 veFNCPT lock + tier system.+///+/// Stack: LockPanel (top) → ActiveLocksPanel (middle) → TierPanel (bottom).+/// Wrapped in a QScrollArea per Phase 1.5 U4 so short windows don't push+/// the tier card off-screen.+///+/// Replaces the Phase 1 ComingSoonTab placeholder. Each panel owns its own+/// hub-subscription lifecycle (showEvent/hideEvent) — the tab itself+/// subscribes nothing.+class StakeTab : public QWidget {+ Q_OBJECT+ public:+ explicit StakeTab(QWidget* parent = nullptr);+ ~StakeTab() override;++ private:+ void build_ui();+ void apply_theme();++ panels::LockPanel* lock_panel_ = nullptr;+ panels::ActiveLocksPanel* active_locks_ = nullptr;+ panels::TierPanel* tier_panel_ = nullptr;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/crypto_center/tabs/TradeTab.cpp b/fincept-qt/src/screens/crypto_center/tabs/TradeTab.cppindex 5bb57c5d1..118a632ce 100644--- a/fincept-qt/src/screens/crypto_center/tabs/TradeTab.cpp+++ b/fincept-qt/src/screens/crypto_center/tabs/TradeTab.cpp@@ -28,6 +28,10 @@ TradeTab::TradeTab(QWidget* parent) : QWidget(parent) {TradeTab::~TradeTab() = default;+void TradeTab::set_from_mint(const QString& mint) {+ if (swap_panel_) swap_panel_->set_from_mint(mint);+}+void TradeTab::build_ui() {auto* root = new QVBoxLayout(this);root->setContentsMargins(14, 14, 14, 14);@@ -61,43 +65,6 @@ void TradeTab::build_ui() {top_row->addWidget(fee_discount_placeholder_, 1);}root->addLayout(top_row, 1);-- // Burn placeholder (Stage 2.3)- {- burn_placeholder_ = new QFrame(this);- burn_placeholder_->setObjectName(QStringLiteral("tradeTabPanelHost"));- auto* outer = new QVBoxLayout(burn_placeholder_);- outer->setContentsMargins(0, 0, 0, 0);- outer->setSpacing(0);-- auto* head = new QWidget(burn_placeholder_);- head->setObjectName(QStringLiteral("tradeTabPanelHead"));- head->setFixedHeight(34);- auto* head_l = new QHBoxLayout(head);- head_l->setContentsMargins(12, 0, 12, 0);- head_l->setSpacing(0);- auto* title = new QLabel(QStringLiteral("BURN $FNCPT"), head);- title->setObjectName(QStringLiteral("tradeTabPanelTitle"));- auto* status = new QLabel(QStringLiteral("STAGE 2.3"), head);- status->setObjectName(QStringLiteral("tradeTabPanelStatus"));- head_l->addWidget(title);- head_l->addStretch();- head_l->addWidget(status);- outer->addWidget(head);-- auto* body = new QLabel(- tr("Permanently destroy $FNCPT through the on-chain fincept_burn program. "- "The terminal builds the burn transaction, you sign in your wallet, "- "and the receipt lands here. Lands with the Anchor program in Stage 2.3."),- burn_placeholder_);- body->setObjectName(QStringLiteral("tradeTabPlaceholderBody"));- body->setWordWrap(true);- body->setContentsMargins(14, 12, 14, 14);- outer->addWidget(body);- outer->addStretch(1);- root->addWidget(burn_placeholder_);- }-root->addStretch(1);}diff --git a/fincept-qt/src/screens/crypto_center/tabs/TradeTab.h b/fincept-qt/src/screens/crypto_center/tabs/TradeTab.hindex fb621ddc0..afeb74b05 100644--- a/fincept-qt/src/screens/crypto_center/tabs/TradeTab.h+++ b/fincept-qt/src/screens/crypto_center/tabs/TradeTab.h@@ -12,26 +12,33 @@ class FeeDiscountPanel;namespace fincept::screens {-/// TRADE tab — buy/sell $FNCPT via Jupiter and burn $FNCPT.+/// TRADE tab — buy/sell $FNCPT via PumpPortal, plus fee-discount eligibility.///-/// Stage 2.2 ships SwapPanel; placeholder slots reserved for BurnPanel-/// (Stage 2.3) and FeeDiscountPanel (Stage 2.4). When those land they take-/// over the placeholder QFrames keyed by `objectName`.+/// SwapPanel handles BUY/SELL through `PumpFunSwapService::build_swap` →+/// `WalletService::sign_and_send`. FeeDiscountPanel surfaces the 30 % discount+/// chip when the wallet holds ≥ 1,000 $FNCPT.+///+/// Burn was considered for Stage 2.3 and **deferred to Phase 5** (see+/// `plans/crypto-center-phase-2.md` D6). The buyback worker burns from the+/// treasury; per-user burn is no longer in scope here.class TradeTab : public QWidget {Q_OBJECTpublic:explicit TradeTab(QWidget* parent = nullptr);~TradeTab() override;+ /// Pre-fill SwapPanel's FROM combo with the given mint. Wired by+ /// CryptoCenterScreen to HomeTab::select_token so clicking a row in the+ /// holdings table on HOME drops the user into TRADE with that asset+ /// pre-selected.+ void set_from_mint(const QString& mint);+private:void build_ui();void apply_theme();panels::SwapPanel* swap_panel_ = nullptr;panels::FeeDiscountPanel* fee_discount_panel_ = nullptr;-- // Burn placeholder — burn deferred to Phase 5 (see plans/crypto-center-phase-2.md D6).- QFrame* burn_placeholder_ = nullptr;QFrame* fee_discount_placeholder_ = nullptr;};diff --git a/fincept-qt/src/screens/crypto_trading/CryptoBottomPanel.cpp b/fincept-qt/src/screens/crypto_trading/CryptoBottomPanel.cppindex ceb62cde3..66c039a23 100644--- a/fincept-qt/src/screens/crypto_trading/CryptoBottomPanel.cpp+++ b/fincept-qt/src/screens/crypto_trading/CryptoBottomPanel.cpp@@ -235,6 +235,52 @@ void CryptoBottomPanel::set_positions(const QVector<trading::PtPosition>& positipositions_table_->setUpdatesEnabled(true);}+void CryptoBottomPanel::update_position_prices(const QHash<QString, double>& last_prices) {+ // Live mark-to-market patch driven directly by WS ticks. Reads symbol ++ // side + qty + entry from the existing rows (no DB round-trip), computes+ // fresh P&L from the new mark, and patches columns 4 (Current) and 5 (P&L)+ // in place. Long: pnl = (mark - entry) * qty. Short: pnl = (entry - mark) * qty.+ if (last_prices.isEmpty() || !positions_table_)+ return;+ const int n = positions_table_->rowCount();+ if (n == 0)+ return;+ positions_table_->setUpdatesEnabled(false);+ for (int i = 0; i < n; ++i) {+ auto* sym_item = positions_table_->item(i, 0);+ if (!sym_item)+ continue;+ const QString sym = sym_item->text();+ auto it = last_prices.constFind(sym);+ if (it == last_prices.constEnd())+ continue;+ const double mark = it.value();+ if (mark <= 0.0)+ continue;++ auto* side_item = positions_table_->item(i, 1);+ auto* qty_item = positions_table_->item(i, 2);+ auto* entry_item = positions_table_->item(i, 3);+ auto* cur_item = positions_table_->item(i, 4);+ auto* pnl_item = positions_table_->item(i, 5);+ if (!side_item || !qty_item || !entry_item || !cur_item || !pnl_item)+ continue;++ const bool is_long = side_item->text().compare("LONG", Qt::CaseInsensitive) == 0;+ const double qty = qty_item->text().toDouble();+ const double entry = entry_item->text().toDouble();+ if (qty <= 0.0 || entry <= 0.0)+ continue;++ const double pnl = is_long ? (mark - entry) * qty : (entry - mark) * qty;++ cur_item->setText(QString::number(mark, 'f', 2));+ pnl_item->setText(QString::number(pnl, 'f', 2));+ pnl_item->setForeground(pnl >= 0 ? kColorPos() : kColorNeg());+ }+ positions_table_->setUpdatesEnabled(true);+}+void CryptoBottomPanel::set_orders(const QVector<trading::PtOrder>& orders) {QVector<trading::PtOrder> active;for (const auto& o : orders) {diff --git a/fincept-qt/src/screens/crypto_trading/CryptoBottomPanel.h b/fincept-qt/src/screens/crypto_trading/CryptoBottomPanel.hindex df062d0d9..a485a002d 100644--- a/fincept-qt/src/screens/crypto_trading/CryptoBottomPanel.h+++ b/fincept-qt/src/screens/crypto_trading/CryptoBottomPanel.h@@ -43,6 +43,12 @@ class CryptoBottomPanel : public QWidget {void set_depth_data(const QVector<QPair<double, double>>& bids, const QVector<QPair<double, double>>& asks,double spread, double spread_pct);+ /// Patch the positions table with fresh WS ticker prices. Works in both+ /// paper and live mode — recalculates current_price, unrealized PnL, and+ /// PnL% from the latest mark price without hitting SQLite or the daemon.+ /// Call at every WS flush tick.+ void update_position_prices(const QHash<QString, double>& last_prices);+signals:void cancel_order_requested(const QString& order_id);void close_position_requested(const QString& symbol);diff --git a/fincept-qt/src/screens/crypto_trading/CryptoTradingScreen.cpp b/fincept-qt/src/screens/crypto_trading/CryptoTradingScreen.cppindex 489160628..1819dc0a7 100644--- a/fincept-qt/src/screens/crypto_trading/CryptoTradingScreen.cpp+++ b/fincept-qt/src/screens/crypto_trading/CryptoTradingScreen.cpp@@ -3,8 +3,6 @@#include "core/logging/Logger.h"#include "core/session/ScreenStateManager.h"-#include "datahub/DataHub.h"-#include "datahub/DataHubMetaTypes.h"#include "screens/crypto_trading/CryptoBottomPanel.h"#include "screens/crypto_trading/CryptoChart.h"#include "screens/crypto_trading/CryptoCredentials.h"@@ -13,8 +11,11 @@#include "screens/crypto_trading/CryptoTickerBar.h"#include "screens/crypto_trading/CryptoWatchlist.h"#include "trading/ExchangeService.h"+#include "trading/ExchangeSession.h"+#include "trading/ExchangeSessionManager.h"#include "trading/OrderMatcher.h"#include "trading/PaperTrading.h"+#include "trading/exchanges/kraken/KrakenWsClient.h"#include "ui/theme/StyleSheets.h"#include "ui/theme/Theme.h"@@ -24,6 +25,7 @@#include <QPointer>#include <QSplitter>#include <QStringListModel>+#include <QStyle>#include <QVBoxLayout>#include <QtConcurrent/QtConcurrent>@@ -47,9 +49,8 @@ CryptoTradingScreen::CryptoTradingScreen(QWidget* parent) : QWidget(parent) {CryptoTradingScreen::~CryptoTradingScreen() {LOG_INFO(TAG, "Destroying CryptoTradingScreen");- // Drop hub subscriptions owned by this screen. DataHub::unsubscribe is- // also safe if no sub exists (e.g. constructor threw before init).- fincept::datahub::DataHub::instance().unsubscribe(this);+ // Direct WS connections are auto-cleaned via the ws_subscription_owner_+ // child QObject (parented to this); Qt drops them in the parent dtor.}// ============================================================================@@ -58,21 +59,19 @@ CryptoTradingScreen::~CryptoTradingScreen() {void CryptoTradingScreen::showEvent(QShowEvent* event) {QWidget::showEvent(event);- if (ticker_timer_)- ticker_timer_->start();- if (ob_timer_)- ob_timer_->start();- if (portfolio_timer_)- portfolio_timer_->start();- if (watchlist_timer_)- watchlist_timer_->start();+ // ── WS-only data path ──────────────────────────────────────────────────+ // ticker / orderbook / watchlist / portfolio polling timers are+ // intentionally NOT started here. The hub WS stream is the sole data+ // path. market_info_timer_ stays (perp funding/OI have no WS topic on+ // Kraken spot), clock_timer_ stays (wall clock), ws_flush_timer_ is the+ // 10fps UI flush coalescer, not data fetching.if (market_info_timer_)market_info_timer_->start();if (clock_timer_)clock_timer_->start();if (ws_flush_timer_)ws_flush_timer_->start();- LOG_INFO(TAG, "Screen visible — timers started");+ LOG_INFO(TAG, "Screen visible — WS-only mode (no REST polling)");}void CryptoTradingScreen::hideEvent(QHideEvent* event) {@@ -185,12 +184,24 @@ void CryptoTradingScreen::setup_ui() {ticker_bar_ = new CryptoTickerBar;cmd_layout->addWidget(ticker_bar_, 1);- // WS status- ws_status_ = new QLabel("REST");+ // WS status pill — three states (live / connecting / offline) driven by+ // a Qt property so the global stylesheet handles colors. Tooltip explains+ // what's happening so the user can self-diagnose without reading the log.+ ws_status_ = new QLabel("CONNECTING");ws_status_->setObjectName("cryptoWsStatus");- ws_status_->setStyleSheet(QString("color: %1;").arg(ui::colors::WARNING()));+ ws_status_->setProperty("ws", "connecting");+ ws_status_->setToolTip("WebSocket feed status — green=live, amber=connecting, red=offline (REST polling)");cmd_layout->addWidget(ws_status_);+ // Transport hint — small text right of the pill. Kraken uses the native+ // QWebSocket client; everyone else still goes through ws_stream.py.+ ws_transport_ = new QLabel(exchange_id_ == "kraken" ? "NATIVE" : "DAEMON");+ ws_transport_->setObjectName("cryptoWsTransport");+ ws_transport_->setToolTip(exchange_id_ == "kraken"+ ? "Native C++ WebSocket — direct connection, no Python subprocess"+ : "ws_stream.py via ccxt.pro — Python subprocess");+ cmd_layout->addWidget(ws_transport_);+// Clockclock_label_ = new QLabel("--:--:--");clock_label_->setObjectName("cryptoClock");@@ -327,36 +338,35 @@ void CryptoTradingScreen::setup_timers() {QTimer::singleShot(0, this, [this]() {init_exchange();load_portfolio();- refresh_ticker(); // cheap — reads ExchangeService's in-memory cache+ // First WS tick from Kraken fills the price cache within ~1s of the+ // handshake; we no longer prime it via REST.auto* es = &trading::ExchangeService::instance();+ // Only one REST call survives the WS-only refactor: fetching the+ // historical OHLCV for the chart. Kraken WS only streams the *current*+ // candle (interval_begin = now); we still need the daemon's REST+ // fetch_ohlcv for the bars to the left of "now". After this single+ // call, the chart updates entirely from WS ohlc events.auto run_initial_fetches = [this]() {if (startup_fetches_done_)return;startup_fetches_done_ = true;- refresh_orderbook();- refresh_watchlist();async_fetch_candles(selected_symbol_, chart_->current_timeframe());};if (es->wait_for_daemon_ready(0)) {- // Daemon already warm (pre-warmed by ExchangeService ctor or a- // previous session). Fire immediately.run_initial_fetches();} else {- // Connect once; disconnect after first fire.auto conn = std::make_shared<QMetaObject::Connection>();*conn = connect(es, &trading::ExchangeService::daemon_ready, this, [conn, run_initial_fetches]() {QObject::disconnect(*conn);run_initial_fetches();});- // Safety net: if daemon never comes up within 8s, proceed anyway- // so the user eventually sees data.QTimer::singleShot(8000, this, [this, conn, run_initial_fetches]() {if (startup_fetches_done_)return;QObject::disconnect(*conn);- LOG_WARN(TAG, "Daemon not ready after 8s — firing startup fetches via script fallback");+ LOG_WARN(TAG, "Daemon not ready after 8s — chart history skipped (WS will fill in)");run_initial_fetches();});}@@ -366,15 +376,18 @@ void CryptoTradingScreen::setup_timers() {void CryptoTradingScreen::update_clock() {clock_label_->setText(QDateTime::currentDateTime().toString("HH:mm:ss"));- // WS status label — only reapply text + stylesheet on state change. A- // setStyleSheet call triggers a CSS reparse and repaint; doing that every- // second on an unchanging state was pure waste.+ // WS status pill — only restyle on state change. Setting a Qt property+ // and re-polishing is cheaper than setStyleSheet (no CSS reparse) but+ // still triggers a repaint, so we gate on edge transitions.const int connected = ExchangeService::instance().is_ws_connected() ? 1 : 0;if (connected == last_ws_status_label_state_)return;last_ws_status_label_state_ = connected;- ws_status_->setText(connected ? "LIVE" : "REST");- ws_status_->setStyleSheet(QString("color: %1;").arg(connected ? ui::colors::POSITIVE() : ui::colors::WARNING()));++ ws_status_->setText(connected ? "LIVE" : "OFFLINE");+ ws_status_->setProperty("ws", connected ? "live" : "offline");+ ws_status_->style()->unpolish(ws_status_);+ ws_status_->style()->polish(ws_status_);}// ============================================================================@@ -382,98 +395,92 @@ void CryptoTradingScreen::update_clock() {// ============================================================================// ============================================================================-// DataHub subscription path (the only path since Phase 6 removed the legacy-// callback fallback). Every supported exchange must be a DataHub producer-// registered via ExchangeSessionManager::topic_patterns().+// Direct Kraken WS subscription (intentionally bypasses DataHub).+//+// Earlier iterations published Kraken events through DataHub topic patterns+// (`ws:kraken:ticker:*` etc.) and consumed them here via subscribe_pattern.+// That path crashed under high BBO update rates — the hub's coalesce timer+// + pattern matching + fan-out machinery was the wrong tool for a+// single-consumer single-producer crypto stream. The native client emits+// plain Qt signals; we wire them straight to the same pending_* buffers+// the flush_ws_updates timer drains at 10fps.// ============================================================================void CryptoTradingScreen::hub_subscribe_topics() {- auto& hub = fincept::datahub::DataHub::instance();+ // Drop any prior connections to this owner (handles symbol/exchange swap).+ if (ws_subscription_owner_) {+ delete ws_subscription_owner_;+ ws_subscription_owner_ = nullptr;+ }- // Always drop our prior subscriptions wholesale before re-subscribing —- // cheaper than deltas and leaves no room for stale topics to leak.- hub.unsubscribe(this);+ if (exchange_id_ != "kraken")+ return; // Hyperliquid still uses the daemon Python path- const QString exch = exchange_id_;- const QString primary = selected_symbol_;+ auto& session = fincept::trading::ExchangeSessionManager::instance();+ auto* sess = session.session(exchange_id_);+ if (!sess)+ return;+ auto* ws = sess->kraken_ws_client();+ if (!ws) {+ LOG_WARN(TAG, "kraken_ws_client() returned null — start_ws hasn't run yet");+ return;+ }++ // ws_subscription_owner_ is a context QObject the connections are+ // parented to. Destroying it auto-disconnects every connection on swap.+ ws_subscription_owner_ = new QObject(this);- // 1. Primary-symbol ticker → ticker bar + order entry + paper bookkeeping.- // Uses the coalesced ticker policy (50 ms window).- const QString ticker_topic = QStringLiteral("ws:") + exch + QStringLiteral(":ticker:") + primary;QPointer<CryptoTradingScreen> self = this;- hub.subscribe(this, ticker_topic, [self, primary](const QVariant& v) {- if (!self || !v.canConvert<fincept::trading::TickerData>())- return;- const auto t = v.value<fincept::trading::TickerData>();- self->pending_tickers_[t.symbol.isEmpty() ? primary : t.symbol] = t;- if (self->selected_symbol_ == primary) {- self->pending_primary_ticker_ = t;- self->has_pending_primary_ = true;- }- });+ QString primary = selected_symbol_;- // 2. Primary-symbol orderbook.- const QString ob_topic = QStringLiteral("ws:") + exch + QStringLiteral(":orderbook:") + primary;- hub.subscribe(this, ob_topic, [self, primary](const QVariant& v) {- if (!self || self->selected_symbol_ != primary)- return;- if (!v.canConvert<fincept::trading::OrderBookData>())- return;- self->pending_orderbook_ = v.value<fincept::trading::OrderBookData>();- self->has_pending_orderbook_ = true;- });+ connect(ws, &fincept::trading::kraken::KrakenWsClient::ticker_received,+ ws_subscription_owner_, [self, primary](const fincept::trading::TickerData& t) {+ if (!self || t.symbol.isEmpty())+ return;+ self->pending_tickers_[t.symbol] = t;+ if (t.symbol == self->selected_symbol_) {+ self->pending_primary_ticker_ = t;+ self->has_pending_primary_ = true;+ }+ });- // 3. Primary-symbol trades → time & sales + fast-path ticker update.- const QString trades_topic = QStringLiteral("ws:") + exch + QStringLiteral(":trades:") + primary;- hub.subscribe(this, trades_topic, [self, primary](const QVariant& v) {- if (!self || self->selected_symbol_ != primary)- return;- if (!v.canConvert<fincept::trading::TradeData>())- return;- const auto td = v.value<fincept::trading::TradeData>();- crypto::TradeEntry e;- e.side = td.side;- e.price = td.price;- e.amount = td.amount;- self->pending_trades_.append(e);- });+ connect(ws, &fincept::trading::kraken::KrakenWsClient::orderbook_received,+ ws_subscription_owner_, [self](const fincept::trading::OrderBookData& ob) {+ if (!self || ob.symbol != self->selected_symbol_)+ return;+ self->pending_orderbook_ = ob;+ self->has_pending_orderbook_ = true;+ });- // 4. Watchlist tickers — pattern subscribe to ws:<exch>:ticker:* so new- // symbols added to the watchlist later don't need extra wiring. The- // pattern matches the primary topic too, but duplicate delivery is- // harmless (pending_tickers_ is latest-wins per symbol).- const QString ticker_pattern = QStringLiteral("ws:") + exch + QStringLiteral(":ticker:*");- hub.subscribe_pattern(this, ticker_pattern,- [self](const QString& /*topic*/, const QVariant& v) {- if (!self || !v.canConvert<fincept::trading::TickerData>())- return;- const auto t = v.value<fincept::trading::TickerData>();- if (t.symbol.isEmpty())- return;- self->pending_tickers_[t.symbol] = t;- });-- // 5. Candles — subscribe pattern for the primary symbol across all- // intervals (the chart's current timeframe may change during the- // session; a pattern sub avoids having to resubscribe on every- // timeframe change). Filter by the exact symbol in the slot.- const QString ohlc_pattern = QStringLiteral("ws:") + exch + QStringLiteral(":ohlc:") + primary +- QStringLiteral(":*");- hub.subscribe_pattern(this, ohlc_pattern,- [self, primary](const QString& /*topic*/, const QVariant& v) {- if (!self || self->selected_symbol_ != primary)- return;- if (!v.canConvert<fincept::trading::Candle>())- return;- self->pending_candles_.append(v.value<fincept::trading::Candle>());- });-- LOG_INFO(TAG, QString("DataHub subscriptions attached: %1 / %2").arg(exch, primary));+ connect(ws, &fincept::trading::kraken::KrakenWsClient::trade_received,+ ws_subscription_owner_, [self](const fincept::trading::TradeData& td) {+ if (!self || td.symbol != self->selected_symbol_)+ return;+ crypto::TradeEntry e;+ e.side = td.side;+ e.price = td.price;+ e.amount = td.amount;+ self->pending_trades_.append(e);+ });++ connect(ws, &fincept::trading::kraken::KrakenWsClient::candle_received,+ ws_subscription_owner_,+ [self](const QString& sym, const QString& /*interval*/,+ const fincept::trading::Candle& c) {+ if (!self || sym != self->selected_symbol_)+ return;+ self->pending_candles_.append(c);+ });++ LOG_INFO(TAG, QString("Direct WS signals connected (kraken / %1)").arg(primary));}void CryptoTradingScreen::hub_unsubscribe_topics() {- fincept::datahub::DataHub::instance().unsubscribe(this);- LOG_INFO(TAG, "DataHub subscriptions detached");+ if (ws_subscription_owner_) {+ delete ws_subscription_owner_;+ ws_subscription_owner_ = nullptr;+ }+ LOG_INFO(TAG, "Direct WS signals detached");}void CryptoTradingScreen::init_exchange() {@@ -495,8 +502,10 @@ void CryptoTradingScreen::init_exchange() {// still displays data via scripts.LOG_ERROR(TAG, "WS stream failed to start — remaining on REST polling for " + exchange_id_);if (ws_status_) {- ws_status_->setText("REST");- ws_status_->setStyleSheet(QString("color: %1;").arg(ui::colors::WARNING()));+ ws_status_->setText("OFFLINE");+ ws_status_->setProperty("ws", "offline");+ ws_status_->style()->unpolish(ws_status_);+ ws_status_->style()->polish(ws_status_);}last_ws_status_label_state_ = 0;}@@ -649,6 +658,13 @@ void CryptoTradingScreen::on_exchange_changed(const QString& exchange) {LOG_INFO(TAG, QString("Exchange changed: %1 → %2").arg(exchange_id_, exchange));exchange_id_ = exchange;exchange_btn_->setText(exchange.toUpper());+ if (ws_transport_) {+ const bool native = (exchange == "kraken");+ ws_transport_->setText(native ? "NATIVE" : "DAEMON");+ ws_transport_->setToolTip(native+ ? "Native C++ WebSocket — direct connection, no Python subprocess"+ : "ws_stream.py via ccxt.pro — Python subprocess");+ }auto& es = ExchangeService::instance();@@ -684,15 +700,12 @@ void CryptoTradingScreen::on_exchange_changed(const QString& exchange) {load_portfolio();- // Prime the screen with data from the new exchange immediately rather than- // waiting for the WS to connect or the 3s polling timer to tick — otherwise- // ticker / orderbook / chart stay blank for seconds after every switch.- // On switch-back to a warm session the session's cache is already populated,- // so refresh_ticker / refresh_orderbook hit it immediately.+ // Chart history (left of "now") still needs one REST fetch — Kraken WS+ // only streams the current bar. Everything else (ticker, orderbook,+ // watchlist) repopulates from the new session's WS subscriptions within+ // ~1s of the handshake. Funding/OI is perp-only and stays on its 30s+ // market_info_timer_ — those endpoints aren't on the public WS feed.async_fetch_candles(selected_symbol_, chart_->current_timeframe());- refresh_ticker();- refresh_orderbook();- refresh_watchlist();refresh_market_info();ScreenStateManager::instance().notify_changed(this);@@ -733,8 +746,8 @@ void CryptoTradingScreen::switch_symbol(const QString& symbol) {// resubscribe wholesale than diff.hub_subscribe_topics();- refresh_ticker();- refresh_orderbook();+ // WS-only mode: ticker + orderbook reflow naturally as the new symbol's+ // WS subscriptions kick in. Only history needs a REST fetch.async_fetch_candles(selected_symbol_, chart_->current_timeframe());}@@ -880,34 +893,14 @@ void CryptoTradingScreen::on_search_requested(const QString& filter) {// ============================================================================void CryptoTradingScreen::apply_feed_mode(bool ws_connected) {- // Called on WS-state edge transitions. When WS is live we can stop the- // primary-symbol pollers (the WS ticker / orderbook stream covers them- // at high rate); when it drops we must restart so the screen keeps- // updating.- //- // The watchlist timer is an intentional exception: WS only pushes a- // symbol's ticker when its price moves, so illiquid rows (WIF, PEPE,- // etc.) can sit silent for minutes and display "--". Keeping the 15 s- // REST refresh running in parallel guarantees every row in the watchlist- // shows a price even when the market is quiet.+ // WS-only mode: no REST polling fallbacks. We keep this method as a+ // logging/state-tracking hook so the WS status pill in the command bar+ // can react to drops. Polling timers are not (re)started here.const int desired = ws_connected ? 1 : 0;if (desired == last_ws_state_)return;last_ws_state_ = desired;-- if (ws_connected) {- if (ticker_timer_ && ticker_timer_->isActive()) ticker_timer_->stop();- if (ob_timer_ && ob_timer_->isActive()) ob_timer_->stop();- if (portfolio_timer_ && portfolio_timer_->isActive()) portfolio_timer_->stop();- LOG_INFO(TAG, "WS connected — REST polling paused (watchlist poll kept running)");- } else {- if (isVisible()) {- if (ticker_timer_ && !ticker_timer_->isActive()) ticker_timer_->start();- if (ob_timer_ && !ob_timer_->isActive()) ob_timer_->start();- if (portfolio_timer_ && !portfolio_timer_->isActive()) portfolio_timer_->start();- LOG_WARN(TAG, "WS disconnected — REST polling resumed");- }- }+ LOG_INFO(TAG, ws_connected ? "WS connected" : "WS disconnected (waiting for reconnect)");}void CryptoTradingScreen::flush_ws_updates() {@@ -955,6 +948,18 @@ void CryptoTradingScreen::flush_ws_updates() {pending_tickers_.clear();watchlist_->update_prices(batch);+ // Live mark-to-market on the positions table — works in paper AND live+ // mode because it patches columns 4 (Current) + 5 (P&L) in place from+ // the WS tick, no SQLite writes, no daemon round-trip.+ QHash<QString, double> last_prices;+ last_prices.reserve(batch.size());+ for (const auto& t : batch) {+ if (t.last > 0.0)+ last_prices.insert(t.symbol, t.last);+ }+ if (!last_prices.isEmpty())+ bottom_panel_->update_position_prices(last_prices);+// Feed WS prices into paper trading engine on a worker thread — every tick// would otherwise do 3N+ SQLite ops on the UI thread (price update, order// match, SL/TP check) plus 1-5 queries for UI refresh at 10Hz.diff --git a/fincept-qt/src/screens/crypto_trading/CryptoTradingScreen.h b/fincept-qt/src/screens/crypto_trading/CryptoTradingScreen.hindex 2d17e1b68..49f5cc34d 100644--- a/fincept-qt/src/screens/crypto_trading/CryptoTradingScreen.h+++ b/fincept-qt/src/screens/crypto_trading/CryptoTradingScreen.h@@ -94,8 +94,14 @@ class CryptoTradingScreen : public QWidget, public IStatefulScreen {QPushButton* mode_btn_ = nullptr;QPushButton* api_btn_ = nullptr;QLabel* ws_status_ = nullptr;+ QLabel* ws_transport_ = nullptr; // tiny hint: "NATIVE" for Kraken, "DAEMON" for ccxtQLabel* clock_label_ = nullptr;+ /// Context object that owns all direct connections to the native Kraken+ /// WS client. Destroyed (and recreated) on symbol/exchange swap so every+ /// connection is auto-disconnected in one move.+ QObject* ws_subscription_owner_ = nullptr;+// ── Sub-widgets ──crypto::CryptoTickerBar* ticker_bar_ = nullptr;crypto::CryptoWatchlist* watchlist_ = nullptr;diff --git a/fincept-qt/src/screens/dashboard/canvas/AddWidgetDialog.cpp b/fincept-qt/src/screens/dashboard/canvas/AddWidgetDialog.cppindex b1269dc07..cc6ea520d 100644--- a/fincept-qt/src/screens/dashboard/canvas/AddWidgetDialog.cpp+++ b/fincept-qt/src/screens/dashboard/canvas/AddWidgetDialog.cpp@@ -26,6 +26,8 @@ QString AddWidgetDialog::accent_for_category(const QString& category) {return ui::colors::NEGATIVE();if (category == "Tools")return ui::colors::AMBER();+ if (category == "Geopolitics")+ return ui::colors::NEGATIVE();return ui::colors::TEXT_SECONDARY();}@@ -51,6 +53,9 @@ QString AddWidgetDialog::icon_for_widget(const QString& type_id) {{"risk_metrics", QString(QChar(0x26A0))}, // ⚠{"quick_trade", QString(QChar(0x26A1))}, // ⚡{"video_player", QString(QChar(0x25B6))}, // ▶+ {"geopolitics_events", QString(QChar(0x2691))}, // ⚑+ {"maritime_vessels", QString(QChar(0x2693))}, // ⚓+ {"notes", QString(QChar(0x270E))}, // ✎};return icons.value(type_id, QString(QChar(0x25CF))); // ● default}diff --git a/fincept-qt/src/screens/dashboard/canvas/WidgetRegistry.cpp b/fincept-qt/src/screens/dashboard/canvas/WidgetRegistry.cppindex 6279341cc..d9668a1c9 100644--- a/fincept-qt/src/screens/dashboard/canvas/WidgetRegistry.cpp+++ b/fincept-qt/src/screens/dashboard/canvas/WidgetRegistry.cpp@@ -7,12 +7,15 @@#include "screens/dashboard/widgets/CryptoWidget.h"#include "screens/dashboard/widgets/EconomicCalendarWidget.h"#include "screens/dashboard/widgets/ForexWidget.h"+#include "screens/dashboard/widgets/GeopoliticsEventsWidget.h"#include "screens/dashboard/widgets/IndicesWidget.h"#include "screens/dashboard/widgets/MarginUsageWidget.h"+#include "screens/dashboard/widgets/MaritimeVesselsWidget.h"#include "screens/dashboard/widgets/MarketQuoteStripWidget.h"#include "screens/dashboard/widgets/MarketSentimentWidget.h"#include "screens/dashboard/widgets/NewsCategoryWidget.h"#include "screens/dashboard/widgets/NewsWidget.h"+#include "screens/dashboard/widgets/NotesWidget.h"#include "screens/dashboard/widgets/OpenPositionsWidget.h"#include "screens/dashboard/widgets/OrderBookMiniWidget.h"#include "screens/dashboard/widgets/PerformanceWidget.h"@@ -160,6 +163,19 @@ WidgetRegistry::WidgetRegistry() {register_widget({"web_scraper", "Web Scraper", "Tools","Scrape tables from any URL — auto-detects HTML, JSON, CSV, XML/RSS", 6, 5, 3,3, [](const QJsonObject& cfg) { return new widgets::WebScraperWidget(cfg); }});++ // ── Geopolitics ──────────────────────────────────────────────────────────+ register_widget({"geopolitics_events", "Geopolitics Events", "Geopolitics",+ "Live conflict / political events — subscribes to geopolitics:events", 6, 5, 3, 3,+ [](const QJsonObject& cfg) { return new widgets::GeopoliticsEventsWidget(cfg); }});++ register_widget({"maritime_vessels", "Maritime Vessels", "Geopolitics",+ "Live vessel positions — configurable IMO list, subscribes to maritime:vessel:*", 5, 5, 3, 3,+ [](const QJsonObject& cfg) { return new widgets::MaritimeVesselsWidget(cfg); }});++ register_widget({"notes", "Notes", "Tools",+ "Recent / favorite financial notes — click to open Notes screen", 4, 5, 2, 3,+ [](const QJsonObject& cfg) { return new widgets::NotesWidget(cfg); }});}void WidgetRegistry::register_widget(WidgetMeta meta) {diff --git a/fincept-qt/src/screens/dashboard/widgets/GeopoliticsEventsWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/GeopoliticsEventsWidget.cppnew file mode 100644index 000000000..dc86f594c--- /dev/null+++ b/fincept-qt/src/screens/dashboard/widgets/GeopoliticsEventsWidget.cpp@@ -0,0 +1,300 @@+#include "screens/dashboard/widgets/GeopoliticsEventsWidget.h"++#include "datahub/DataHub.h"+#include "services/geopolitics/GeopoliticsTypes.h"+#include "ui/theme/Theme.h"++#include <QDialog>+#include <QDialogButtonBox>+#include <QFormLayout>+#include <QFrame>+#include <QHBoxLayout>+#include <QJsonObject>+#include <QSpinBox>++namespace fincept::screens::widgets {++namespace {+QString format_relative(const QString& iso) {+ if (iso.isEmpty())+ return QStringLiteral("--");+ const QDateTime dt = QDateTime::fromString(iso, Qt::ISODate);+ if (!dt.isValid())+ return iso.left(10);+ const qint64 secs = dt.secsTo(QDateTime::currentDateTimeUtc());+ if (secs < 60)+ return QStringLiteral("now");+ if (secs < 3600)+ return QString::number(secs / 60) + QStringLiteral("m");+ if (secs < 86400)+ return QString::number(secs / 3600) + QStringLiteral("h");+ return QString::number(secs / 86400) + QStringLiteral("d");+}+} // namespace++GeopoliticsEventsWidget::GeopoliticsEventsWidget(const QJsonObject& cfg, QWidget* parent)+ : BaseWidget("GEOPOLITICS EVENTS", parent, ui::colors::NEGATIVE()) {+ auto* vl = content_layout();+ vl->setContentsMargins(0, 0, 0, 0);+ vl->setSpacing(0);++ // Column headers+ header_widget_ = new QWidget(this);+ auto* hl = new QHBoxLayout(header_widget_);+ hl->setContentsMargins(8, 4, 8, 4);++ auto make_hdr = [&](const QString& text, int stretch, Qt::Alignment align = Qt::AlignLeft) {+ auto* lbl = new QLabel(text);+ lbl->setAlignment(align);+ header_labels_.append(lbl);+ hl->addWidget(lbl, stretch);+ };+ make_hdr("CAT", 1);+ make_hdr("EVENT", 5);+ make_hdr("LOCATION", 2);+ make_hdr("SRC", 1);+ make_hdr("AGE", 1, Qt::AlignRight);+ vl->addWidget(header_widget_);++ header_sep_ = new QFrame;+ header_sep_->setFixedHeight(1);+ vl->addWidget(header_sep_);++ // Scrollable list+ scroll_area_ = new QScrollArea;+ scroll_area_->setWidgetResizable(true);++ auto* list_widget = new QWidget(this);+ list_widget->setStyleSheet("background: transparent;");+ list_layout_ = new QVBoxLayout(list_widget);+ list_layout_->setContentsMargins(0, 0, 0, 0);+ list_layout_->setSpacing(0);++ status_label_ = new QLabel("Loading…");+ status_label_->setAlignment(Qt::AlignCenter);+ list_layout_->addWidget(status_label_);+ list_layout_->addStretch();++ scroll_area_->setWidget(list_widget);+ vl->addWidget(scroll_area_, 1);++ connect(this, &BaseWidget::refresh_requested, this, [this]() {+ datahub::DataHub::instance().request(QStringLiteral("geopolitics:events"), /*force=*/true);+ });++ set_configurable(true);+ apply_styles();+ apply_config(cfg);+ set_loading(true);+}++QJsonObject GeopoliticsEventsWidget::config() const {+ QJsonObject o;+ o.insert("max_rows", max_rows_);+ return o;+}++void GeopoliticsEventsWidget::apply_config(const QJsonObject& cfg) {+ max_rows_ = qBound(5, cfg.value("max_rows").toInt(15), 100);+ if (!last_payload_.isNull())+ populate(last_payload_);+}++void GeopoliticsEventsWidget::hub_resubscribe() {+ auto& hub = datahub::DataHub::instance();+ hub.unsubscribe(this);+ hub.subscribe(this, QStringLiteral("geopolitics:events"),+ [this](const QVariant& v) { populate(v); });++ // Seed from cache so the widget never shows blank while waiting.+ const QVariant cached = hub.peek(QStringLiteral("geopolitics:events"));+ if (cached.isValid())+ populate(cached);+ hub_active_ = true;+}++void GeopoliticsEventsWidget::hub_unsubscribe_all() {+ datahub::DataHub::instance().unsubscribe(this);+ hub_active_ = false;+}++void GeopoliticsEventsWidget::showEvent(QShowEvent* e) {+ BaseWidget::showEvent(e);+ if (!hub_active_)+ hub_resubscribe();+}++void GeopoliticsEventsWidget::hideEvent(QHideEvent* e) {+ BaseWidget::hideEvent(e);+ if (hub_active_)+ hub_unsubscribe_all();+}++void GeopoliticsEventsWidget::clear_rows() {+ while (list_layout_->count() > 0) {+ auto* item = list_layout_->takeAt(0);+ if (item->widget())+ item->widget()->deleteLater();+ delete item;+ }+ status_label_ = nullptr;+}++void GeopoliticsEventsWidget::populate(const QVariant& payload) {+ last_payload_ = payload;++ using fincept::services::geo::EventsPage;+ if (!payload.canConvert<EventsPage>()) {+ clear_rows();+ status_label_ = new QLabel("Awaiting events…");+ status_label_->setAlignment(Qt::AlignCenter);+ status_label_->setStyleSheet(QString("color:%1;font-size:10px;padding:16px;background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ list_layout_->addWidget(status_label_);+ list_layout_->addStretch();+ return;+ }++ const EventsPage page = payload.value<EventsPage>();+ clear_rows();++ if (page.events.isEmpty()) {+ status_label_ = new QLabel("No events available");+ status_label_->setAlignment(Qt::AlignCenter);+ status_label_->setStyleSheet(QString("color:%1;font-size:10px;padding:16px;background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ list_layout_->addWidget(status_label_);+ list_layout_->addStretch();+ set_loading(false);+ return;+ }++ bool alt = false;+ int count = 0;++ for (const auto& ev : page.events) {+ if (count >= max_rows_)+ break;++ QString title = ev.title.trimmed();+ if (title.isEmpty())+ continue;++ QString location;+ if (!ev.city.isEmpty() && !ev.country.isEmpty())+ location = ev.city + ", " + ev.country;+ else if (!ev.country.isEmpty())+ location = ev.country;+ else if (!ev.city.isEmpty())+ location = ev.city;+ else+ location = QStringLiteral("--");++ const QColor cat_col = fincept::services::geo::category_color(ev.event_category);+ const QString cat_label = fincept::services::geo::pretty_category(ev.event_category);++ auto* row = new QWidget(this);+ row->setStyleSheet(QString("background: %1;").arg(alt ? ui::colors::BG_RAISED() : "transparent"));+ auto* rl = new QHBoxLayout(row);+ rl->setContentsMargins(8, 4, 8, 4);++ // Category color dot+ auto* cat_lbl = new QLabel(QStringLiteral("●"));+ cat_lbl->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);+ cat_lbl->setToolTip(cat_label);+ cat_lbl->setStyleSheet(+ QString("color:%1;font-size:12px;background:transparent;").arg(cat_col.name()));+ rl->addWidget(cat_lbl, 1);++ // Title+ QString display_title = title;+ if (display_title.length() > 60)+ display_title = display_title.left(58) + QStringLiteral("…");+ auto* title_lbl = new QLabel(display_title);+ title_lbl->setToolTip(title);+ title_lbl->setStyleSheet(QString("color:%1;font-size:10px;background:transparent;")+ .arg(ui::colors::TEXT_PRIMARY()));+ rl->addWidget(title_lbl, 5);++ // Location+ auto* loc_lbl = new QLabel(location);+ loc_lbl->setStyleSheet(QString("color:%1;font-size:9px;background:transparent;")+ .arg(ui::colors::CYAN()));+ rl->addWidget(loc_lbl, 2);++ // Source+ QString src = ev.source;+ if (src.length() > 8)+ src = src.left(8);+ auto* src_lbl = new QLabel(src.toUpper());+ src_lbl->setToolTip(ev.source);+ src_lbl->setStyleSheet(QString("color:%1;font-size:9px;background:transparent;")+ .arg(ui::colors::TEXT_SECONDARY()));+ rl->addWidget(src_lbl, 1);++ // Age+ const QString age =+ !ev.created_at.isEmpty() ? format_relative(ev.created_at) : format_relative(ev.extracted_date);+ auto* age_lbl = new QLabel(age);+ age_lbl->setAlignment(Qt::AlignRight | Qt::AlignVCenter);+ age_lbl->setStyleSheet(QString("color:%1;font-size:9px;background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ rl->addWidget(age_lbl, 1);++ list_layout_->addWidget(row);+ alt = !alt;+ ++count;+ }++ list_layout_->addStretch();+ set_loading(false);+}++QDialog* GeopoliticsEventsWidget::make_config_dialog(QWidget* parent) {+ auto* dlg = new QDialog(parent);+ dlg->setWindowTitle("Configure — Geopolitics Events");+ auto* form = new QFormLayout(dlg);++ auto* spin = new QSpinBox(dlg);+ spin->setRange(5, 100);+ spin->setValue(max_rows_);+ form->addRow("Max rows", spin);++ auto* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, dlg);+ form->addRow(buttons);++ connect(buttons, &QDialogButtonBox::accepted, dlg, [this, dlg, spin]() {+ QJsonObject cfg;+ cfg.insert("max_rows", spin->value());+ apply_config(cfg);+ emit config_changed(cfg);+ dlg->accept();+ });+ connect(buttons, &QDialogButtonBox::rejected, dlg, &QDialog::reject);+ return dlg;+}++void GeopoliticsEventsWidget::on_theme_changed() {+ apply_styles();+ if (!last_payload_.isNull())+ populate(last_payload_);+}++void GeopoliticsEventsWidget::apply_styles() {+ header_widget_->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_RAISED()));+ for (auto* lbl : header_labels_)+ lbl->setStyleSheet(QString("color:%1;font-size:9px;font-weight:bold;background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ header_sep_->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM()));+ scroll_area_->setStyleSheet(+ QString("QScrollArea{border:none;background:transparent;}"+ "QScrollBar:vertical{width:4px;background:transparent;}"+ "QScrollBar::handle:vertical{background:%1;border-radius:2px;min-height:20px;}"+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")+ .arg(ui::colors::BORDER_MED()));+ if (status_label_)+ status_label_->setStyleSheet(QString("color:%1;font-size:10px;padding:16px;background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+}++} // namespace fincept::screens::widgetsdiff --git a/fincept-qt/src/screens/dashboard/widgets/GeopoliticsEventsWidget.h b/fincept-qt/src/screens/dashboard/widgets/GeopoliticsEventsWidget.hnew file mode 100644index 000000000..8d80c3ab3--- /dev/null+++ b/fincept-qt/src/screens/dashboard/widgets/GeopoliticsEventsWidget.h@@ -0,0 +1,47 @@+#pragma once+// GeopoliticsEventsWidget — rolling list of global conflict / geopolitical+// news events. Subscribes to `geopolitics:events` (EventsPage payload, sorted+// newest-first). Each row: category color dot, title, country/city, source.+//+// Config (persisted): { "max_rows": <int> } — defaults to 15.++#include "screens/dashboard/widgets/BaseWidget.h"++#include <QScrollArea>+#include <QVBoxLayout>++namespace fincept::screens::widgets {++class GeopoliticsEventsWidget : public BaseWidget {+ Q_OBJECT+ public:+ explicit GeopoliticsEventsWidget(const QJsonObject& cfg = {}, QWidget* parent = nullptr);++ QJsonObject config() const override;+ void apply_config(const QJsonObject& cfg) override;++ protected:+ void on_theme_changed() override;+ void showEvent(QShowEvent* e) override;+ void hideEvent(QHideEvent* e) override;+ QDialog* make_config_dialog(QWidget* parent) override;++ private:+ void apply_styles();+ void populate(const QVariant& payload);+ void clear_rows();+ void hub_resubscribe();+ void hub_unsubscribe_all();++ int max_rows_ = 15;+ QWidget* header_widget_ = nullptr;+ QFrame* header_sep_ = nullptr;+ QScrollArea* scroll_area_ = nullptr;+ QVBoxLayout* list_layout_ = nullptr;+ QLabel* status_label_ = nullptr;+ QVector<QLabel*> header_labels_;+ QVariant last_payload_; // cached for theme-change re-populate+ bool hub_active_ = false;+};++} // namespace fincept::screens::widgetsdiff --git a/fincept-qt/src/screens/dashboard/widgets/MaritimeVesselsWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/MaritimeVesselsWidget.cppnew file mode 100644index 000000000..02558b8bb--- /dev/null+++ b/fincept-qt/src/screens/dashboard/widgets/MaritimeVesselsWidget.cpp@@ -0,0 +1,306 @@+#include "screens/dashboard/widgets/MaritimeVesselsWidget.h"++#include "datahub/DataHub.h"+#include "services/maritime/MaritimeTypes.h"+#include "ui/theme/Theme.h"++#include <QDialog>+#include <QDialogButtonBox>+#include <QFormLayout>+#include <QFrame>+#include <QHBoxLayout>+#include <QJsonArray>+#include <QJsonObject>+#include <QPlainTextEdit>++namespace fincept::screens::widgets {++namespace {+QStringList default_imos() {+ // Mix of well-known mega-containers and tankers — gives the widget a+ // populated default state. Users override via gear icon.+ return {QStringLiteral("9811000"), // Ever Ace (container)+ QStringLiteral("9839430"), // MSC Gulsun (container)+ QStringLiteral("9776418"), // CMA CGM Antoine de Saint Exupery+ QStringLiteral("9728691"), // OOCL Hong Kong+ QStringLiteral("9302923")}; // Knock Nevis class tanker+}+} // namespace++MaritimeVesselsWidget::MaritimeVesselsWidget(const QJsonObject& cfg, QWidget* parent)+ : BaseWidget("MARITIME VESSELS", parent, ui::colors::CYAN()) {+ auto* vl = content_layout();+ vl->setContentsMargins(0, 0, 0, 0);+ vl->setSpacing(0);++ // Column headers+ header_widget_ = new QWidget(this);+ auto* hl = new QHBoxLayout(header_widget_);+ hl->setContentsMargins(8, 4, 8, 4);++ auto make_hdr = [&](const QString& text, int stretch, Qt::Alignment align = Qt::AlignLeft) {+ auto* lbl = new QLabel(text);+ lbl->setAlignment(align);+ header_labels_.append(lbl);+ hl->addWidget(lbl, stretch);+ };+ make_hdr("VESSEL", 3);+ make_hdr("ROUTE", 4);+ make_hdr("KN", 1, Qt::AlignRight);+ make_hdr("PROG", 1, Qt::AlignRight);+ vl->addWidget(header_widget_);++ header_sep_ = new QFrame;+ header_sep_->setFixedHeight(1);+ vl->addWidget(header_sep_);++ // Scrollable list+ scroll_area_ = new QScrollArea;+ scroll_area_->setWidgetResizable(true);++ auto* list_widget = new QWidget(this);+ list_widget->setStyleSheet("background: transparent;");+ list_layout_ = new QVBoxLayout(list_widget);+ list_layout_->setContentsMargins(0, 0, 0, 0);+ list_layout_->setSpacing(0);++ status_label_ = new QLabel("Loading…");+ status_label_->setAlignment(Qt::AlignCenter);+ list_layout_->addWidget(status_label_);+ list_layout_->addStretch();++ scroll_area_->setWidget(list_widget);+ vl->addWidget(scroll_area_, 1);++ connect(this, &BaseWidget::refresh_requested, this, [this]() {+ auto& hub = datahub::DataHub::instance();+ for (const auto& imo : imos_)+ hub.request(QStringLiteral("maritime:vessel:") + imo, /*force=*/true);+ });++ set_configurable(true);+ apply_styles();+ apply_config(cfg);+ set_loading(true);+}++QJsonObject MaritimeVesselsWidget::config() const {+ QJsonObject o;+ QJsonArray arr;+ for (const auto& imo : imos_)+ arr.append(imo);+ o.insert("imos", arr);+ return o;+}++void MaritimeVesselsWidget::apply_config(const QJsonObject& cfg) {+ QStringList new_imos;+ if (cfg.contains("imos")) {+ const QJsonArray arr = cfg.value("imos").toArray();+ for (const auto& v : arr) {+ const QString imo = v.toString().trimmed();+ if (!imo.isEmpty())+ new_imos.append(imo);+ }+ } else {+ new_imos = default_imos();+ }++ imos_ = new_imos;+ build_rows();++ if (isVisible())+ hub_resubscribe();+}++void MaritimeVesselsWidget::clear_rows() {+ while (list_layout_->count() > 0) {+ auto* item = list_layout_->takeAt(0);+ if (item->widget())+ item->widget()->deleteLater();+ delete item;+ }+ rows_.clear();+ status_label_ = nullptr;+}++void MaritimeVesselsWidget::build_rows() {+ clear_rows();++ if (imos_.isEmpty()) {+ status_label_ = new QLabel("No vessels configured — click gear to add IMOs");+ status_label_->setAlignment(Qt::AlignCenter);+ status_label_->setStyleSheet(QString("color:%1;font-size:10px;padding:16px;background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ list_layout_->addWidget(status_label_);+ list_layout_->addStretch();+ return;+ }++ bool alt = false;+ for (const auto& imo : imos_) {+ auto* row = new QWidget(this);+ row->setStyleSheet(QString("background: %1;").arg(alt ? ui::colors::BG_RAISED() : "transparent"));+ auto* rl = new QHBoxLayout(row);+ rl->setContentsMargins(8, 4, 8, 4);++ Row r;+ r.container = row;++ r.name = new QLabel(QStringLiteral("IMO ") + imo);+ r.name->setToolTip(QStringLiteral("IMO ") + imo);+ r.name->setStyleSheet(QString("color:%1;font-size:10px;font-weight:bold;background:transparent;")+ .arg(ui::colors::TEXT_PRIMARY()));+ rl->addWidget(r.name, 3);++ r.route = new QLabel(QStringLiteral("—"));+ r.route->setStyleSheet(QString("color:%1;font-size:9px;background:transparent;")+ .arg(ui::colors::TEXT_SECONDARY()));+ rl->addWidget(r.route, 4);++ r.speed = new QLabel(QStringLiteral("—"));+ r.speed->setAlignment(Qt::AlignRight | Qt::AlignVCenter);+ r.speed->setStyleSheet(QString("color:%1;font-size:10px;font-weight:bold;background:transparent;")+ .arg(ui::colors::TEXT_PRIMARY()));+ rl->addWidget(r.speed, 1);++ r.progress = new QLabel(QStringLiteral("—"));+ r.progress->setAlignment(Qt::AlignRight | Qt::AlignVCenter);+ r.progress->setStyleSheet(QString("color:%1;font-size:9px;background:transparent;")+ .arg(ui::colors::CYAN()));+ rl->addWidget(r.progress, 1);++ list_layout_->addWidget(row);+ rows_.insert(imo, r);+ alt = !alt;+ }++ list_layout_->addStretch();+}++void MaritimeVesselsWidget::hub_resubscribe() {+ auto& hub = datahub::DataHub::instance();+ hub.unsubscribe(this);+ for (const auto& imo : imos_) {+ const QString topic = QStringLiteral("maritime:vessel:") + imo;+ const QString imo_copy = imo;+ hub.subscribe(this, topic, [this, imo_copy](const QVariant& v) { on_vessel(imo_copy, v); });++ // Seed from cache so existing data shows immediately.+ const QVariant cached = hub.peek(topic);+ if (cached.isValid())+ on_vessel(imo, cached);+ }+ hub_active_ = true;+}++void MaritimeVesselsWidget::hub_unsubscribe_all() {+ datahub::DataHub::instance().unsubscribe(this);+ hub_active_ = false;+}++void MaritimeVesselsWidget::showEvent(QShowEvent* e) {+ BaseWidget::showEvent(e);+ if (!hub_active_)+ hub_resubscribe();+}++void MaritimeVesselsWidget::hideEvent(QHideEvent* e) {+ BaseWidget::hideEvent(e);+ if (hub_active_)+ hub_unsubscribe_all();+}++void MaritimeVesselsWidget::on_vessel(const QString& imo, const QVariant& v) {+ using fincept::services::maritime::VesselData;+ if (!v.canConvert<VesselData>())+ return;+ const VesselData vd = v.value<VesselData>();++ auto it = rows_.find(imo);+ if (it == rows_.end())+ return;++ const QString display_name = vd.name.isEmpty() ? (QStringLiteral("IMO ") + imo) : vd.name;+ it->name->setText(display_name);+ it->name->setToolTip(QStringLiteral("IMO ") + imo ++ (vd.last_updated.isEmpty() ? QString() : QStringLiteral("\nUpdated: ") + vd.last_updated));++ QString from = vd.from_port.isEmpty() ? QStringLiteral("?") : vd.from_port;+ QString to = vd.to_port.isEmpty() ? QStringLiteral("?") : vd.to_port;+ if (from.length() > 14)+ from = from.left(13) + QStringLiteral("…");+ if (to.length() > 14)+ to = to.left(13) + QStringLiteral("…");+ it->route->setText(from + QStringLiteral(" → ") + to);+ it->route->setToolTip(vd.from_port + QStringLiteral(" → ") + vd.to_port);++ it->speed->setText(QString::number(vd.speed, 'f', 1));++ const double pct = qBound(0.0, vd.route_progress, 100.0);+ it->progress->setText(QString::number(pct, 'f', 0) + QStringLiteral("%"));+ QColor pc = ui::colors::CYAN();+ if (pct >= 90)+ pc = ui::colors::POSITIVE();+ else if (pct < 25)+ pc = ui::colors::WARNING();+ it->progress->setStyleSheet(QString("color:%1;font-size:9px;font-weight:bold;background:transparent;")+ .arg(pc.name()));++ set_loading(false);+}++QDialog* MaritimeVesselsWidget::make_config_dialog(QWidget* parent) {+ auto* dlg = new QDialog(parent);+ dlg->setWindowTitle("Configure — Maritime Vessels");+ auto* form = new QFormLayout(dlg);++ auto* edit = new QPlainTextEdit(dlg);+ edit->setPlaceholderText("One IMO per line (e.g. 9811000)");+ edit->setPlainText(imos_.join('\n'));+ edit->setFixedHeight(140);+ form->addRow("IMO numbers", edit);++ auto* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, dlg);+ form->addRow(buttons);++ connect(buttons, &QDialogButtonBox::accepted, dlg, [this, dlg, edit]() {+ QJsonArray arr;+ const QStringList lines = edit->toPlainText().split('\n', Qt::SkipEmptyParts);+ for (const auto& line : lines) {+ const QString imo = line.trimmed();+ if (!imo.isEmpty())+ arr.append(imo);+ }+ QJsonObject cfg;+ cfg.insert("imos", arr);+ apply_config(cfg);+ emit config_changed(cfg);+ dlg->accept();+ });+ connect(buttons, &QDialogButtonBox::rejected, dlg, &QDialog::reject);+ return dlg;+}++void MaritimeVesselsWidget::on_theme_changed() {+ apply_styles();+}++void MaritimeVesselsWidget::apply_styles() {+ header_widget_->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_RAISED()));+ for (auto* lbl : header_labels_)+ lbl->setStyleSheet(QString("color:%1;font-size:9px;font-weight:bold;background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ header_sep_->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM()));+ scroll_area_->setStyleSheet(+ QString("QScrollArea{border:none;background:transparent;}"+ "QScrollBar:vertical{width:4px;background:transparent;}"+ "QScrollBar::handle:vertical{background:%1;border-radius:2px;min-height:20px;}"+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")+ .arg(ui::colors::BORDER_MED()));+ if (status_label_)+ status_label_->setStyleSheet(QString("color:%1;font-size:10px;padding:16px;background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+}++} // namespace fincept::screens::widgetsdiff --git a/fincept-qt/src/screens/dashboard/widgets/MaritimeVesselsWidget.h b/fincept-qt/src/screens/dashboard/widgets/MaritimeVesselsWidget.hnew file mode 100644index 000000000..a2431da1a--- /dev/null+++ b/fincept-qt/src/screens/dashboard/widgets/MaritimeVesselsWidget.h@@ -0,0 +1,59 @@+#pragma once+// MaritimeVesselsWidget — live position summary for a configurable vessel+// list. Subscribes to `maritime:vessel:<imo>` per IMO. Each row: vessel name,+// from→to ports, speed (kn), route progress %.+//+// Config (persisted): { "imos": ["9811000", ...] } — defaults to a small+// well-known set so the widget is non-empty out of the box.++#include "screens/dashboard/widgets/BaseWidget.h"++#include <QHash>+#include <QScrollArea>+#include <QVBoxLayout>++namespace fincept::screens::widgets {++class MaritimeVesselsWidget : public BaseWidget {+ Q_OBJECT+ public:+ explicit MaritimeVesselsWidget(const QJsonObject& cfg = {}, QWidget* parent = nullptr);++ QJsonObject config() const override;+ void apply_config(const QJsonObject& cfg) override;++ protected:+ void on_theme_changed() override;+ void showEvent(QShowEvent* e) override;+ void hideEvent(QHideEvent* e) override;+ QDialog* make_config_dialog(QWidget* parent) override;++ private:+ struct Row {+ QLabel* name = nullptr;+ QLabel* route = nullptr;+ QLabel* speed = nullptr;+ QLabel* progress = nullptr;+ QWidget* container = nullptr;+ };++ void apply_styles();+ void build_rows();+ void clear_rows();+ void on_vessel(const QString& imo, const QVariant& v);+ void hub_resubscribe();+ void hub_unsubscribe_all();++ QStringList imos_;+ QHash<QString, Row> rows_;++ QWidget* header_widget_ = nullptr;+ QFrame* header_sep_ = nullptr;+ QScrollArea* scroll_area_ = nullptr;+ QVBoxLayout* list_layout_ = nullptr;+ QLabel* status_label_ = nullptr;+ QVector<QLabel*> header_labels_;+ bool hub_active_ = false;+};++} // namespace fincept::screens::widgetsdiff --git a/fincept-qt/src/screens/dashboard/widgets/NotesWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/NotesWidget.cppnew file mode 100644index 000000000..78d9e8b9f--- /dev/null+++ b/fincept-qt/src/screens/dashboard/widgets/NotesWidget.cpp@@ -0,0 +1,365 @@+#include "screens/dashboard/widgets/NotesWidget.h"++#include "storage/repositories/NotesRepository.h"+#include "ui/theme/Theme.h"++#include <QComboBox>+#include <QDateTime>+#include <QDialog>+#include <QDialogButtonBox>+#include <QFormLayout>+#include <QHBoxLayout>+#include <QJsonObject>+#include <QLabel>+#include <QMouseEvent>+#include <QPointer>+#include <QSpinBox>+#include <algorithm>++namespace fincept::screens::widgets {++namespace {+QString format_relative(const QString& iso) {+ if (iso.isEmpty())+ return QStringLiteral("--");+ const QDateTime dt = QDateTime::fromString(iso, Qt::ISODate);+ if (!dt.isValid())+ return iso.left(10);+ const qint64 secs = dt.secsTo(QDateTime::currentDateTime());+ if (secs < 60)+ return QStringLiteral("now");+ if (secs < 3600)+ return QString::number(secs / 60) + QStringLiteral("m");+ if (secs < 86400)+ return QString::number(secs / 3600) + QStringLiteral("h");+ if (secs < 7 * 86400)+ return QString::number(secs / 86400) + QStringLiteral("d");+ return dt.toString("MMM d");+}++QString priority_color(const QString& p) {+ if (p == QStringLiteral("CRITICAL")) return ui::colors::NEGATIVE();+ if (p == QStringLiteral("HIGH")) return ui::colors::WARNING();+ if (p == QStringLiteral("MEDIUM")) return ui::colors::AMBER();+ return ui::colors::TEXT_TERTIARY(); // LOW or empty+}++QString sentiment_glyph(const QString& s) {+ if (s == QStringLiteral("BULLISH")) return QStringLiteral("▲");+ if (s == QStringLiteral("BEARISH")) return QStringLiteral("▼");+ if (s == QStringLiteral("NEUTRAL")) return QStringLiteral("◆");+ return QString();+}++QString sentiment_color(const QString& s) {+ if (s == QStringLiteral("BULLISH")) return ui::colors::POSITIVE();+ if (s == QStringLiteral("BEARISH")) return ui::colors::NEGATIVE();+ return ui::colors::TEXT_SECONDARY();+}+} // namespace++NotesWidget::NotesWidget(const QJsonObject& cfg, QWidget* parent)+ : BaseWidget("NOTES", parent, ui::colors::AMBER()) {+ auto* vl = content_layout();+ vl->setContentsMargins(0, 0, 0, 0);+ vl->setSpacing(0);++ scroll_ = new QScrollArea;+ scroll_->setWidgetResizable(true);++ auto* container = new QWidget(this);+ container->setStyleSheet("background:transparent;");+ list_layout_ = new QVBoxLayout(container);+ list_layout_->setContentsMargins(4, 4, 4, 4);+ list_layout_->setSpacing(3);+ list_layout_->addStretch();+ scroll_->setWidget(container);++ vl->addWidget(scroll_, 1);++ connect(this, &BaseWidget::refresh_requested, this, &NotesWidget::refresh_data);++ set_configurable(true);+ apply_styles();+ apply_config(cfg);+}++QJsonObject NotesWidget::config() const {+ QJsonObject o;+ o.insert("filter", filter_);+ o.insert("max_rows", max_rows_);+ return o;+}++void NotesWidget::apply_config(const QJsonObject& cfg) {+ const QString f = cfg.value("filter").toString("recent");+ filter_ = (f == QStringLiteral("favorites")) ? QStringLiteral("favorites") : QStringLiteral("recent");+ max_rows_ = qBound(3, cfg.value("max_rows").toInt(8), 50);++ set_title(filter_ == QStringLiteral("favorites") ? QStringLiteral("NOTES — FAVORITES")+ : QStringLiteral("NOTES — RECENT"));+ refresh_data();+}++void NotesWidget::showEvent(QShowEvent* e) {+ BaseWidget::showEvent(e);+ subscribe_events();+ refresh_data();+}++void NotesWidget::hideEvent(QHideEvent* e) {+ BaseWidget::hideEvent(e);+ unsubscribe_events();+}++void NotesWidget::subscribe_events() {+ if (!event_subs_.isEmpty())+ return;++ QPointer<NotesWidget> self = this;+ auto on_changed = [self](const QVariantMap&) {+ if (!self)+ return;+ QMetaObject::invokeMethod(+ self.data(), [self]() {+ if (self)+ self->refresh_data();+ },+ Qt::QueuedConnection);+ };++ auto& bus = EventBus::instance();+ event_subs_.append(bus.subscribe("notes.created", on_changed));+ event_subs_.append(bus.subscribe("notes.deleted", on_changed));+}++void NotesWidget::unsubscribe_events() {+ auto& bus = EventBus::instance();+ for (auto id : event_subs_)+ bus.unsubscribe(id);+ event_subs_.clear();+}++void NotesWidget::clear_rows() {+ while (QLayoutItem* item = list_layout_->takeAt(0)) {+ if (item->widget())+ item->widget()->deleteLater();+ delete item;+ }+}++void NotesWidget::refresh_data() {+ clear_rows();++ auto& repo = fincept::NotesRepository::instance();+ auto result = repo.list_all(/*include_archived=*/false);+ if (!result.is_ok()) {+ auto* err = new QLabel(QString("Failed to load notes: %1").arg(QString::fromStdString(result.error())));+ err->setAlignment(Qt::AlignCenter);+ err->setStyleSheet(QString("color:%1;font-size:10px;background:transparent;padding:16px;")+ .arg(ui::colors::NEGATIVE()));+ list_layout_->addWidget(err);+ list_layout_->addStretch();+ set_loading(false);+ return;+ }++ QVector<fincept::FinancialNote> notes = result.value();++ if (filter_ == QStringLiteral("favorites")) {+ QVector<fincept::FinancialNote> filtered;+ for (const auto& n : notes)+ if (n.is_favorite)+ filtered.append(n);+ notes = filtered;+ }++ // Sort newest-first by updated_at (fallback created_at)+ std::sort(notes.begin(), notes.end(), [](const auto& a, const auto& b) {+ const QString lhs = a.updated_at.isEmpty() ? a.created_at : a.updated_at;+ const QString rhs = b.updated_at.isEmpty() ? b.created_at : b.updated_at;+ return lhs > rhs;+ });++ if (notes.size() > max_rows_)+ notes.resize(max_rows_);++ if (notes.isEmpty()) {+ const QString msg = (filter_ == QStringLiteral("favorites"))+ ? QStringLiteral("No favorite notes")+ : QStringLiteral("No notes yet — open Notes screen to add one");+ auto* empty = new QLabel(msg);+ empty->setAlignment(Qt::AlignCenter);+ empty->setStyleSheet(QString("color:%1;font-size:10px;background:transparent;padding:16px;")+ .arg(ui::colors::TEXT_TERTIARY()));+ list_layout_->addWidget(empty);+ list_layout_->addStretch();+ set_loading(false);+ return;+ }++ for (const auto& note : notes) {+ auto* row = new QWidget(this);+ row->setCursor(Qt::PointingHandCursor);+ row->setAttribute(Qt::WA_StyledBackground, true);+ row->setStyleSheet(QString("background:%1;border:1px solid %2;border-radius:2px;")+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));+ auto* rl = new QVBoxLayout(row);+ rl->setContentsMargins(8, 5, 8, 5);+ rl->setSpacing(2);++ // Top line: title + favorite star + sentiment+ auto* top = new QHBoxLayout;+ top->setContentsMargins(0, 0, 0, 0);+ top->setSpacing(6);++ if (note.is_favorite) {+ auto* star = new QLabel(QStringLiteral("★"));+ star->setStyleSheet(QString("color:%1;font-size:11px;background:transparent;")+ .arg(ui::colors::AMBER()));+ top->addWidget(star);+ }++ QString title_text = note.title.trimmed();+ if (title_text.isEmpty())+ title_text = QStringLiteral("(untitled)");+ if (title_text.length() > 50)+ title_text = title_text.left(48) + QStringLiteral("…");+ auto* title_lbl = new QLabel(title_text);+ title_lbl->setToolTip(note.title);+ title_lbl->setStyleSheet(QString("color:%1;font-size:11px;font-weight:600;background:transparent;")+ .arg(ui::colors::TEXT_PRIMARY()));+ top->addWidget(title_lbl, 1);++ const QString sgly = sentiment_glyph(note.sentiment);+ if (!sgly.isEmpty()) {+ auto* sent = new QLabel(sgly);+ sent->setToolTip(note.sentiment);+ sent->setStyleSheet(QString("color:%1;font-size:10px;background:transparent;")+ .arg(sentiment_color(note.sentiment)));+ top->addWidget(sent);+ }+ rl->addLayout(top);++ // Bottom line: priority dot + category + tickers + age+ auto* bot = new QHBoxLayout;+ bot->setContentsMargins(0, 0, 0, 0);+ bot->setSpacing(6);++ if (!note.priority.isEmpty()) {+ auto* prio = new QLabel(QStringLiteral("●"));+ prio->setToolTip(QStringLiteral("Priority: ") + note.priority);+ prio->setStyleSheet(QString("color:%1;font-size:9px;background:transparent;")+ .arg(priority_color(note.priority)));+ bot->addWidget(prio);+ }++ if (!note.category.isEmpty()) {+ auto* cat = new QLabel(note.category);+ cat->setStyleSheet(QString("color:%1;font-size:9px;font-weight:600;background:transparent;")+ .arg(ui::colors::CYAN()));+ bot->addWidget(cat);+ }++ if (!note.tickers.isEmpty()) {+ QString tkr = note.tickers;+ if (tkr.length() > 18)+ tkr = tkr.left(16) + QStringLiteral("…");+ auto* tlbl = new QLabel(tkr);+ tlbl->setToolTip(note.tickers);+ tlbl->setStyleSheet(QString("color:%1;font-size:9px;background:transparent;")+ .arg(ui::colors::TEXT_SECONDARY()));+ bot->addWidget(tlbl);+ }++ bot->addStretch(1);++ const QString age = format_relative(note.updated_at.isEmpty() ? note.created_at : note.updated_at);+ auto* age_lbl = new QLabel(age);+ age_lbl->setStyleSheet(QString("color:%1;font-size:9px;background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ bot->addWidget(age_lbl);++ rl->addLayout(bot);++ // Click → navigate to notes screen. Children are transparent to mouse+ // events so clicks land on the row, where eventFilter catches them.+ const auto child_labels = row->findChildren<QLabel*>();+ for (auto* lbl : child_labels)+ lbl->setAttribute(Qt::WA_TransparentForMouseEvents, true);+ row->installEventFilter(this);+ row->setProperty("note_id", note.id);++ list_layout_->addWidget(row);+ }++ list_layout_->addStretch();+ set_loading(false);+}++bool NotesWidget::eventFilter(QObject* obj, QEvent* event) {+ if (event->type() == QEvent::MouseButtonRelease) {+ auto* me = static_cast<QMouseEvent*>(event);+ if (me->button() == Qt::LeftButton) {+ if (auto* w = qobject_cast<QWidget*>(obj)) {+ const QVariant id_var = w->property("note_id");+ if (id_var.isValid()) {+ EventBus::instance().publish("nav.switch_screen",+ QVariantMap{{"screen_id", "notes"}});+ return true;+ }+ }+ }+ }+ return BaseWidget::eventFilter(obj, event);+}++QDialog* NotesWidget::make_config_dialog(QWidget* parent) {+ auto* dlg = new QDialog(parent);+ dlg->setWindowTitle("Configure — Notes");+ auto* form = new QFormLayout(dlg);++ auto* filter_box = new QComboBox(dlg);+ filter_box->addItem("Recent", "recent");+ filter_box->addItem("Favorites only", "favorites");+ const int idx = filter_box->findData(filter_);+ if (idx >= 0)+ filter_box->setCurrentIndex(idx);+ form->addRow("Filter", filter_box);++ auto* spin = new QSpinBox(dlg);+ spin->setRange(3, 50);+ spin->setValue(max_rows_);+ form->addRow("Max rows", spin);++ auto* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, dlg);+ form->addRow(buttons);++ connect(buttons, &QDialogButtonBox::accepted, dlg, [this, dlg, filter_box, spin]() {+ QJsonObject cfg;+ cfg.insert("filter", filter_box->currentData().toString());+ cfg.insert("max_rows", spin->value());+ apply_config(cfg);+ emit config_changed(cfg);+ dlg->accept();+ });+ connect(buttons, &QDialogButtonBox::rejected, dlg, &QDialog::reject);+ return dlg;+}++void NotesWidget::on_theme_changed() {+ apply_styles();+ if (isVisible())+ refresh_data();+}++void NotesWidget::apply_styles() {+ scroll_->setStyleSheet(+ QString("QScrollArea{border:none;background:transparent;}"+ "QScrollBar:vertical{width:4px;background:transparent;}"+ "QScrollBar::handle:vertical{background:%1;border-radius:2px;min-height:20px;}"+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")+ .arg(ui::colors::BORDER_MED()));+}++} // namespace fincept::screens::widgetsdiff --git a/fincept-qt/src/screens/dashboard/widgets/NotesWidget.h b/fincept-qt/src/screens/dashboard/widgets/NotesWidget.hnew file mode 100644index 000000000..8b68e0ea0--- /dev/null+++ b/fincept-qt/src/screens/dashboard/widgets/NotesWidget.h@@ -0,0 +1,47 @@+#pragma once+// NotesWidget — recent / favorite financial notes from NotesRepository.+// Refreshes on EventBus `notes.created` / `notes.deleted`. Click a row to+// jump to the Notes screen via `nav.switch_screen`.+//+// Config (persisted): { "filter": "recent"|"favorites", "max_rows": <int> }++#include "core/events/EventBus.h"+#include "screens/dashboard/widgets/BaseWidget.h"++#include <QList>+#include <QScrollArea>+#include <QVBoxLayout>++namespace fincept::screens::widgets {++class NotesWidget : public BaseWidget {+ Q_OBJECT+ public:+ explicit NotesWidget(const QJsonObject& cfg = {}, QWidget* parent = nullptr);++ QJsonObject config() const override;+ void apply_config(const QJsonObject& cfg) override;++ protected:+ void on_theme_changed() override;+ void showEvent(QShowEvent* e) override;+ void hideEvent(QHideEvent* e) override;+ QDialog* make_config_dialog(QWidget* parent) override;+ bool eventFilter(QObject* obj, QEvent* event) override;++ private:+ void apply_styles();+ void refresh_data();+ void clear_rows();+ void subscribe_events();+ void unsubscribe_events();++ QString filter_ = "recent"; // "recent" or "favorites"+ int max_rows_ = 8;++ QScrollArea* scroll_ = nullptr;+ QVBoxLayout* list_layout_ = nullptr;+ QList<EventBus::HandlerId> event_subs_;+};++} // namespace fincept::screens::widgetsdiff --git a/fincept-qt/src/screens/docs/DocsScreen.cpp b/fincept-qt/src/screens/docs/DocsScreen.cppindex b0891eada..5152d458a 100644--- a/fincept-qt/src/screens/docs/DocsScreen.cpp+++ b/fincept-qt/src/screens/docs/DocsScreen.cpp@@ -243,7 +243,7 @@ QWidget* DocsScreen::page_welcome() {"■ Real-time market data across equities, crypto, forex, commodities\n""■ Multi-exchange crypto trading (Kraken, HyperLiquid, Binance, etc.)\n""■ Paper trading engine with simulated order matching\n"- "■ 100+ Python analytics scripts (CFA-level: equity, portfolio, derivatives)\n"+ "■ 100+ Python analytics scripts (equity, portfolio, derivatives)\n""■ 18-module QuantLib quantitative analysis suite (590+ endpoints)\n""■ AI Quant Lab with ML models, factor discovery, HFT, RL trading\n""■ Multiple AI agent frameworks (Geopolitics, Economic, Hedge Fund)\n"diff --git a/fincept-qt/src/screens/geopolitics/GeopoliticsScreen.cpp b/fincept-qt/src/screens/geopolitics/GeopoliticsScreen.cppindex 4ec45955d..e0a1170de 100644--- a/fincept-qt/src/screens/geopolitics/GeopoliticsScreen.cpp+++ b/fincept-qt/src/screens/geopolitics/GeopoliticsScreen.cpp@@ -434,15 +434,22 @@ void GeopoliticsScreen::on_tab_changed(int index) {void GeopoliticsScreen::on_events_loaded(services::geo::EventsPage page) {const int shown = page.events.size();const int total = page.total_events;+ int mapped = 0;+ for (const auto& ev : page.events)+ if (ev.has_coords) ++mapped;- // "12 / 1.2K EVENTS" — show what was rendered out of the total.auto fmt_count = [](int n) -> QString {if (n >= 1'000'000) return QString::number(n / 1'000'000.0, 'f', 1) + "M";if (n >= 1'000) return QString::number(n / 1'000.0, 'f', 1) + "K";return QString::number(n);};- event_count_label_->setText(QString("%1 / %2 EVENTS").arg(fmt_count(shown), fmt_count(total)));- const QString color = shown > 0 ? ui::colors::POSITIVE() : ui::colors::NEGATIVE();+ // "30 MAPPED / 100 LOADED · 1.2K TOTAL" — surfaces the API gap (most events+ // arrive without lat/lng, so the map only ever shows the geocoded subset).+ event_count_label_->setText(QString("%1 MAPPED / %2 LOADED")+ .arg(fmt_count(mapped), fmt_count(shown)));+ event_count_label_->setToolTip(QString("Events on map: %1\nEvents loaded: %2\nTotal in API: %3")+ .arg(mapped).arg(shown).arg(total));+ const QString color = mapped > 0 ? ui::colors::POSITIVE() : ui::colors::NEGATIVE();QColor clr(color);auto clr_rgb = QString("%1,%2,%3").arg(clr.red()).arg(clr.green()).arg(clr.blue());event_count_label_->setStyleSheet(diff --git a/fincept-qt/src/screens/info/HelpScreen.cpp b/fincept-qt/src/screens/info/HelpScreen.cppindex 7a83c5299..ffe761569 100644--- a/fincept-qt/src/screens/info/HelpScreen.cpp+++ b/fincept-qt/src/screens/info/HelpScreen.cpp@@ -273,7 +273,7 @@ HelpScreen::HelpScreen(QWidget* parent) : QWidget(parent) {"Upstox, Interactive Brokers, and more."},{"🐍", "Why does Python install at first launch?",- "Fincept embeds Python for 1300+ analytics scripts covering CFA-level equity, "+ "Fincept embeds Python for 1300+ analytics scripts covering equity, ""portfolio, derivatives, and quant analysis. The one-time install is ~150 MB and ""happens automatically in the background."},diff --git a/fincept-qt/src/screens/launchpad/LaunchpadScreen.cpp b/fincept-qt/src/screens/launchpad/LaunchpadScreen.cppnew file mode 100644index 000000000..85536dc98--- /dev/null+++ b/fincept-qt/src/screens/launchpad/LaunchpadScreen.cpp@@ -0,0 +1,214 @@+#include "screens/launchpad/LaunchpadScreen.h"++#include "app/TerminalShell.h"+#include "app/WindowFrame.h"+#include "core/config/ProfileManager.h"+#include "core/keys/WindowCycler.h"+#include "core/layout/LayoutCatalog.h"+#include "core/logging/Logger.h"++#include <QApplication>+#include <QCloseEvent>+#include <QGuiApplication>+#include <QInputDialog>+#include <QLabel>+#include <QLineEdit>+#include <QListWidget>+#include <QListWidgetItem>+#include <QProcess>+#include <QPushButton>+#include <QScreen>+#include <QVBoxLayout>+#include <QWidget>++namespace fincept::screens {++namespace {+constexpr const char* kLaunchpadTag = "Launchpad";+} // namespace++LaunchpadScreen* LaunchpadScreen::instance() {+ // Lazy singleton owned by Qt's top-level-widget tracking. Set+ // WA_QuitOnClose to true via the close handler so the user explicitly+ // closing the launchpad quits the app.+ static LaunchpadScreen* s = new LaunchpadScreen(nullptr);+ return s;+}++LaunchpadScreen::LaunchpadScreen(QWidget* parent) : QMainWindow(parent) {+ setWindowTitle("Fincept Launchpad");+ setMinimumSize(480, 320);+ resize(480, 320);++ auto* central = new QWidget(this);+ auto* vl = new QVBoxLayout(central);+ vl->setContentsMargins(24, 24, 24, 24);+ vl->setSpacing(16);++ const QString profile = ProfileManager::instance().active();+ greeting_ = new QLabel(QString("Profile: %1").arg(profile));+ greeting_->setStyleSheet("font-size: 14px; color: #d97706; font-weight: 600;");+ vl->addWidget(greeting_);++ auto* sub = new QLabel(+ "All windows closed. Open a new window or pick a layout below.");+ sub->setStyleSheet("font-size: 11px; color: #9ca3af;");+ sub->setWordWrap(true);+ vl->addWidget(sub);++ btn_new_window_ = new QPushButton("New Window");+ btn_new_window_->setMinimumHeight(36);+ connect(btn_new_window_, &QPushButton::clicked, this, &LaunchpadScreen::on_new_window);+ vl->addWidget(btn_new_window_);++ btn_open_layout_ = new QPushButton("Open Saved Layout…");+ btn_open_layout_->setMinimumHeight(36);+ btn_open_layout_->setEnabled(false); // Phase 6 wires LayoutCatalog+ btn_open_layout_->setToolTip("Saved layouts arrive in Phase 6");+ connect(btn_open_layout_, &QPushButton::clicked, this, &LaunchpadScreen::on_open_layout);+ vl->addWidget(btn_open_layout_);++ btn_switch_profile_ = new QPushButton("Switch Profile…");+ btn_switch_profile_->setMinimumHeight(36);+ connect(btn_switch_profile_, &QPushButton::clicked, this, &LaunchpadScreen::on_switch_profile);+ vl->addWidget(btn_switch_profile_);++ auto* recent_label = new QLabel("Recent Layouts");+ recent_label->setStyleSheet("font-size: 11px; color: #9ca3af; margin-top: 8px;");+ vl->addWidget(recent_label);++ recent_layouts_ = new QListWidget;+ recent_layouts_->setStyleSheet(+ "QListWidget { background: #111827; border: 1px solid #374151; color: #e5e7eb; }"+ "QListWidget::item { padding: 6px 8px; }"+ "QListWidget::item:hover { background: #1f2937; }"+ "QListWidget::item:selected { background: #1f2937; color: #d97706; }");+ vl->addWidget(recent_layouts_, /*stretch=*/1);+ refresh_recent_layouts();++ setCentralWidget(central);++ // Centre on the primary screen at construction so the user always+ // sees the launchpad in the middle of their main display.+ if (auto* primary = QGuiApplication::primaryScreen()) {+ const QRect avail = primary->availableGeometry();+ move(avail.center() - QPoint(width() / 2, height() / 2));+ }+}++void LaunchpadScreen::surface() {+ if (isVisible() && !isMinimized()) {+ raise();+ activateWindow();+ return;+ }+ user_initiated_close_ = false;+ showNormal();+ raise();+ activateWindow();+ refresh_recent_layouts();+ LOG_INFO(kLaunchpadTag, "Surfaced");+}++void LaunchpadScreen::closeEvent(QCloseEvent* event) {+ if (!user_initiated_close_) {+ // Path: a button handler (on_new_window etc.) called hide() and+ // closeEvent never fires for hide() — but if Qt does send one+ // via window-close protocol while we're in the middle of+ // surfacing a frame, accept it without quitting.+ event->accept();+ return;+ }+ LOG_INFO(kLaunchpadTag, "User closed Launchpad — quitting");+ event->accept();+ QCoreApplication::quit();+}++void LaunchpadScreen::on_new_window() {+ // Spawn a fresh WindowFrame. Reuses WindowCycler's smart-monitor+ // placement so the window lands somewhere visible.+ LOG_INFO(kLaunchpadTag, "New Window button clicked");+ hide();+ WindowCycler::instance().new_window_on_next_monitor();+}++void LaunchpadScreen::on_switch_profile() {+ // Minimal v1: prompt for a profile name. The full UI (list of all+ // profiles + per-profile metadata) lands when Phase 6 / Settings+ // hierarchy gets attention.+ LOG_INFO(kLaunchpadTag, "Switch Profile button clicked");+ bool ok = false;+ const QString name = QInputDialog::getText(+ this, "Switch Profile",+ "Enter profile name (will create if not exists):",+ QLineEdit::Normal, ProfileManager::instance().active(), &ok);+ if (!ok || name.trimmed().isEmpty())+ return;+ // Profile switch is a process-level operation today (set_active ++ // relaunch). The full in-process switch lands with Phase 1b's auth+ // lift. For now: spawn a new instance with --profile arg and quit.+ const QString exe = QCoreApplication::applicationFilePath();+ user_initiated_close_ = true; // ensures closeEvent quits+ QProcess::startDetached(exe, {"--profile", name.trimmed()});+ QCoreApplication::quit();+}++void LaunchpadScreen::on_open_layout() {+ if (!recent_layouts_)+ return;+ auto* item = recent_layouts_->currentItem();+ if (!item) {+ LOG_INFO(kLaunchpadTag, "Open Layout: no item selected");+ return;+ }+ const QString id_str = item->data(Qt::UserRole).toString();+ if (id_str.isEmpty())+ return;++ LayoutId id = LayoutId::from_string(id_str);+ auto r = LayoutCatalog::instance().load_workspace(id);+ if (r.is_err()) {+ LOG_WARN(kLaunchpadTag,+ QString("Open Layout failed: %1").arg(QString::fromStdString(r.error())));+ return;+ }+ LOG_INFO(kLaunchpadTag,+ QString("Loaded layout '%1'. Spawning a frame; full restore arrives with Phase 6 capture_layout.")+ .arg(r.value().name));+ // For v1 we just spawn a fresh frame — full FrameLayout restoration+ // (which requires WindowFrame::apply_layout) is the deeper Phase 6+ // follow-up. The user gets a window; the catalogue entry confirms.+ hide();+ WindowCycler::instance().new_window_on_next_monitor();+}++void LaunchpadScreen::refresh_recent_layouts() {+ if (!recent_layouts_)+ return;+ recent_layouts_->clear();++ // Phase 6: pull from LayoutCatalog. include_auto=false so the+ // continuously-saved "auto" workspace doesn't clutter the list — the+ // user wants to see saved/named layouts here, not the snapshot.+ auto r = LayoutCatalog::instance().recent_layouts(/*limit=*/8, /*include_auto=*/false);+ if (r.is_err() || r.value().isEmpty()) {+ auto* item = new QListWidgetItem("(No saved layouts yet — use 'layout save \"<name>\"' to save the current state)");+ item->setFlags(Qt::NoItemFlags);+ recent_layouts_->addItem(item);+ // Enable the "Open Saved Layout" button if there are any layouts+ // (it's just empty); disabled when none exist.+ if (btn_open_layout_)+ btn_open_layout_->setEnabled(false);+ return;+ }++ for (const auto& e : r.value()) {+ auto* item = new QListWidgetItem(QString("%1 (%2)").arg(e.name, e.kind));+ item->setData(Qt::UserRole, e.id.to_string());+ recent_layouts_->addItem(item);+ }+ if (btn_open_layout_)+ btn_open_layout_->setEnabled(!r.value().isEmpty());+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/launchpad/LaunchpadScreen.h b/fincept-qt/src/screens/launchpad/LaunchpadScreen.hnew file mode 100644index 000000000..36b2f3130--- /dev/null+++ b/fincept-qt/src/screens/launchpad/LaunchpadScreen.h@@ -0,0 +1,64 @@+#pragma once++#include <QMainWindow>++class QLabel;+class QListWidget;+class QPushButton;+class QVBoxLayout;++namespace fincept::screens {++/// Phase 9 trim: small persistent window shown when the user closes the+/// last WindowFrame. Replaces `lastWindowClosed → quit()` so the user can+/// open a new window or switch layouts without re-launching the .exe.+///+/// v1 is intentionally minimal — three buttons, a placeholder recent-layouts+/// list, no command bar. Phase 9's full Launchpad lands the command-bar+/// integration, fuzzy palette, real recent-layouts pulled from+/// LayoutCatalog (Phase 6 deliverable), and onboarding tour.+///+/// Lifecycle:+/// - TerminalShell shows it on `lastWindowClosed` if it isn't already+/// visible. Constructed lazily once per session; reused on subsequent+/// last-window events.+/// - Closing it via the OS close button: quits the application+/// (`QCoreApplication::quit()`).+/// - Opening a new WindowFrame from a button hides the Launchpad+/// (it stays alive in memory; cheaper to hide+show than recreate).+///+/// Sizing: ~480×320, centred on primary screen. Not resizable to keep+/// the visual identity of "this is a portal, not a workspace."+class LaunchpadScreen : public QMainWindow {+ Q_OBJECT+ public:+ static LaunchpadScreen* instance();++ /// Show the launchpad window (centre on primary screen, raise, focus).+ /// No-op if already visible.+ void surface();++ protected:+ void closeEvent(QCloseEvent* event) override;++ private:+ explicit LaunchpadScreen(QWidget* parent = nullptr);++ void on_new_window();+ void on_switch_profile();+ void on_open_layout();+ void refresh_recent_layouts();++ QLabel* greeting_ = nullptr;+ QListWidget* recent_layouts_ = nullptr;+ QPushButton* btn_new_window_ = nullptr;+ QPushButton* btn_switch_profile_ = nullptr;+ QPushButton* btn_open_layout_ = nullptr;++ /// True once the user explicitly clicks the OS close button on the+ /// launchpad — distinguishes "user wants to quit" from "we're hiding+ /// because they spawned a new window from a button click."+ bool user_initiated_close_ = false;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/maritime/MaritimeScreen.cpp b/fincept-qt/src/screens/maritime/MaritimeScreen.cppindex b9484b4f1..bd5c89945 100644--- a/fincept-qt/src/screens/maritime/MaritimeScreen.cpp+++ b/fincept-qt/src/screens/maritime/MaritimeScreen.cpp@@ -4,14 +4,18 @@#include "core/logging/Logger.h"#include "core/session/ScreenStateManager.h"#include "services/maritime/MaritimeService.h"+#include "services/maritime/PortsCatalog.h"#include "ui/theme/Theme.h"#include "ui/theme/ThemeManager.h"+#include "ui/widgets/LoadingOverlay.h"#include "ui/widgets/WorldMapWidget.h"#include <QGridLayout>#include <QHBoxLayout>#include <QHash>#include <QHeaderView>+#include <QJsonObject>+#include <QLocale>#include <QScrollArea>#include <QSet>#include <QSplitter>@@ -96,7 +100,17 @@ MaritimeScreen::MaritimeScreen(QWidget* parent) : QWidget(parent) {refresh_timer_ = new QTimer(this);refresh_timer_->setInterval(5 * 60 * 1000); // 5 min- connect(refresh_timer_, &QTimer::timeout, this, &MaritimeScreen::on_load_vessels);+ // Auto-refresh re-issues whichever mode produced the most recent set: a+ // bbox load if the user had typed one, otherwise the global sample. This+ // avoids a no-op refresh after a first-show global view (the bbox+ // spinners stay at zero in that case).+ connect(refresh_timer_, &QTimer::timeout, this, [this]() {+ const bool valid_bbox = area_min_lat_ && area_max_lat_ && area_min_lng_ && area_max_lng_+ && area_max_lat_->value() > area_min_lat_->value()+ && area_max_lng_->value() > area_min_lng_->value();+ if (valid_bbox) on_load_vessels();+ else load_global_sample();+ });connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed, this,[this](const ui::ThemeTokens&) { apply_theme(); });@@ -109,14 +123,23 @@ void MaritimeScreen::showEvent(QShowEvent* e) {refresh_timer_->start();if (first_show_) {first_show_ = false;- // Pull whatever bounding box the user last typed (restored from- // ScreenStateManager) — no hardcoded "Mumbai area" load.+ // Default first-show action: globally-spread sample so the map looks+ // populated instead of empty. If the user previously typed a valid+ // bbox (restored from ScreenStateManager), honour that instead.+ bool used_saved_bbox = false;if (area_min_lat_ && area_max_lat_ && area_min_lng_ && area_max_lng_) {const bool valid = area_max_lat_->value() > area_min_lat_->value()&& area_max_lng_->value() > area_min_lng_->value();- if (valid)+ if (valid) {on_load_vessels();+ used_saved_bbox = true;+ }}+ if (!used_saved_bbox)+ load_global_sample();+ // Pull module status + DB record count for the status bar — replaces+ // the previously-static "AIS FEED" label with the live API response.+ MaritimeService::instance().check_health();}LOG_INFO("Maritime", "Screen shown");}@@ -131,7 +154,12 @@ void MaritimeScreen::connect_service() {connect(&svc, &MaritimeService::vessels_loaded, this, &MaritimeScreen::on_vessels_loaded);connect(&svc, &MaritimeService::vessel_found, this, &MaritimeScreen::on_vessel_found);connect(&svc, &MaritimeService::vessel_history_loaded, this, &MaritimeScreen::on_vessel_history);+ connect(&svc, &MaritimeService::health_loaded, this, &MaritimeScreen::on_health_loaded);connect(&svc, &MaritimeService::error_occurred, this, &MaritimeScreen::on_error);++ auto& ports = PortsCatalog::instance();+ connect(&ports, &PortsCatalog::ports_found, this, &MaritimeScreen::on_ports_found);+ connect(&ports, &PortsCatalog::error_occurred, this, &MaritimeScreen::on_ports_error);}// ── Theme apply (called on construction + theme_changed) ─────────────────────@@ -205,6 +233,19 @@ void MaritimeScreen::apply_theme() {imo_edit_->setStyleSheet(input_ss());}+void MaritimeScreen::show_map_loading(const QString& msg) {+ if (!map_loader_) return;+ // The overlay sizes from parent->rect() each time it's shown — that's+ // already the behaviour of LoadingOverlay::show_loading(), but resize+ // might have happened since construction so refresh the geometry first.+ if (map_widget_) map_loader_->setGeometry(map_widget_->rect());+ map_loader_->show_loading(msg);+}++void MaritimeScreen::hide_map_loading() {+ if (map_loader_) map_loader_->hide_loading();+}+void MaritimeScreen::set_status(const QString& text, const ui::ColorToken& color) {if (!status_label_)return;@@ -277,9 +318,15 @@ QWidget* MaritimeScreen::build_left_panel() {vl->setContentsMargins(12, 12, 12, 12);vl->setSpacing(8);+ auto* global_btn = new QPushButton("GLOBAL VIEW (200 VESSELS)", panel);+ global_btn->setCursor(Qt::PointingHandCursor);+ global_btn->setStyleSheet(btn_primary_ss());+ connect(global_btn, &QPushButton::clicked, this, &MaritimeScreen::load_global_sample);+ vl->addWidget(global_btn);+auto* load_btn = new QPushButton("LOAD VESSELS IN AREA", panel);load_btn->setCursor(Qt::PointingHandCursor);- load_btn->setStyleSheet(btn_primary_ss());+ load_btn->setStyleSheet(btn_outline_ss());connect(load_btn, &QPushButton::clicked, this, &MaritimeScreen::on_load_vessels);vl->addWidget(load_btn);@@ -385,6 +432,42 @@ QWidget* MaritimeScreen::build_center_panel() {map_widget_ = new fincept::ui::WorldMapWidget(splitter);map_widget_->setMinimumHeight(280);splitter->addWidget(map_widget_);+ // Overlay sits on top of the map and follows its size; it consumes mouse+ // events while visible so the user can't pan a half-loaded map.+ map_loader_ = new fincept::ui::LoadingOverlay(map_widget_);++ // Pin click → populate the right-panel SELECTED VESSEL card with the+ // record we cached in update_map. Clicks during a stale map (cached set+ // emptied) silently no-op.+ connect(map_widget_, &fincept::ui::WorldMapWidget::pin_clicked, this, [this](int id) {+ if (id < 0 || id >= rendered_vessels_.size()) return;+ const auto& v = rendered_vessels_[id];+ if (search_result_card_) search_result_card_->setVisible(true);+ if (search_result_label_) search_result_label_->setVisible(false);+ if (sr_name_) sr_name_->setText(v.name);+ if (sr_imo_) sr_imo_->setText("IMO: " + v.imo);+ if (sr_position_) sr_position_->setText(QString("Position: %1, %2")+ .arg(v.latitude, 0, 'f', 4)+ .arg(v.longitude, 0, 'f', 4));+ if (sr_speed_) sr_speed_->setText(QString("Speed: %1 kn").arg(v.speed, 0, 'f', 1));+ if (sr_from_) sr_from_->setText("From: " + (v.from_port.isEmpty() ? "—" : v.from_port));+ if (sr_to_) sr_to_->setText("To: " + (v.to_port.isEmpty() ? "—" : v.to_port));+ // Sync the IMO field too so the user can hit "VOYAGE HISTORY" right+ // after clicking a pin without retyping.+ if (imo_edit_) imo_edit_->setText(v.imo);+ // Highlight the corresponding row in the vessels table if it's+ // currently rendered (table may be in a different sort order).+ if (vessels_table_) {+ for (int r = 0; r < vessels_table_->rowCount(); ++r) {+ auto* item = vessels_table_->item(r, 1); // IMO column+ if (item && item->text() == v.imo) {+ vessels_table_->setCurrentCell(r, 0);+ vessels_table_->scrollToItem(item, QAbstractItemView::PositionAtCenter);+ break;+ }+ }+ }+ });vessels_table_ = new QTableWidget(splitter);vessels_table_->setColumnCount(9);@@ -453,6 +536,7 @@ QWidget* MaritimeScreen::build_right_panel() {if (imo.isEmpty())return;set_status("LOADING HISTORY...", ui::colors::WARNING);+ show_map_loading(QStringLiteral("LOADING HISTORY"));MaritimeService::instance().get_vessel_history(imo);});vl->addWidget(history_btn);@@ -528,10 +612,100 @@ QWidget* MaritimeScreen::build_right_panel() {params.min_lng = area_min_lng_->value();params.max_lng = area_max_lng_->value();set_status("SEARCHING...", ui::colors::WARNING);+ pending_global_sample_ = false;+ show_map_loading(QStringLiteral("SEARCHING AREA"));MaritimeService::instance().search_vessels_by_area(params);});vl->addWidget(area_btn);+ // ── Ports Search ────────────────────────────────────────────────────────+ //+ // Free port directory (no API key, no static bundle): Wikidata SPARQL+ // primary, with Marine Regions and OSM Overpass as automatic fallbacks+ // inside PortsCatalog. Two entry points: free-text name search (works+ // anywhere in the world) and "ports in current bbox" (uses whatever+ // coords the user typed in the AREA SEARCH spinners above).+ vl->addSpacing(8);+ auto* ports_title = new QLabel("PORTS", content);+ ports_title->setStyleSheet(section_label_ss());+ vl->addWidget(ports_title);++ auto* ports_lbl = new QLabel("PORT NAME", content);+ ports_lbl->setStyleSheet(tiny_label_ss());+ vl->addWidget(ports_lbl);++ ports_query_edit_ = new QLineEdit(content);+ ports_query_edit_->setPlaceholderText("e.g. Rotterdam");+ ports_query_edit_->setStyleSheet(input_ss());+ auto run_name_search = [this]() {+ const QString q = ports_query_edit_->text().trimmed();+ if (q.isEmpty()) return;+ if (ports_status_) ports_status_->setText("Searching…");+ PortsCatalog::instance().search_by_name(q);+ };+ connect(ports_query_edit_, &QLineEdit::returnPressed, this, run_name_search);+ vl->addWidget(ports_query_edit_);++ auto* ports_btn = new QPushButton("SEARCH PORTS", content);+ ports_btn->setCursor(Qt::PointingHandCursor);+ ports_btn->setStyleSheet(btn_primary_ss());+ connect(ports_btn, &QPushButton::clicked, this, run_name_search);+ vl->addWidget(ports_btn);++ auto* ports_in_view_btn = new QPushButton("PORTS IN AREA", content);+ ports_in_view_btn->setCursor(Qt::PointingHandCursor);+ ports_in_view_btn->setStyleSheet(btn_outline_ss());+ connect(ports_in_view_btn, &QPushButton::clicked, this, [this]() {+ if (!area_min_lat_ || !area_max_lat_ || !area_min_lng_ || !area_max_lng_) return;+ const double mn_lat = area_min_lat_->value();+ const double mx_lat = area_max_lat_->value();+ const double mn_lng = area_min_lng_->value();+ const double mx_lng = area_max_lng_->value();+ if (mx_lat <= mn_lat || mx_lng <= mn_lng) {+ if (ports_status_) ports_status_->setText("Set a valid bbox in AREA SEARCH first.");+ return;+ }+ if (ports_status_) ports_status_->setText("Searching…");+ PortsCatalog::instance().search_by_bbox(mn_lat, mx_lat, mn_lng, mx_lng);+ });+ vl->addWidget(ports_in_view_btn);++ ports_status_ = new QLabel(content);+ ports_status_->setStyleSheet(QString("color:%1; font-size:9px; font-family:%2;")+ .arg(ui::colors::TEXT_TERTIARY())+ .arg(ui::fonts::DATA_FAMILY));+ vl->addWidget(ports_status_);++ ports_table_ = new QTableWidget(content);+ ports_table_->setColumnCount(3);+ ports_table_->setHorizontalHeaderLabels({"Name", "Country", "Source"});+ ports_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);+ ports_table_->setSelectionBehavior(QAbstractItemView::SelectRows);+ ports_table_->setSelectionMode(QAbstractItemView::SingleSelection);+ ports_table_->verticalHeader()->setVisible(false);+ ports_table_->horizontalHeader()->setStretchLastSection(true);+ ports_table_->setMinimumHeight(160);+ ports_table_->setStyleSheet(table_ss());+ // Click → drop a CYAN pin on the existing world map to distinguish from+ // the green vessel pins, then re-fit the camera.+ connect(ports_table_, &QTableWidget::currentCellChanged, this,+ [this](int row, int, int, int) {+ if (row < 0 || row >= port_results_.size() || !map_widget_) return;+ const auto& p = port_results_[row];+ // Add port pin on top of existing vessel pins; id=-1 keeps the port+ // pin out of the pin_clicked dispatch (which expects vessel indices).+ fincept::ui::MapPin pin;+ pin.latitude = p.latitude;+ pin.longitude = p.longitude;+ pin.label = QString("%1 (%2)").arg(p.name, p.locode.isEmpty() ? p.country : p.locode);+ pin.color = QColor(ui::colors::CYAN.get());+ pin.radius = 6.0;+ pin.id = -1;+ map_widget_->add_pin(pin);+ map_widget_->fly_to(p.latitude, p.longitude);+ });+ vl->addWidget(ports_table_);+// ── Route Detail ───────────────────────────────────────────────────────vl->addSpacing(8);route_detail_ = new QWidget(content);@@ -622,10 +796,17 @@ QWidget* MaritimeScreen::build_status_bar() {auto* lbl1 = new QLabel("SOURCE:", bar);lbl1->setStyleSheet(s);- auto* val1 = new QLabel("AIS FEED + FINCEPT API", bar);- val1->setStyleSheet(sv);+ source_value_ = new QLabel("—", bar);+ source_value_->setStyleSheet(sv);hl->addWidget(lbl1);- hl->addWidget(val1);+ hl->addWidget(source_value_);++ auto* lbl_rec = new QLabel("RECORDS:", bar);+ lbl_rec->setStyleSheet(s);+ records_value_ = new QLabel("—", bar);+ records_value_->setStyleSheet(sv);+ hl->addWidget(lbl_rec);+ hl->addWidget(records_value_);auto* lbl2 = new QLabel("REFRESH:", bar);lbl2->setStyleSheet(s);@@ -663,6 +844,23 @@ void MaritimeScreen::populate_routes_table() {}// ── Actions ──────────────────────────────────────────────────────────────────+void MaritimeScreen::load_global_sample() {+ // World bbox — the API caps at ±90 lat / ±180 lng, but stays well-behaved+ // with these slightly inset values. Returns ~45k vessels worldwide today;+ // the per-cell downsampler in on_vessels_loaded reduces that to ~200 pins+ // distributed across a 10x10 lat/lng grid so the map fills out instead of+ // clumping in the busiest shipping lanes.+ AreaSearchParams params;+ params.min_lat = -89.0;+ params.max_lat = 89.0;+ params.min_lng = -179.0;+ params.max_lng = 179.0;+ set_status("LOADING GLOBAL...", ui::colors::WARNING);+ pending_global_sample_ = true;+ show_map_loading(QStringLiteral("LOADING GLOBAL VESSELS"));+ MaritimeService::instance().search_vessels_by_area(params);+}+void MaritimeScreen::on_load_vessels() {AreaSearchParams params;if (area_min_lat_) params.min_lat = area_min_lat_->value();@@ -674,6 +872,8 @@ void MaritimeScreen::on_load_vessels() {return;}set_status("LOADING...", ui::colors::WARNING);+ pending_global_sample_ = false; // explicit bbox load — show as-is+ show_map_loading(QStringLiteral("LOADING VESSELS"));MaritimeService::instance().search_vessels_by_area(params);}@@ -684,10 +884,43 @@ void MaritimeScreen::on_search_vessel() {search_result_card_->setVisible(false);search_result_label_->setVisible(false);set_status("TRACKING...", ui::colors::WARNING);+ show_map_loading(QStringLiteral("TRACKING VESSEL"));MaritimeService::instance().get_vessel_position(imo);}void MaritimeScreen::on_vessels_loaded(VesselsPage page) {+ hide_map_loading();+ // Spread mode — globally-sampled fetch was triggered. Bin the returned+ // vessels into a 10x10 lat/lng grid and pick up to 2 per cell so the+ // map gets coverage instead of a dense regional cluster (the API tends+ // to return everything from busy shipping lanes first).+ if (pending_global_sample_) {+ pending_global_sample_ = false;+ constexpr int kBins = 10;+ constexpr int kPerCell = 2;+ constexpr int kTargetCount = 200;+ QHash<int, QVector<int>> by_cell; // cell index → vessel indices+ for (int i = 0; i < page.vessels.size(); ++i) {+ const auto& v = page.vessels[i];+ if (v.latitude == 0.0 && v.longitude == 0.0) continue;+ const int la = qBound(0, int((v.latitude + 90.0) / 180.0 * kBins), kBins - 1);+ const int ln = qBound(0, int((v.longitude + 180.0) / 360.0 * kBins), kBins - 1);+ by_cell[la * kBins + ln].append(i);+ }+ QVector<VesselData> picked;+ picked.reserve(kTargetCount);+ for (auto it = by_cell.cbegin(); it != by_cell.cend() && picked.size() < kTargetCount; ++it) {+ const auto& idxs = it.value();+ const int take = std::min<int>(kPerCell, idxs.size());+ for (int k = 0; k < take && picked.size() < kTargetCount; ++k)+ picked.append(page.vessels[idxs[k]]);+ }+ // Replace the page contents with the spread sample so the table /+ // map / stats all see the same downsampled set.+ page.vessels = picked;+ page.total_count = picked.size();+ }+// Render limit — area-search can return 14k+ rows. Pin/render the top// (newest-first) batch to keep the UI responsive; full count still// shown in the status badge.@@ -755,6 +988,7 @@ void MaritimeScreen::on_vessels_loaded(VesselsPage page) {}void MaritimeScreen::on_vessel_found(VesselData vessel) {+ hide_map_loading();search_result_card_->setVisible(true);search_result_label_->setVisible(false);sr_name_->setText(vessel.name);@@ -767,6 +1001,8 @@ void MaritimeScreen::on_vessel_found(VesselData vessel) {}void MaritimeScreen::on_error(const QString& context, const QString& message) {+ hide_map_loading();+ pending_global_sample_ = false;if (context == "vessel_position") {search_result_card_->setVisible(false);search_result_label_->setText("Error: " + message);@@ -776,6 +1012,69 @@ void MaritimeScreen::on_error(const QString& context, const QString& message) {LOG_ERROR("Maritime", QString("[%1] %2").arg(context, message));}+void MaritimeScreen::on_ports_found(QVector<services::maritime::PortRecord> ports, QString context) {+ Q_UNUSED(context);+ port_results_ = ports;+ if (!ports_table_) return;++ ports_table_->setSortingEnabled(false);+ ports_table_->setRowCount(ports.size());+ for (int i = 0; i < ports.size(); ++i) {+ const auto& p = ports[i];+ // Name cell carries the LOCODE in its tooltip — that's a useful+ // detail without burning a column for fields most rows won't have.+ auto* name = new QTableWidgetItem(p.name);+ if (!p.locode.isEmpty())+ name->setToolTip(QString("%1\nUN/LOCODE: %2").arg(p.name, p.locode));+ ports_table_->setItem(i, 0, name);+ ports_table_->setItem(i, 1, new QTableWidgetItem(p.country));+ ports_table_->setItem(i, 2, new QTableWidgetItem(services::maritime::port_source_name(p.source)));+ }+ ports_table_->setSortingEnabled(true);+ ports_table_->resizeColumnsToContents();++ if (ports_status_) {+ if (ports.isEmpty())+ ports_status_->setText("No ports found.");+ else+ ports_status_->setText(QString("%1 port%2 — click a row to plot.")+ .arg(ports.size())+ .arg(ports.size() == 1 ? "" : "s"));+ }+}++void MaritimeScreen::on_ports_error(const QString& context, const QString& message) {+ LOG_WARN("Maritime", QString("Ports [%1]: %2").arg(context, message));+ if (ports_status_)+ ports_status_->setText("Lookup failed: " + message);+}++void MaritimeScreen::on_health_loaded(QJsonObject data) {+ // /marine/health envelope: {success, message, data:{module, status,+ // database:{status, total_records}, mode, endpoints:{...}}}+ const QJsonObject d = data.value("data").toObject();+ const QString module = d.value("module").toString();+ const QString status = d.value("status").toString();+ const qint64 total = d.value("database").toObject().value("total_records").toVariant().toLongLong();++ if (source_value_) {+ const QString label = module.isEmpty() ? QStringLiteral("FINCEPT MARINE API") : module.toUpper();+ const QString color = status == QStringLiteral("healthy")+ ? ui::colors::POSITIVE()+ : ui::colors::WARNING();+ source_value_->setText(label);+ source_value_->setStyleSheet(QString("color:%1; font-size:8px; font-weight:700; font-family:%2;")+ .arg(color)+ .arg(ui::fonts::DATA_FAMILY));+ }+ if (records_value_) {+ const QString formatted = total > 0+ ? QLocale(QLocale::English).toString(total)+ : QStringLiteral("—");+ records_value_->setText(formatted);+ }+}+void MaritimeScreen::on_route_selected(int row) {if (row < 0 || row >= routes_.size()) {route_detail_->setVisible(false);@@ -826,14 +1125,21 @@ void MaritimeScreen::update_credits(int remaining) {}void MaritimeScreen::update_map(const QVector<VesselData>& vessels) {+ rendered_vessels_.clear();+ rendered_vessels_.reserve(vessels.size());QVector<fincept::ui::MapPin> pins;pins.reserve(vessels.size());QSet<QString> port_seen;for (const auto& v : vessels) {if (v.latitude == 0.0 && v.longitude == 0.0)continue;+ // pin.id = index into rendered_vessels_ — pin_clicked uses it to+ // resolve the click back to the full record for the right-panel+ // detail card.+ const int id = rendered_vessels_.size();+ rendered_vessels_.append(v);pins.append({v.latitude, v.longitude, QString("%1 (%2)").arg(v.name, v.imo),- ui::colors::POSITIVE, 4.0});+ ui::colors::POSITIVE, 4.0, id});// Track unique destination ports for the PORTS stat.if (!v.to_port.isEmpty())port_seen.insert(v.to_port);@@ -869,6 +1175,7 @@ void MaritimeScreen::rebuild_routes_from_vessels(const QVector<VesselData>& vess}void MaritimeScreen::on_vessel_history(VesselHistoryPage page) {+ hide_map_loading();update_credits(page.remaining_credits);const auto& history = page.history;if (history.isEmpty()) {diff --git a/fincept-qt/src/screens/maritime/MaritimeScreen.h b/fincept-qt/src/screens/maritime/MaritimeScreen.hindex d8ca8c363..00255dd8f 100644--- a/fincept-qt/src/screens/maritime/MaritimeScreen.h+++ b/fincept-qt/src/screens/maritime/MaritimeScreen.h@@ -1,11 +1,13 @@// src/screens/maritime/MaritimeScreen.h#pragma once#include "screens/IStatefulScreen.h"+#include "services/maritime/MaritimePortTypes.h"#include "services/maritime/MaritimeTypes.h"#include "ui/theme/Theme.h"#include <QDoubleSpinBox>#include <QHideEvent>+#include <QJsonObject>#include <QLabel>#include <QLineEdit>#include <QPushButton>@@ -16,6 +18,7 @@#include <QWidget>namespace fincept::ui {+class LoadingOverlay;class WorldMapWidget;}@@ -44,8 +47,11 @@ class MaritimeScreen : public QWidget, public IStatefulScreen {void on_vessels_loaded(services::maritime::VesselsPage page);void on_vessel_found(services::maritime::VesselData vessel);void on_vessel_history(services::maritime::VesselHistoryPage page);+ void on_health_loaded(QJsonObject data);void on_error(const QString& context, const QString& message);void on_route_selected(int row);+ void on_ports_found(QVector<services::maritime::PortRecord> ports, QString context);+ void on_ports_error(const QString& context, const QString& message);private:void build_ui();@@ -62,6 +68,12 @@ class MaritimeScreen : public QWidget, public IStatefulScreen {void update_map(const QVector<services::maritime::VesselData>& vessels);void apply_theme();void set_status(const QString& text, const ui::ColorToken& color);+ /// Issue a world-bbox search and flag the result for spatial downsampling+ /// so the map fans out instead of clustering on whatever bbox the user+ /// last typed.+ void load_global_sample();+ void show_map_loading(const QString& msg);+ void hide_map_loading();// Top bar widgets (needed for apply_theme)QWidget* top_bar_ = nullptr;@@ -83,6 +95,7 @@ class MaritimeScreen : public QWidget, public IStatefulScreen {// Centerfincept::ui::WorldMapWidget* map_widget_ = nullptr;+ fincept::ui::LoadingOverlay* map_loader_ = nullptr;QTableWidget* vessels_table_ = nullptr;QTableWidget* routes_table_ = nullptr;@@ -103,6 +116,12 @@ class MaritimeScreen : public QWidget, public IStatefulScreen {QDoubleSpinBox* area_min_lng_ = nullptr;QDoubleSpinBox* area_max_lng_ = nullptr;+ // Right panel - ports search (Wikidata + Marine Regions + OSM Overpass)+ QLineEdit* ports_query_edit_ = nullptr;+ QTableWidget* ports_table_ = nullptr;+ QLabel* ports_status_ = nullptr;+ QVector<services::maritime::PortRecord> port_results_;+// Route detailQWidget* route_detail_ = nullptr;QLabel* rd_name_ = nullptr;@@ -113,13 +132,22 @@ class MaritimeScreen : public QWidget, public IStatefulScreen {// StatusQLabel* status_label_ = nullptr;QLabel* vessel_count_label_ = nullptr;+ QLabel* source_value_ = nullptr; // status-bar SOURCE value (driven by /marine/health)+ QLabel* records_value_ = nullptr; // status-bar RECORDS value (db.total_records)// TimerQTimer* refresh_timer_ = nullptr;bool first_show_ = true;+ /// Set by load_global_sample(); consumed by on_vessels_loaded so that+ /// the next batch is spatially downsampled to ~200 globally-spread pins.+ bool pending_global_sample_ = false;// DataQVector<services::maritime::TradeRoute> routes_;+ /// Vessels currently rendered as map pins. Indexed by MapPin::id so that+ /// pin_clicked can resolve a click back to the full record for display+ /// in the right-panel search-result card.+ QVector<services::maritime::VesselData> rendered_vessels_;};} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/node_editor/NodeEditorScreen.h b/fincept-qt/src/screens/node_editor/NodeEditorScreen.hindex 5ecde6223..bc144d3aa 100644--- a/fincept-qt/src/screens/node_editor/NodeEditorScreen.h+++ b/fincept-qt/src/screens/node_editor/NodeEditorScreen.h@@ -1,4 +1,4 @@-#pragma once+#pragma once#include "screens/IStatefulScreen.h"#include "screens/node_editor/NodeEditorTypes.h"@@ -74,7 +74,7 @@ class NodeEditorScreen : public QWidget, public fincept::screens::IStatefulScree} // namespace fincept::workflow-// Convenience alias used in MainWindow+// Convenience alias used in WindowFramenamespace screens {using NodeEditorScreen = fincept::workflow::NodeEditorScreen;}diff --git a/fincept-qt/src/screens/portfolio/PortfolioBlotter.cpp b/fincept-qt/src/screens/portfolio/PortfolioBlotter.cppindex 10b1445f2..ef2223627 100644--- a/fincept-qt/src/screens/portfolio/PortfolioBlotter.cpp+++ b/fincept-qt/src/screens/portfolio/PortfolioBlotter.cpp@@ -68,12 +68,16 @@ void PortfolioBlotter::build_ui() {// text_dim color, and Qt resolves header sub-controls from the header's// OWN stylesheet, not the parent QTableWidget's. Setting it on the table// is silently overridden, which is why headers stayed dim grey.+ //+ // 1px BORDER_MED bottom rule (was 2px AMBER) — only the CommandBar should+ // hang off the brand rail; tables get a hairline so they don't compete.+ // 11px font (was 10px) to match the unified type scale.hdr->setStyleSheet(QString("QHeaderView::section { background:%1; color:%2; border:none;"- " border-bottom:2px solid %3; border-right:1px solid %4;"- " padding:5px 8px; font-size:10px; font-weight:700;"+ " border-bottom:1px solid %3; border-right:1px solid %4;"+ " padding:5px 8px; font-size:11px; font-weight:700;"" letter-spacing:0.5px; }").arg(ui::colors::BG_SURFACE(), ui::colors::TEXT_PRIMARY(),- ui::colors::AMBER(), ui::colors::BORDER_DIM()));+ ui::colors::BORDER_MED(), ui::colors::BORDER_DIM()));connect(hdr, &QHeaderView::sectionClicked, this, &PortfolioBlotter::on_header_clicked);connect(table_, &QTableWidget::cellClicked, this, &PortfolioBlotter::on_row_clicked);@@ -452,11 +456,11 @@ void PortfolioBlotter::refresh_theme() {// widget itself or the global qApp stylesheet wins.table_->horizontalHeader()->setStyleSheet(QString("QHeaderView::section { background:%1; color:%2; border:none;"- " border-bottom:2px solid %3; border-right:1px solid %4;"+ " border-bottom:1px solid %3; border-right:1px solid %4;"" padding:5px 8px; font-size:" + hsz +"px; font-weight:700; letter-spacing:0.5px; }").arg(ui::colors::BG_SURFACE(), ui::colors::TEXT_PRIMARY(),- ui::colors::AMBER(), ui::colors::BORDER_DIM()));+ ui::colors::BORDER_MED(), ui::colors::BORDER_DIM()));populate_table();}diff --git a/fincept-qt/src/screens/portfolio/PortfolioCommandBar.cpp b/fincept-qt/src/screens/portfolio/PortfolioCommandBar.cppindex ea5e1fc6d..dba8a5a06 100644--- a/fincept-qt/src/screens/portfolio/PortfolioCommandBar.cpp+++ b/fincept-qt/src/screens/portfolio/PortfolioCommandBar.cpp@@ -74,7 +74,6 @@ void PortfolioCommandBar::build_ui() {outer->addWidget(row2_);// Initially hide secondary clusters until portfolios load- stats_container_->hide();trade_cluster_->hide();tabs_container_->hide();tools_cluster_->hide();@@ -83,19 +82,12 @@ void PortfolioCommandBar::build_ui() {// ── Row 1 ────────────────────────────────────────────────────────────────────void PortfolioCommandBar::build_row1(QHBoxLayout* layout) {- // Portfolio selector + inline stats (left-aligned)+ // Portfolio selector (left-aligned). Inline NAV/P&L/DAY/POS labels were+ // dropped — they duplicated the StatsRibbon below this bar. The bar is now+ // strictly identity + actions, never KPI display.build_portfolio_selector();layout->addWidget(selector_btn_);- // Inline stats cluster- stats_container_ = new QWidget(this);- stats_container_->setStyleSheet("background:transparent;");- auto* stats_layout = new QHBoxLayout(stats_container_);- stats_layout->setContentsMargins(0, 0, 0, 0);- stats_layout->setSpacing(14);- build_stats_cluster(stats_layout);- layout->addWidget(stats_container_);-layout->addStretch(1);// Refresh + interval + overflow (right-aligned)@@ -223,21 +215,6 @@ void PortfolioCommandBar::build_portfolio_selector() {dropdown_->hide();}-void PortfolioCommandBar::build_stats_cluster(QHBoxLayout* layout) {- auto make_stat = [](QLabel*& lbl) {- lbl = new QLabel("--");- lbl->setStyleSheet("color:inherit; font-size:11px; font-weight:700; letter-spacing:0.3px;");- };- make_stat(nav_label_);- make_stat(pnl_label_);- make_stat(day_label_);- make_stat(pos_label_);- layout->addWidget(nav_label_);- layout->addWidget(pnl_label_);- layout->addWidget(day_label_);- layout->addWidget(pos_label_);-}-void PortfolioCommandBar::build_overflow_menu() {overflow_btn_ = new QToolButton(this);overflow_btn_->setText("\u22EF"); // horizontal ellipsis@@ -353,35 +330,38 @@ void PortfolioCommandBar::build_tools_cluster(QHBoxLayout* layout) {layout->addWidget(out);};- make_tool_btn(ai_btn_, "AI", "#9D4EDD", &PortfolioCommandBar::ai_analyze_requested);- make_tool_btn(agent_btn_, "AGENT", "#00D4AA", &PortfolioCommandBar::agent_run_requested);+ // AI = AMBER (brand action). AGENT = CYAN (info-tier).+ // Custom hex colors (#9D4EDD purple, #00D4AA teal) violated DESIGN_SYSTEM+ // colour discipline — only AMBER/CYAN/POSITIVE/NEGATIVE/WARNING are allowed.+ make_tool_btn(ai_btn_, "AI", ui::colors::AMBER(), &PortfolioCommandBar::ai_analyze_requested);+ make_tool_btn(agent_btn_, "AGENT", ui::colors::CYAN(), &PortfolioCommandBar::agent_run_requested);}// ── Styling ──────────────────────────────────────────────────────────────────void PortfolioCommandBar::apply_row1_styles() {selector_btn_->setStyleSheet(- QString("QPushButton { background:%1; color:%2; border:1px solid %3; border-radius:2px;"+ QString("QPushButton { background:%1; color:%2; border:1px solid %3;"" padding:0 12px; font-size:11px; font-weight:700; letter-spacing:0.5px; text-align:left; }""QPushButton:hover { border-color:%4; color:%4; }").arg(ui::colors::BG_RAISED(), ui::colors::TEXT_PRIMARY(), ui::colors::BORDER_MED(), ui::colors::AMBER()));refresh_btn_->setStyleSheet(QString("QPushButton#pfIconBtn { background:transparent; color:%1;"- " border:1px solid %2; border-radius:2px; font-size:13px; }"+ " border:1px solid %2; font-size:13px; }""QPushButton#pfIconBtn:hover { border-color:%1; color:%1; }""QPushButton#pfIconBtn:disabled { color:%3; }").arg(ui::colors::AMBER(), ui::colors::BORDER_MED(), ui::colors::TEXT_TERTIARY()));interval_cb_->setStyleSheet(- QString("QComboBox { background:%1; color:%2; border:1px solid %3; border-radius:2px;"- " padding:0 6px; font-size:10px; font-weight:600; min-width:42px; }"+ QString("QComboBox { background:%1; color:%2; border:1px solid %3;"+ " padding:0 6px; font-size:11px; font-weight:600; min-width:42px; }""QComboBox::drop-down { border:none; width:14px; }""QComboBox QAbstractItemView { background:%1; color:%2; selection-background-color:%4; }").arg(ui::colors::BG_RAISED(), ui::colors::TEXT_SECONDARY(), ui::colors::BORDER_DIM(), ui::colors::AMBER_DIM()));overflow_btn_->setStyleSheet(QString("QToolButton#pfOverflowBtn { background:transparent; color:%1; border:1px solid %2;"- " border-radius:2px; font-size:14px; font-weight:700; padding-bottom:4px; }"+ " font-size:14px; font-weight:700; padding-bottom:4px; }""QToolButton#pfOverflowBtn:hover { border-color:%3; color:%3; }""QToolButton#pfOverflowBtn::menu-indicator { image:none; width:0; }").arg(ui::colors::TEXT_SECONDARY(), ui::colors::BORDER_MED(), ui::colors::AMBER()));@@ -389,8 +369,8 @@ void PortfolioCommandBar::apply_row1_styles() {void PortfolioCommandBar::apply_row2_styles() {auto trade_style = [](QPushButton* btn, const char* accent, const char* fg) {- btn->setStyleSheet(QString("QPushButton { background:%1; color:%2; border:none; border-radius:2px;"- " padding:0 10px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"+ btn->setStyleSheet(QString("QPushButton { background:%1; color:%2; border:none;"+ " padding:0 10px; font-size:11px; font-weight:700; letter-spacing:0.5px; }""QPushButton:hover { background:%1; opacity:0.85; }").arg(accent, fg));};@@ -398,10 +378,11 @@ void PortfolioCommandBar::apply_row2_styles() {trade_style(sell_btn_, ui::colors::NEGATIVE(), ui::colors::TEXT_PRIMARY());trade_style(div_btn_, ui::colors::CYAN(), ui::colors::BG_BASE());- // Neutral pill tabs — single style, color reserved for data, not navigation.+ // Neutral square tabs — color reserved for data, not navigation.+ // DESIGN_SYSTEM rule: no rounded corners on any element.const QString tab_qss =QString("QPushButton#pfTab { background:transparent; color:%1; border:1px solid transparent;"- " border-radius:11px; padding:0 10px; font-size:10px; font-weight:600; letter-spacing:0.4px; }"+ " padding:0 10px; font-size:11px; font-weight:600; letter-spacing:0.4px; }""QPushButton#pfTab:hover { color:%2; background:%3; }""QPushButton#pfTab[active=\"true\"] { color:%4; background:%5; border-color:%4; }").arg(ui::colors::TEXT_SECONDARY(), ui::colors::TEXT_PRIMARY(), ui::colors::BG_HOVER(), ui::colors::AMBER(),@@ -412,13 +393,13 @@ void PortfolioCommandBar::apply_row2_styles() {auto tool_style = [](QPushButton* btn, const char* accent) {btn->setStyleSheet(QString("QPushButton#pfToolBtn { background:transparent; color:%1; border:1px solid %1;"- " border-radius:2px; padding:0 10px; font-size:10px; font-weight:700;"+ " padding:0 10px; font-size:11px; font-weight:700;"" letter-spacing:0.5px; }""QPushButton#pfToolBtn:hover { background:%1; color:#000; }").arg(accent));};- tool_style(ai_btn_, "#9D4EDD");- tool_style(agent_btn_, "#00D4AA");+ tool_style(ai_btn_, ui::colors::AMBER());+ tool_style(agent_btn_, ui::colors::CYAN());}// ── Dropdown ─────────────────────────────────────────────────────────────────@@ -464,24 +445,12 @@ void PortfolioCommandBar::set_selected_portfolio(const portfolio::Portfolio& p)update_selector_label();}-void PortfolioCommandBar::set_summary(const portfolio::PortfolioSummary& s) {- auto fmt = [](double v) { return QString::number(v, 'f', 2); };- auto color = [](double v) { return v >= 0 ? ui::colors::POSITIVE() : ui::colors::NEGATIVE(); };- const QString base_css = "font-size:11px; font-weight:700; letter-spacing:0.3px;";-- nav_label_->setText(QString("NAV %1").arg(fmt(s.total_market_value)));- nav_label_->setStyleSheet(QString("color:%1; %2").arg(ui::colors::WARNING(), base_css));-- pnl_label_->setText(- QString("P&L %1%2%").arg(s.total_unrealized_pnl >= 0 ? "+" : "").arg(fmt(s.total_unrealized_pnl_percent)));- pnl_label_->setStyleSheet(QString("color:%1; %2").arg(color(s.total_unrealized_pnl), base_css));-- day_label_->setText(- QString("DAY %1%2%").arg(s.total_day_change >= 0 ? "+" : "").arg(fmt(s.total_day_change_percent)));- day_label_->setStyleSheet(QString("color:%1; %2").arg(color(s.total_day_change), base_css));-- pos_label_->setText(QString("POS %1 \u25B4%2 \u25BE%3").arg(s.total_positions).arg(s.gainers).arg(s.losers));- pos_label_->setStyleSheet(QString("color:%1; %2").arg(ui::colors::TEXT_SECONDARY(), base_css));+void PortfolioCommandBar::set_summary(const portfolio::PortfolioSummary& /*s*/) {+ // No-op. The bar no longer displays KPIs \u2014 those moved to the+ // StatsRibbon below the bar (single source of truth for portfolio stats).+ // Method retained as a public no-op so existing wiring in PortfolioScreen+ // doesn't have to change; can be removed in a follow-up once callers drop+ // the call.}void PortfolioCommandBar::set_refreshing(bool refreshing) {@@ -500,14 +469,12 @@ void PortfolioCommandBar::set_detail_view(std::optional<portfolio::DetailView> v}void PortfolioCommandBar::set_has_selection(bool has) {- stats_container_->setVisible(has);trade_cluster_->setVisible(has);tabs_container_->setVisible(has);tools_cluster_->setVisible(has);}void PortfolioCommandBar::set_has_portfolios(bool has) {- stats_container_->setVisible(false);trade_cluster_->setVisible(false);tabs_container_->setVisible(false);tools_cluster_->setVisible(false);diff --git a/fincept-qt/src/screens/portfolio/PortfolioCommandBar.h b/fincept-qt/src/screens/portfolio/PortfolioCommandBar.hindex c93200582..d598338cc 100644--- a/fincept-qt/src/screens/portfolio/PortfolioCommandBar.h+++ b/fincept-qt/src/screens/portfolio/PortfolioCommandBar.h@@ -51,7 +51,6 @@ class PortfolioCommandBar : public QWidget {void build_row1(QHBoxLayout* layout);void build_row2(QHBoxLayout* layout);void build_portfolio_selector();- void build_stats_cluster(QHBoxLayout* layout);void build_trade_cluster(QHBoxLayout* layout);void build_detail_tabs(QHBoxLayout* layout);void build_tools_cluster(QHBoxLayout* layout);@@ -67,12 +66,6 @@ class PortfolioCommandBar : public QWidget {QLineEdit* search_edit_ = nullptr;QListWidget* portfolio_list_ = nullptr;- // Stats in the bar- QLabel* nav_label_ = nullptr;- QLabel* pnl_label_ = nullptr;- QLabel* day_label_ = nullptr;- QLabel* pos_label_ = nullptr;-// Action buttonsQPushButton* buy_btn_ = nullptr;QPushButton* sell_btn_ = nullptr;@@ -89,9 +82,8 @@ class PortfolioCommandBar : public QWidget {QVector<QPushButton*> detail_btns_;// Containers for show/hide- QWidget* row1_ = nullptr; // selector + stats + refresh/interval/overflow+ QWidget* row1_ = nullptr; // selector + refresh/interval/overflowQWidget* row2_ = nullptr; // BUY/SELL/DIV | detail tabs | AI/AGENT- QWidget* stats_container_ = nullptr; // inline NAV/PNL/DAY/POSQWidget* trade_cluster_ = nullptr; // BUY/SELL/DIVQWidget* tabs_container_ = nullptr; // 9 detail view pillsQWidget* tools_cluster_ = nullptr; // AI/AGENTdiff --git a/fincept-qt/src/screens/portfolio/PortfolioHeatmap.cpp b/fincept-qt/src/screens/portfolio/PortfolioHeatmap.cppindex 7c8dff9d2..15d88d0fb 100644--- a/fincept-qt/src/screens/portfolio/PortfolioHeatmap.cpp+++ b/fincept-qt/src/screens/portfolio/PortfolioHeatmap.cpp@@ -1,6 +1,7 @@// src/screens/portfolio/PortfolioHeatmap.cpp#include "screens/portfolio/PortfolioHeatmap.h"+#include "screens/portfolio/PortfolioPanelHeader.h"#include "ui/theme/Theme.h"#include <QGridLayout>@@ -13,8 +14,10 @@namespace fincept::screens {PortfolioHeatmap::PortfolioHeatmap(QWidget* parent) : QWidget(parent) {- setMinimumWidth(180);- setMaximumWidth(220);+ // Heatmap now shares the top 40% with chart + sector panel (commit #4),+ // not the full left column. Slightly wider band reads better at this size.+ setMinimumWidth(200);+ setMaximumWidth(240);build_ui();}@@ -22,30 +25,28 @@ void PortfolioHeatmap::build_ui() {setStyleSheet(QString("background:%1; border-right:1px solid %2;").arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));+ // Outer layout has zero margins so the unified header sits flush with the+ // panel edges; an inner content layout holds the body with its own padding.auto* layout = new QVBoxLayout(this);- layout->setContentsMargins(8, 8, 8, 6);- layout->setSpacing(5);-- // Header: title + mode buttons- auto* header = new QHBoxLayout;- auto* title = new QLabel("HOLDINGS");- title->setStyleSheet(- QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1.5px;").arg(ui::colors::TEXT_SECONDARY()));- header->addWidget(title);- header->addStretch();-- auto make_mode_btn = [&](const QString& text) {+ layout->setContentsMargins(0, 0, 0, 0);+ layout->setSpacing(0);++ // Unified panel header — HOLDINGS title + 3 mode buttons in the controls slot.+ auto header = make_panel_header("HOLDINGS", this);++ auto make_mode_btn = [this, &header](const QString& text) {auto* btn = new QPushButton(text);btn->setFixedSize(38, 20);btn->setCheckable(true);btn->setCursor(Qt::PointingHandCursor);+ // 10px / 700, square corners. Active = AMBER fill on BG_BASE text.btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %2;"- " font-size:9px; font-weight:700; border-radius:2px; }"+ " font-size:10px; font-weight:700; }""QPushButton:checked { background:%3; color:%4; border-color:%3; }""QPushButton:hover:!checked { color:%5; border-color:%5; }").arg(ui::colors::TEXT_TERTIARY(), ui::colors::BORDER_DIM(), ui::colors::AMBER(),ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY()));- header->addWidget(btn);+ header.controls_slot->layout()->addWidget(btn);return btn;};@@ -66,7 +67,19 @@ void PortfolioHeatmap::build_ui() {connect(weight_btn_, &QPushButton::clicked, this, [=]() { set_mode(portfolio::HeatmapMode::Weight); });connect(day_btn_, &QPushButton::clicked, this, [=]() { set_mode(portfolio::HeatmapMode::DayChange); });- layout->addLayout(header);+ layout->addWidget(header.header);++ // ── Content area below the header ────────────────────────────────────────+ auto* body = new QWidget(this);+ body->setStyleSheet("background:transparent;");+ auto* body_layout_outer = new QVBoxLayout(body);+ body_layout_outer->setContentsMargins(8, 8, 8, 6);+ body_layout_outer->setSpacing(5);+ layout->addWidget(body, 1);++ // Re-aim downstream code: the rest of build_ui() adds widgets to `layout`,+ // but we want them in `body`. Swap the variable name without a wide rewrite.+ layout = body_layout_outer;// Scrollable blocks areaauto* scroll = new QScrollArea;@@ -82,114 +95,50 @@ void PortfolioHeatmap::build_ui() {scroll->setWidget(blocks_container_);layout->addWidget(scroll, 1);- // Selected holding detail- detail_panel_ = new QWidget(this);- detail_panel_->setStyleSheet(- QString("background:%1; border:1px solid %2; padding:4px;").arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));- detail_panel_->setVisible(false);-- auto* dp_layout = new QVBoxLayout(detail_panel_);- dp_layout->setContentsMargins(6, 4, 6, 4);- dp_layout->setSpacing(2);-- detail_symbol_ = new QLabel;- detail_symbol_->setStyleSheet(QString("color:%1; font-size:14px; font-weight:700;").arg(ui::colors::CYAN()));- dp_layout->addWidget(detail_symbol_);-- auto add_detail_row = [&](QLabel*& lbl, const QString& prefix) {- auto* row = new QHBoxLayout;- auto* lab = new QLabel(prefix);- lab->setStyleSheet(QString("color:%1; font-size:9px; font-weight:600;").arg(ui::colors::TEXT_TERTIARY()));- row->addWidget(lab);- lbl = new QLabel("--");- lbl->setAlignment(Qt::AlignRight);- lbl->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700;").arg(ui::colors::TEXT_PRIMARY()));- row->addWidget(lbl);- dp_layout->addLayout(row);- };+ // ── Top movers footer ────────────────────────────────────────────────────+ // The previous panel duplicated the StatsRibbon and the POSITIONS table:+ // - 8-row selected-holding inspector → already in POSITIONS row data+ // - RISK SCORE gauge → already in StatsRibbon RISK chip+ // - HOLDINGS / CONC.TOP3 / VOL30 → already in StatsRibbon+ // All three were deleted. Top movers stays — it's not in the ribbon and+ // is contextual to the heatmap (the visible blocks).+ auto* movers_sep = new QWidget(this);+ movers_sep->setFixedHeight(1);+ movers_sep->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM()));+ layout->addWidget(movers_sep);- add_detail_row(detail_price_, "PRICE");- add_detail_row(detail_change_, "CHG%");- add_detail_row(detail_qty_, "QTY");- add_detail_row(detail_cost_, "COST");- add_detail_row(detail_mv_, "MKT VAL");- add_detail_row(detail_pnl_, "P&L");- add_detail_row(detail_pnl_pct_, "P&L%");- add_detail_row(detail_weight_, "WEIGHT");-- layout->addWidget(detail_panel_);-- // Risk gauge- auto* risk_header = new QLabel("RISK SCORE");- risk_header->setStyleSheet(- QString("color:%1; font-size:8px; font-weight:700; letter-spacing:1px;").arg(ui::colors::TEXT_TERTIARY()));- layout->addWidget(risk_header);-- risk_bar_ = new QWidget(this);- risk_bar_->setFixedHeight(10);- risk_bar_->setStyleSheet(QString("background:%1; border-radius:2px;").arg(ui::colors::BG_BASE()));- layout->addWidget(risk_bar_);-- risk_value_ = new QLabel("--");- risk_value_->setAlignment(Qt::AlignCenter);- risk_value_->setStyleSheet(QString("color:%1; font-size:12px; font-weight:700;").arg(ui::colors::TEXT_SECONDARY()));- layout->addWidget(risk_value_);-- // Top moversauto* movers_header = new QLabel("TOP MOVERS");movers_header->setStyleSheet(- QString("color:%1; font-size:8px; font-weight:700; letter-spacing:1px;").arg(ui::colors::TEXT_TERTIARY()));+ QString("color:%1; font-size:10px; font-weight:700; letter-spacing:1px;"+ " padding-top:4px;")+ .arg(ui::colors::TEXT_TERTIARY()));layout->addWidget(movers_header);top_gainer_ = new QLabel;- top_gainer_->setStyleSheet(QString("color:%1; font-size:10px; font-weight:600;").arg(ui::colors::POSITIVE()));+ top_gainer_->setStyleSheet(QString("color:%1; font-size:11px; font-weight:600;").arg(ui::colors::POSITIVE()));layout->addWidget(top_gainer_);top_loser_ = new QLabel;- top_loser_->setStyleSheet(QString("color:%1; font-size:10px; font-weight:600;").arg(ui::colors::NEGATIVE()));+ top_loser_->setStyleSheet(QString("color:%1; font-size:11px; font-weight:600;").arg(ui::colors::NEGATIVE()));layout->addWidget(top_loser_);-- // Quick stats- auto add_stat = [&](QLabel*& lbl, const QString& prefix) {- auto* row = new QHBoxLayout;- auto* lab = new QLabel(prefix);- lab->setStyleSheet(QString("color:%1; font-size:9px; font-weight:600;").arg(ui::colors::TEXT_TERTIARY()));- row->addWidget(lab);- lbl = new QLabel("--");- lbl->setAlignment(Qt::AlignRight);- lbl->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700;").arg(ui::colors::TEXT_SECONDARY()));- row->addWidget(lbl);- layout->addLayout(row);- };-- add_stat(stat_holdings_, "HOLDINGS");- add_stat(stat_conc_, "CONC. TOP3");- add_stat(stat_vol_, "VOL 30D");}void PortfolioHeatmap::set_holdings(const QVector<portfolio::HoldingWithQuote>& holdings) {holdings_ = holdings;rebuild_blocks();- update_detail();update_top_movers();- stat_holdings_->setText(QString::number(holdings.size()));}void PortfolioHeatmap::set_metrics(const portfolio::ComputedMetrics& metrics) {metrics_ = metrics;- update_risk_gauge();-- stat_conc_->setText(metrics.concentration_top3.has_value()- ? QString("%1%").arg(QString::number(*metrics.concentration_top3, 'f', 1))- : "--");- stat_vol_->setText(metrics.volatility.has_value() ? QString("%1%").arg(QString::number(*metrics.volatility, 'f', 1))- : "--");+ // Risk score / concentration / volatility are now in the StatsRibbon —+ // the heatmap no longer duplicates them. Keep the metrics_ field around+ // in case future heatmap modes want to colour blocks by risk score.}void PortfolioHeatmap::set_selected_symbol(const QString& symbol) {selected_symbol_ = symbol;rebuild_blocks();- update_detail();}void PortfolioHeatmap::set_currency(const QString& currency) {@@ -262,9 +211,10 @@ void PortfolioHeatmap::rebuild_blocks() {QString border_style = selected ? QString("border:2px solid %1;").arg(ui::colors::AMBER()): QString("border:1px solid %1;").arg(ui::colors::BORDER_DIM());+ // Square corners (was border-radius:2px). Block label 11px (was 10px).block->setStyleSheet(QString("QPushButton { background:rgb(%1,%2,%3); %4"- " text-align:left; padding:4px 6px; border-radius:2px;"- " color:%6; font-size:10px; font-weight:700; }"+ " text-align:left; padding:4px 6px;"+ " color:%6; font-size:11px; font-weight:700; }""QPushButton:hover { border-color:%5; }").arg(bg.red()).arg(bg.green())@@ -284,7 +234,6 @@ void PortfolioHeatmap::rebuild_blocks() {connect(block, &QPushButton::clicked, this, [this, sym = h.symbol]() {selected_symbol_ = sym;rebuild_blocks();- update_detail();emit symbol_selected(sym);});@@ -299,59 +248,6 @@ void PortfolioHeatmap::rebuild_blocks() {grid->setRowStretch(row + 1, 1); // push blocks up}-void PortfolioHeatmap::update_detail() {- const portfolio::HoldingWithQuote* found = nullptr;- for (const auto& h : holdings_) {- if (h.symbol == selected_symbol_) {- found = &h;- break;- }- }-- if (!found) {- detail_panel_->setVisible(false);- return;- }-- detail_panel_->setVisible(true);- const auto& h = *found;- auto fmt = [](double v, int dp = 2) { return QString::number(v, 'f', dp); };- auto color = [](double v) -> const char* { return v >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE; };-- detail_symbol_->setText(h.symbol);- detail_price_->setText(fmt(h.current_price));- detail_change_->setText(QString("%1%2%").arg(h.day_change_percent >= 0 ? "+" : "").arg(fmt(h.day_change_percent)));- detail_change_->setStyleSheet(- QString("color:%1; font-size:9px; font-weight:600;").arg(color(h.day_change_percent)));- detail_qty_->setText(fmt(h.quantity, h.quantity == std::floor(h.quantity) ? 0 : 2));- detail_cost_->setText(fmt(h.avg_buy_price));- detail_mv_->setText(fmt(h.market_value));- detail_mv_->setStyleSheet(QString("color:%1; font-size:9px; font-weight:600;").arg(ui::colors::WARNING()));- detail_pnl_->setText(QString("%1%2").arg(h.unrealized_pnl >= 0 ? "+" : "").arg(fmt(h.unrealized_pnl)));- detail_pnl_->setStyleSheet(QString("color:%1; font-size:9px; font-weight:600;").arg(color(h.unrealized_pnl)));- detail_pnl_pct_->setText(- QString("%1%2%").arg(h.unrealized_pnl_percent >= 0 ? "+" : "").arg(fmt(h.unrealized_pnl_percent)));- detail_pnl_pct_->setStyleSheet(- QString("color:%1; font-size:9px; font-weight:600;").arg(color(h.unrealized_pnl_percent)));- detail_weight_->setText(QString("%1%").arg(fmt(h.weight, 1)));-}--void PortfolioHeatmap::update_risk_gauge() {- double rs = metrics_.risk_score.value_or(0);- const char* rs_color = rs < 30 ? ui::colors::POSITIVE : rs < 60 ? ui::colors::WARNING : ui::colors::NEGATIVE;-- // Use a colored inner bar proportional to score- double pct = std::min(rs / 100.0, 1.0);- risk_bar_->setStyleSheet(- QString("background: qlineargradient(x1:0, x2:1, stop:0 %1, stop:%2 %1, stop:%3 transparent);")- .arg(rs_color)- .arg(pct)- .arg(std::min(pct + 0.01, 1.0)));-- risk_value_->setText(QString::number(rs, 'f', 0));- risk_value_->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700;").arg(rs_color));-}-void PortfolioHeatmap::update_top_movers() {if (holdings_.isEmpty()) {top_gainer_->setText("--");@@ -381,9 +277,6 @@ void PortfolioHeatmap::refresh_theme() {setStyleSheet(QString("background:%1; border-right:1px solid %2;").arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));- detail_panel_->setStyleSheet(- QString("background:%1; border:1px solid %2; padding:4px;").arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));-// Rebuild blocks picks up new theme colors for borders/textrebuild_blocks();}diff --git a/fincept-qt/src/screens/portfolio/PortfolioHeatmap.h b/fincept-qt/src/screens/portfolio/PortfolioHeatmap.hindex 07c8bc2b2..5eed072d7 100644--- a/fincept-qt/src/screens/portfolio/PortfolioHeatmap.h+++ b/fincept-qt/src/screens/portfolio/PortfolioHeatmap.h@@ -29,8 +29,6 @@ class PortfolioHeatmap : public QWidget {void build_ui();void rebuild_blocks();QColor block_color(const portfolio::HoldingWithQuote& h) const;- void update_detail();- void update_risk_gauge();void update_top_movers();// Mode buttons@@ -41,32 +39,10 @@ class PortfolioHeatmap : public QWidget {// Blocks containerQWidget* blocks_container_ = nullptr;- // Selected holding detail- QWidget* detail_panel_ = nullptr;- QLabel* detail_symbol_ = nullptr;- QLabel* detail_price_ = nullptr;- QLabel* detail_change_ = nullptr;- QLabel* detail_qty_ = nullptr;- QLabel* detail_cost_ = nullptr;- QLabel* detail_mv_ = nullptr;- QLabel* detail_pnl_ = nullptr;- QLabel* detail_pnl_pct_ = nullptr;- QLabel* detail_weight_ = nullptr;-- // Risk gauge- QLabel* risk_label_ = nullptr;- QWidget* risk_bar_ = nullptr;- QLabel* risk_value_ = nullptr;-- // Top movers+ // Top movers footerQLabel* top_gainer_ = nullptr;QLabel* top_loser_ = nullptr;- // Quick stats- QLabel* stat_holdings_ = nullptr;- QLabel* stat_conc_ = nullptr;- QLabel* stat_vol_ = nullptr;-// StateQVector<portfolio::HoldingWithQuote> holdings_;portfolio::ComputedMetrics metrics_;diff --git a/fincept-qt/src/screens/portfolio/PortfolioPanelHeader.h b/fincept-qt/src/screens/portfolio/PortfolioPanelHeader.hnew file mode 100644index 000000000..6fa082f02--- /dev/null+++ b/fincept-qt/src/screens/portfolio/PortfolioPanelHeader.h@@ -0,0 +1,69 @@+// src/screens/portfolio/PortfolioPanelHeader.h+#pragma once++#include "ui/theme/Theme.h"++#include <QHBoxLayout>+#include <QLabel>+#include <QWidget>++namespace fincept::screens {++/// Unified panel header used by every landing-view panel (HOLDINGS,+/// PERFORMANCE, SECTORS, POSITIONS, TRANSACTION HISTORY).+///+/// Visual contract:+/// - 30px tall, BG_SURFACE background, 1px BORDER_DIM bottom rule+/// - Left: 3×14 amber tick + 11px / 700 / 1.2px tracking title (TEXT_PRIMARY)+/// - Right: caller-supplied controls slot (returned via `controls_slot`)+///+/// Returns the header widget. Caller adds it to a vertical layout, then puts+/// panel-specific controls (period buttons, mode toggles, count badges, filter+/// inputs, ⓢ counts, hide chevrons …) into `controls_slot` using its layout.+struct PanelHeaderResult {+ QWidget* header = nullptr; ///< Add to layout+ QWidget* controls_slot = nullptr; ///< Right-side controls container; has a QHBoxLayout already+ QLabel* title_label = nullptr; ///< In case you need to mutate it (e.g. theme refresh)+};++inline PanelHeaderResult make_panel_header(const QString& title_text, QWidget* parent = nullptr) {+ PanelHeaderResult r;++ r.header = new QWidget(parent);+ r.header->setFixedHeight(30);+ r.header->setObjectName("pfPanelHeader");+ r.header->setStyleSheet(QString("#pfPanelHeader { background:%1; border-bottom:1px solid %2; }")+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));++ auto* hl = new QHBoxLayout(r.header);+ hl->setContentsMargins(12, 0, 10, 0);+ hl->setSpacing(8);++ // ▌ Amber tick — 3×14 vertical bar, square corners (DESIGN_SYSTEM rule 9.1).+ auto* tick = new QLabel(r.header);+ tick->setFixedSize(3, 14);+ tick->setStyleSheet(QString("background:%1;").arg(ui::colors::AMBER()));+ hl->addWidget(tick);++ // Title — 11px / 700 / 1.2px tracking.+ r.title_label = new QLabel(title_text, r.header);+ r.title_label->setStyleSheet(QString("color:%1; font-size:11px; font-weight:700;"+ " letter-spacing:1.2px; background:transparent;")+ .arg(ui::colors::TEXT_PRIMARY()));+ hl->addWidget(r.title_label);++ // Right-side controls slot. Layout already attached so caller can just+ // addWidget into it.+ r.controls_slot = new QWidget(r.header);+ r.controls_slot->setStyleSheet("background:transparent;");+ auto* slot_hl = new QHBoxLayout(r.controls_slot);+ slot_hl->setContentsMargins(0, 0, 0, 0);+ slot_hl->setSpacing(6);++ hl->addStretch(1);+ hl->addWidget(r.controls_slot);++ return r;+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/portfolio/PortfolioPerfChart.cpp b/fincept-qt/src/screens/portfolio/PortfolioPerfChart.cppindex bf2b69165..1c894b072 100644--- a/fincept-qt/src/screens/portfolio/PortfolioPerfChart.cpp+++ b/fincept-qt/src/screens/portfolio/PortfolioPerfChart.cpp@@ -1,6 +1,7 @@// src/screens/portfolio/PortfolioPerfChart.cpp#include "screens/portfolio/PortfolioPerfChart.h"+#include "screens/portfolio/PortfolioPanelHeader.h"#include "ui/theme/Theme.h"#include <QAreaSeries>@@ -41,7 +42,7 @@ CrosshairChartView::CrosshairChartView(QChart* chart, QWidget* parent) : QChartVtooltip_ = new QLabel(this);tooltip_->setWindowFlags(Qt::ToolTip);tooltip_->setStyleSheet(QString("QLabel { background:%1; color:%2; border:1px solid %3;"- " font-size:10px; font-weight:600; padding:3px 6px; border-radius:3px; }")+ " font-size:11px; font-weight:600; padding:3px 6px; }").arg(ui::colors::BG_RAISED(), ui::colors::TEXT_PRIMARY(), ui::colors::BORDER_MED()));tooltip_->hide();}@@ -129,15 +130,10 @@ void PortfolioPerfChart::build_ui() {layout->setContentsMargins(0, 0, 0, 0);layout->setSpacing(0);- // Header: PERFORMANCE + period buttons- auto* header = new QHBoxLayout;- header->setContentsMargins(10, 6, 10, 4);-- auto* title = new QLabel("PERFORMANCE");- title->setStyleSheet(- QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1.5px;").arg(ui::colors::TEXT_SECONDARY()));- header->addWidget(title);- header->addStretch();+ // Unified panel header — PERFORMANCE title + period buttons + benchmark/% toggles+ // packed into the right-side controls slot.+ auto header = make_panel_header("PERFORMANCE", this);+ auto* slot = header.controls_slot->layout();for (const auto& p : kPeriods) {auto* btn = new QPushButton(p);@@ -145,7 +141,7 @@ void PortfolioPerfChart::build_ui() {btn->setCheckable(true);btn->setCursor(Qt::PointingHandCursor);btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid transparent;"- " font-size:9px; font-weight:700; border-radius:2px; }"+ " font-size:11px; font-weight:700; }""QPushButton:checked { color:%4; background:%2;"" border:1px solid %2; }""QPushButton:hover:!checked { color:%3; border-color:%5; }")@@ -157,7 +153,7 @@ void PortfolioPerfChart::build_ui() {connect(btn, &QPushButton::clicked, this, [this, period = p]() { set_period(period); });- header->addWidget(btn);+ slot->addWidget(btn);period_btns_.append(btn);}@@ -170,7 +166,7 @@ void PortfolioPerfChart::build_ui() {benchmark_btn_->setToolTip("Overlay benchmark index (auto-selected by portfolio currency)");benchmark_btn_->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"- " font-size:9px; font-weight:700; border-radius:2px; }"+ " font-size:11px; font-weight:700; }""QPushButton:checked { color:%4; background:%2; border:1px solid %2; }""QPushButton:hover:!checked { color:%3; border-color:%3; }").arg(ui::colors::CYAN(), ui::colors::CYAN(), ui::colors::TEXT_PRIMARY(), ui::colors::BG_BASE()));@@ -178,8 +174,7 @@ void PortfolioPerfChart::build_ui() {show_benchmark_ = benchmark_btn_->isChecked();update_chart();});- header->addSpacing(6);- header->addWidget(benchmark_btn_);+ slot->addWidget(benchmark_btn_);// Indexed-mode toggle: switches the y-axis from currency value to// percent-indexed (base 100). Required for fair benchmark comparison@@ -193,7 +188,7 @@ void PortfolioPerfChart::build_ui() {"the selected period. Use when comparing different currencies.");indexed_btn_->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"- " font-size:9px; font-weight:700; border-radius:2px; }"+ " font-size:11px; font-weight:700; }""QPushButton:checked { color:%4; background:%2; border:1px solid %2; }""QPushButton:hover:!checked { color:%3; border-color:%3; }").arg(ui::colors::TEXT_TERTIARY(), ui::colors::AMBER(), ui::colors::TEXT_PRIMARY(),@@ -202,10 +197,9 @@ void PortfolioPerfChart::build_ui() {indexed_mode_ = indexed_btn_->isChecked();update_chart();});- header->addSpacing(4);- header->addWidget(indexed_btn_);+ slot->addWidget(indexed_btn_);- layout->addLayout(header);+ layout->addWidget(header.header);// Info bar: period change, total return, NAVauto* info_bar = new QHBoxLayout;@@ -618,13 +612,15 @@ void PortfolioPerfChart::update_chart() {void PortfolioPerfChart::refresh_theme() {setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));- const QString bsz = QString::number(ui::fonts::font_px(-3));+ // -2 gives ~11px on the default font scale (was -3 ≈ 10px).+ // Square corners (was border-radius:2px) per DESIGN_SYSTEM rule 9.1.+ const QString bsz = QString::number(ui::fonts::font_px(-2));// Re-style period buttonsfor (auto* btn : period_btns_) {btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid transparent;"" font-size:" +bsz +- "px; font-weight:700; border-radius:2px; }"+ "px; font-weight:700; }""QPushButton:checked { color:%4; background:%2;"" border:1px solid %2; }""QPushButton:hover:!checked { color:%3; border-color:%5; }")@@ -636,7 +632,7 @@ void PortfolioPerfChart::refresh_theme() {QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"" font-size:" +bsz +- "px; font-weight:700; border-radius:2px; }"+ "px; font-weight:700; }""QPushButton:checked { color:%4; background:%2; border:1px solid %2; }""QPushButton:hover:!checked { color:%3; border-color:%3; }").arg(ui::colors::CYAN(), ui::colors::CYAN(), ui::colors::TEXT_PRIMARY(), ui::colors::BG_BASE()));diff --git a/fincept-qt/src/screens/portfolio/PortfolioScreen.cpp b/fincept-qt/src/screens/portfolio/PortfolioScreen.cppindex 2aae68245..2a9dd88b4 100644--- a/fincept-qt/src/screens/portfolio/PortfolioScreen.cpp+++ b/fincept-qt/src/screens/portfolio/PortfolioScreen.cpp@@ -12,6 +12,7 @@#include "screens/portfolio/PortfolioFFNView.h"#include "screens/portfolio/PortfolioHeatmap.h"#include "screens/portfolio/PortfolioOrderPanel.h"+#include "screens/portfolio/PortfolioPanelHeader.h"#include "screens/portfolio/PortfolioPerfChart.h"#include "screens/portfolio/PortfolioSectorPanel.h"#include "screens/portfolio/PortfolioStatsRibbon.h"@@ -325,8 +326,9 @@ static QPushButton* make_cta_card(const QString& glyph, const QString& title, cobtn->setFixedSize(220, 140);btn->setObjectName("pfCtaCard");btn->setProperty("accent", accent_hex);+ // Square corners — DESIGN_SYSTEM rule 9.1 forbids border-radius.btn->setStyleSheet(- QString("QPushButton#pfCtaCard { background:%1; color:%2; border:1px solid %3; border-radius:4px;"+ QString("QPushButton#pfCtaCard { background:%1; color:%2; border:1px solid %3;"" text-align:left; padding:16px; }""QPushButton#pfCtaCard:hover { border-color:%4; background:%5; }").arg(ui::colors::BG_SURFACE(), ui::colors::TEXT_PRIMARY(), ui::colors::BORDER_DIM(), accent_hex,@@ -448,7 +450,8 @@ QWidget* PortfolioScreen::build_loading_state() {auto make_bar = [](int h, int w_px, const QString& color, QWidget* parent) {auto* bar = new QFrame(parent);bar->setFixedSize(w_px, h);- bar->setStyleSheet(QString("background:%1; border-radius:3px;").arg(color));+ // Square — DESIGN_SYSTEM rule 9.1.+ bar->setStyleSheet(QString("background:%1;").arg(color));return bar;};@@ -781,26 +784,23 @@ QWidget* PortfolioScreen::build_main_view() {auto* w = new QWidget(this);w->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));- auto* h_layout = new QHBoxLayout(w);- h_layout->setContentsMargins(0, 0, 0, 0);- h_layout->setSpacing(0);+ // Root: vertical stack. Top row gets 40% (heatmap | chart | sector), the+ // POSITIONS panel takes 60% full-width, and the TXN history sits at the+ // bottom as a collapsible footer. This replaces the previous "heatmap+ // full-height left rail + center column" layout — POSITIONS now spans+ // the full width, which is where the user spends most of their time.+ auto* root_layout = new QVBoxLayout(w);+ root_layout->setContentsMargins(0, 0, 0, 0);+ root_layout->setSpacing(0);- // Left: Heatmap (220px)- heatmap_ = new PortfolioHeatmap;- connect(heatmap_, &PortfolioHeatmap::symbol_selected, this, &PortfolioScreen::on_symbol_selected);- h_layout->addWidget(heatmap_);-- // Center: chart + sector (top), blotter (bottom)- auto* center = new QWidget(this);- auto* center_layout = new QVBoxLayout(center);- center_layout->setContentsMargins(0, 0, 0, 0);- center_layout->setSpacing(0);-- // Top: perf chart + sector panel side by side+ // ── Top row: heatmap | chart | sector — 40% vertical ────────────────────auto* top_split = new QSplitter(Qt::Horizontal);top_split->setHandleWidth(1);top_split->setStyleSheet(QString("QSplitter::handle { background:%1; }").arg(ui::colors::BORDER_DIM()));+ heatmap_ = new PortfolioHeatmap;+ connect(heatmap_, &PortfolioHeatmap::symbol_selected, this, &PortfolioScreen::on_symbol_selected);+perf_chart_ = new PortfolioPerfChart;// Trigger backfill when the user clicks a period that needs more history// than we have cached. PortfolioService re-emits history_backfilled when@@ -811,6 +811,7 @@ QWidget* PortfolioScreen::build_main_view() {return;services::PortfolioService::instance().backfill_history(selected_id_, period);});+sector_panel_ = new PortfolioSectorPanel;connect(sector_panel_, &PortfolioSectorPanel::sector_selected, this, [this](const QString& sector) {if (sector.isEmpty()) {@@ -826,66 +827,55 @@ QWidget* PortfolioScreen::build_main_view() {blotter_->set_sector_filter(matching);});+ top_split->addWidget(heatmap_);top_split->addWidget(perf_chart_);top_split->addWidget(sector_panel_);- top_split->setStretchFactor(0, 7); // ~70%- top_split->setStretchFactor(1, 3); // ~30%- sector_panel_->setMinimumWidth(180);+ top_split->setStretchFactor(0, 0); // heatmap fixed-ish (200-240 via setMin/MaxWidth)+ top_split->setStretchFactor(1, 7); // chart takes the lion's share+ top_split->setStretchFactor(2, 3); // sector ~30% of remaining+ sector_panel_->setMinimumWidth(280);+ // Initial pixel sizes — splitter respects min/max so heatmap clamps to 220+ // even if we ask for 500. Without setSizes the splitter sometimes gives+ // the chart 100% on first paint until a layout tick fires.+ top_split->setSizes({220, 1100, 320});- center_layout->addWidget(top_split, 40); // 40% of vertical space+ root_layout->addWidget(top_split, 40); // 40% of vertical space// Separatorauto* sep = new QWidget(this);sep->setFixedHeight(1);sep->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM()));- center_layout->addWidget(sep);+ root_layout->addWidget(sep);- // Positions section header: title + count badge + filter field+ // Positions section: unified ▌POSITIONS panel header. The previous ad-hoc+ // header_row pattern was the original template that drove make_panel_header;+ // now it consumes the helper like every other panel.auto* blotter_section = new QWidget(this);auto* blotter_layout = new QVBoxLayout(blotter_section);blotter_layout->setContentsMargins(0, 0, 0, 0);blotter_layout->setSpacing(0);- auto* header_row = new QWidget(this);- header_row->setFixedHeight(32);- header_row->setObjectName("pfPositionsHeader");- header_row->setStyleSheet(QString("#pfPositionsHeader { background:%1; border-bottom:1px solid %2; }")- .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));- auto* header_hl = new QHBoxLayout(header_row);- header_hl->setContentsMargins(12, 0, 10, 0);- header_hl->setSpacing(8);-- // Accent tick + section title- auto* title_tick = new QLabel;- title_tick->setFixedSize(3, 14);- title_tick->setStyleSheet(QString("background:%1; border-radius:1px;").arg(ui::colors::AMBER()));- header_hl->addWidget(title_tick);-- auto* title = new QLabel("POSITIONS");- title->setStyleSheet(QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1.2px; background:transparent;")- .arg(ui::colors::TEXT_PRIMARY()));- header_hl->addWidget(title);-- // Count badge+ auto pos_header = make_panel_header("POSITIONS", this);+ auto* header_hl = pos_header.controls_slot->layout();++ // Count badge — square hairline rectangle.positions_count_label_ = new QLabel("0");positions_count_label_->setAlignment(Qt::AlignCenter);positions_count_label_->setMinimumWidth(22);positions_count_label_->setFixedHeight(16);positions_count_label_->setStyleSheet(- QString("color:%1; background:%2; border:1px solid %3; border-radius:8px;"+ QString("color:%1; background:%2; border:1px solid %3;"" font-size:10px; font-weight:700; padding:0 6px;").arg(ui::colors::TEXT_SECONDARY(), ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));header_hl->addWidget(positions_count_label_);- header_hl->addStretch(1);-- // Filter field — right-aligned, framed so it reads as an input, not a label+ // Filter field — right-aligned, framed so it reads as an input. Square (rule 9.1).auto* filter_wrap = new QWidget(this);filter_wrap->setFixedHeight(22);filter_wrap->setMinimumWidth(200);filter_wrap->setObjectName("pfFilterWrap");filter_wrap->setStyleSheet(- QString("#pfFilterWrap { background:%1; border:1px solid %2; border-radius:2px; }"+ QString("#pfFilterWrap { background:%1; border:1px solid %2; }""#pfFilterWrap:focus-within { border-color:%3; }").arg(ui::colors::BG_BASE(), ui::colors::BORDER_DIM(), ui::colors::AMBER()));auto* filter_hl = new QHBoxLayout(filter_wrap);@@ -907,7 +897,7 @@ QWidget* PortfolioScreen::build_main_view() {header_hl->addWidget(filter_wrap);- blotter_layout->addWidget(header_row);+ blotter_layout->addWidget(pos_header.header);// Bottom: positions blotterblotter_ = new PortfolioBlotter;@@ -954,15 +944,19 @@ QWidget* PortfolioScreen::build_main_view() {blotter_layout->addWidget(blotter_, 1);- // Transaction history panel below blotter- txn_panel_ = new PortfolioTxnPanel;- txn_panel_->setMinimumHeight(80);- txn_panel_->setMaximumHeight(160);- blotter_layout->addWidget(txn_panel_);+ root_layout->addWidget(blotter_section, 60); // 60% of vertical space- center_layout->addWidget(blotter_section, 60); // 60% of vertical space-- h_layout->addWidget(center, 1); // center takes full remaining space+ // ── Footer: transaction history (collapsible) ────────────────────────────+ // Sits at the bottom of the main view, full-width. Defaults open at 140px;+ // user can collapse via the chevron in its header.+ txn_panel_ = new PortfolioTxnPanel;+ txn_panel_->setFixedHeight(140);+ root_layout->addWidget(txn_panel_);+ connect(txn_panel_, &PortfolioTxnPanel::collapse_toggled, this, [this](bool collapsed) {+ // Header is 30px, table content is the rest. When collapsed, shrink+ // to header height; when expanded, restore to 140px.+ txn_panel_->setFixedHeight(collapsed ? 30 : 140);+ });// Order panel is a floating overlay (parented to PortfolioScreen, not in layout)// so BUY/SELL slides in from the right edge without reflowing the main grid.diff --git a/fincept-qt/src/screens/portfolio/PortfolioSectorPanel.cpp b/fincept-qt/src/screens/portfolio/PortfolioSectorPanel.cppindex 5793b22c1..0b75e3d28 100644--- a/fincept-qt/src/screens/portfolio/PortfolioSectorPanel.cpp+++ b/fincept-qt/src/screens/portfolio/PortfolioSectorPanel.cpp@@ -1,6 +1,7 @@// src/screens/portfolio/PortfolioSectorPanel.cpp#include "screens/portfolio/PortfolioSectorPanel.h"+#include "screens/portfolio/PortfolioPanelHeader.h"#include "ui/theme/Theme.h"#include <QChart>@@ -53,17 +54,20 @@ void PortfolioSectorPanel::build_ui() {layout->setContentsMargins(0, 0, 0, 0);layout->setSpacing(0);+ // ── Unified panel header: ▌SECTORS ───────────────────────────────────────+ // The two inner sub-sections (allocation donut + correlation matrix) sit+ // beneath this single header, separated by a hairline. The old design+ // gave each a 9-11px inline title; consolidating them here keeps the+ // panel header treatment consistent with HOLDINGS / PERFORMANCE / etc.+ auto panel_hdr = make_panel_header("SECTORS", this);+ layout->addWidget(panel_hdr.header);+// ── Top: Sector Allocation (60%) ──────────────────────────────────────────auto* sector_widget = new QWidget(this);auto* sector_layout = new QVBoxLayout(sector_widget);- sector_layout->setContentsMargins(8, 4, 8, 4);+ sector_layout->setContentsMargins(8, 6, 8, 4);sector_layout->setSpacing(4);- auto* sector_header = new QLabel("SECTOR ALLOCATION");- sector_header->setStyleSheet(- QString("color:%1; font-size:9px; font-weight:700; letter-spacing:0.5px;").arg(ui::colors::TEXT_SECONDARY()));- sector_layout->addWidget(sector_header);-auto* donut_row = new QHBoxLayout;auto* chart = new QChart;@@ -97,14 +101,16 @@ void PortfolioSectorPanel::build_ui() {corr_layout->setContentsMargins(8, 4, 8, 4);corr_layout->setSpacing(4);+ // Inline sub-section title (smaller weight than the unified panel header+ // above — this is a sub-block within ▌SECTORS, not a peer panel).auto* corr_header = new QHBoxLayout;- auto* corr_title = new QLabel("CORRELATION MATRIX");+ auto* corr_title = new QLabel("CORRELATION");corr_title->setStyleSheet(- QString("color:%1; font-size:9px; font-weight:700; letter-spacing:0.5px;").arg(ui::colors::TEXT_SECONDARY()));+ QString("color:%1; font-size:10px; font-weight:700; letter-spacing:1px;").arg(ui::colors::TEXT_TERTIARY()));corr_header->addWidget(corr_title);- auto* corr_note = new QLabel("(P&L return proxy)");- corr_note->setStyleSheet(QString("color:%1; font-size:8px;").arg(ui::colors::TEXT_TERTIARY()));+ auto* corr_note = new QLabel("(P&L return proxy, top 6 by weight)");+ corr_note->setStyleSheet(QString("color:%1; font-size:10px;").arg(ui::colors::TEXT_DIM()));corr_header->addWidget(corr_note);corr_header->addStretch();corr_layout->addLayout(corr_header);@@ -207,7 +213,8 @@ void PortfolioSectorPanel::update_donut() {// Wrap the row in a clickable QWidget for hit-testingauto* row_widget = new QWidget(this);row_widget->setCursor(Qt::PointingHandCursor);- row_widget->setStyleSheet(active ? QString("background:%1; border-radius:2px;").arg(ui::colors::BG_HOVER())+ // Square corners — DESIGN_SYSTEM forbids border-radius on panel-level UI.+ row_widget->setStyleSheet(active ? QString("background:%1;").arg(ui::colors::BG_HOVER()): "background:transparent;");auto* row = new QHBoxLayout(row_widget);@@ -216,23 +223,24 @@ void PortfolioSectorPanel::update_donut() {auto* swatch = new QWidget(this);swatch->setFixedSize(8, 8);- swatch->setStyleSheet(QString("background:%1; border-radius:1px;").arg(sector_color(i).name()));+ swatch->setStyleSheet(QString("background:%1;").arg(sector_color(i).name()));row->addWidget(swatch);+ // 11px floor (was 9px). Active row uses AMBER text; otherwise TEXT_PRIMARY.auto* name = new QLabel(QString("%1 (%2)").arg(sec).arg(sector_counts[sec]));- name->setStyleSheet(active ? QString("color:%1; font-size:9px; font-weight:700;").arg(ui::colors::AMBER())- : QString("color:%1; font-size:9px;").arg(ui::colors::TEXT_PRIMARY()));+ name->setStyleSheet(active ? QString("color:%1; font-size:11px; font-weight:700;").arg(ui::colors::AMBER())+ : QString("color:%1; font-size:11px;").arg(ui::colors::TEXT_PRIMARY()));row->addWidget(name);row->addStretch();double pnl = sector_pnl[sec];auto* pnl_lbl = new QLabel(QString("%1%2").arg(pnl >= 0 ? "+" : "").arg(QString::number(pnl, 'f', 0)));const char* pc = pnl >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE;- pnl_lbl->setStyleSheet(QString("color:%1; font-size:8px;").arg(pc));+ pnl_lbl->setStyleSheet(QString("color:%1; font-size:10px;").arg(pc));row->addWidget(pnl_lbl);auto* weight = new QLabel(QString(" %1%").arg(QString::number(sorted[i].second, 'f', 1)));- weight->setStyleSheet(QString("color:%1; font-size:9px; font-weight:600;").arg(ui::colors::TEXT_SECONDARY()));+ weight->setStyleSheet(QString("color:%1; font-size:11px; font-weight:600;").arg(ui::colors::TEXT_SECONDARY()));row->addWidget(weight);// Install click via event filter on row_widget@@ -258,7 +266,7 @@ void PortfolioSectorPanel::update_correlation() {if (holdings_.size() < 2) {auto* layout = new QVBoxLayout(corr_widget_);auto* msg = new QLabel("Need 2+ holdings for correlation");- msg->setStyleSheet(QString("color:%1; font-size:9px;").arg(ui::colors::TEXT_TERTIARY()));+ msg->setStyleSheet(QString("color:%1; font-size:11px;").arg(ui::colors::TEXT_TERTIARY()));msg->setAlignment(Qt::AlignCenter);layout->addWidget(msg);return;@@ -297,14 +305,14 @@ void PortfolioSectorPanel::update_correlation() {for (int i = 0; i < n; ++i) {auto* lbl = new QLabel(sorted[i].symbol.left(4));lbl->setAlignment(Qt::AlignCenter);- lbl->setStyleSheet(QString("color:%1; font-size:7px; font-weight:700;").arg(ui::colors::TEXT_SECONDARY()));+ lbl->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700;").arg(ui::colors::TEXT_SECONDARY()));grid->addWidget(lbl, 0, i + 1);}// Matrixfor (int r = 0; r < n; ++r) {auto* row_label = new QLabel(sorted[r].symbol.left(4));- row_label->setStyleSheet(QString("color:%1; font-size:7px; font-weight:700;").arg(ui::colors::TEXT_SECONDARY()));+ row_label->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700;").arg(ui::colors::TEXT_SECONDARY()));grid->addWidget(row_label, r + 1, 0);for (int c = 0; c < n; ++c) {@@ -315,7 +323,7 @@ void PortfolioSectorPanel::update_correlation() {auto* cell = new QLabel(label);cell->setAlignment(Qt::AlignCenter);- cell->setFixedSize(32, 18);+ cell->setFixedSize(40, 22);QColor bg;if (is_diag) {@@ -330,7 +338,7 @@ void PortfolioSectorPanel::update_correlation() {const char* text_color = is_diag ? ui::colors::BG_BASE : ui::colors::TEXT_PRIMARY;cell->setStyleSheet(QString("background:rgba(%1,%2,%3,%4); color:%5;"- "font-size:7px; font-weight:600;")+ "font-size:10px; font-weight:600;").arg(bg.red()).arg(bg.green()).arg(bg.blue())diff --git a/fincept-qt/src/screens/portfolio/PortfolioStatsRibbon.cpp b/fincept-qt/src/screens/portfolio/PortfolioStatsRibbon.cppindex d415da038..3a07ee5b2 100644--- a/fincept-qt/src/screens/portfolio/PortfolioStatsRibbon.cpp+++ b/fincept-qt/src/screens/portfolio/PortfolioStatsRibbon.cpp@@ -4,327 +4,249 @@#include "ui/theme/Theme.h"#include <QFrame>+#include <QGridLayout>#include <QHBoxLayout>-#include <QScrollArea>+#include <QLocale>#include <QVBoxLayout>+#include <algorithm>#include <cmath>namespace fincept::screens {+namespace {++QWidget* make_v_separator(QWidget* parent) {+ auto* sep = new QWidget(parent);+ sep->setFixedWidth(1);+ sep->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM()));+ return sep;+}++} // namespace+PortfolioStatsRibbon::PortfolioStatsRibbon(QWidget* parent) : QWidget(parent) {setFixedHeight(72);setObjectName("portfolioStatsRibbon");setStyleSheet(QString("#portfolioStatsRibbon { background:%1; border-bottom:1px solid %2; }").arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));- auto* outer = new QVBoxLayout(this);- outer->setContentsMargins(0, 0, 0, 0);- outer->setSpacing(0);-- // ── Primary row: 4 hero KPIs (44px) ──────────────────────────────────────- primary_row_ = new QWidget(this);- primary_row_->setFixedHeight(44);- primary_row_->setObjectName("pfStatsPrimary");- primary_row_->setStyleSheet("#pfStatsPrimary { background:transparent; }");- auto* primary_layout = new QHBoxLayout(primary_row_);- primary_layout->setContentsMargins(0, 0, 0, 0);- primary_layout->setSpacing(0);-- total_value_ = add_hero(primary_layout, "TOTAL VALUE", ui::colors::WARNING);- total_value_.container->setToolTip("Current market value of all holdings.\n"- "Sum of (quantity × current price) for every position.");-- pnl_ = add_hero(primary_layout, "UNREALIZED P&L", ui::colors::TEXT_PRIMARY);- pnl_.container->setToolTip("Unrealized profit or loss across all open positions.\n"- "Calculated as: market value − total cost basis.\n"- "This gain/loss is not realized until you sell.");-- day_change_ = add_hero(primary_layout, "DAY CHANGE", ui::colors::TEXT_PRIMARY);- day_change_.container->setToolTip("Total portfolio value change today.\n"- "Weighted sum of each holding's intraday change.");-- positions_ = add_hero(primary_layout, "POSITIONS", ui::colors::TEXT_PRIMARY);- positions_.container->setToolTip("Number of distinct holdings in this portfolio,\n"- "split into gainers (▲) and losers (▼) today.");-- outer->addWidget(primary_row_);-- // Thin divider between tiers- auto* divider = new QWidget(this);- divider->setFixedHeight(1);- divider->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM()));- outer->addWidget(divider);-- // ── Secondary row: risk chips (27px) ─────────────────────────────────────- secondary_row_ = new QWidget(this);- secondary_row_->setFixedHeight(27);- secondary_row_->setObjectName("pfStatsSecondary");- secondary_row_->setStyleSheet(QString("#pfStatsSecondary { background:%1; }").arg(ui::colors::BG_BASE()));-- auto* scroll = new QScrollArea(secondary_row_);- scroll->setWidgetResizable(true);- scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);- scroll->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);- scroll->setFrameShape(QFrame::NoFrame);- scroll->setStyleSheet("QScrollArea { background:transparent; border:none; }");-- auto* sec_outer = new QHBoxLayout(secondary_row_);- sec_outer->setContentsMargins(0, 0, 0, 0);- sec_outer->setSpacing(0);- sec_outer->addWidget(scroll);-- auto* chips_host = new QWidget(this);- chips_host->setStyleSheet("background:transparent;");- auto* chips_layout = new QHBoxLayout(chips_host);- chips_layout->setContentsMargins(10, 0, 10, 0);- chips_layout->setSpacing(6);-- cost_basis_ = add_chip(chips_layout, "COST", ui::colors::CYAN);- cost_basis_.container->setToolTip("Total amount invested — sum of (avg buy price × quantity)\n"- "for all current positions. Used to compute P&L.");-- concentration_ = add_chip(chips_layout, "CONC", ui::colors::AMBER);- concentration_.container->setToolTip("Concentration risk: combined weight of the top 3 holdings.\n"- "Values above 50% indicate a concentrated portfolio.\n"- "Lower is generally better for diversification.");-- sharpe_ = add_chip(chips_layout, "SHARPE", ui::colors::CYAN);- sharpe_.container->setToolTip("Sharpe Ratio: risk-adjusted return over a risk-free rate.\n"- "Formula: (mean daily return − risk-free rate) / std dev × √252.\n"- "Above 1.0 = good, above 2.0 = very good, below 0 = worse than risk-free.");-- beta_ = add_chip(chips_layout, "BETA", ui::colors::WARNING);- beta_.container->setToolTip("Portfolio sensitivity to broad market moves.\n"- "Beta = 1.0: moves with the market. >1.0: more volatile.\n"- "<1.0: less volatile. Negative: inverse correlation.");-- volatility_ = add_chip(chips_layout, "VOL 30D", ui::colors::AMBER);- volatility_.container->setToolTip("Annualized portfolio volatility (std deviation of returns).\n"- "Formula: std dev of daily returns × √252.\n"- "Higher values indicate greater price swings.");-- max_drawdown_ = add_chip(chips_layout, "MDD", ui::colors::NEGATIVE);- max_drawdown_.container->setToolTip("Maximum peak-to-trough decline in portfolio value.\n"- "Measures the worst loss experienced from a high point.\n"- "Lower magnitude = better capital preservation.");-- var95_ = add_chip(chips_layout, "VAR 95%", ui::colors::NEGATIVE);- var95_.container->setToolTip("Value at Risk at 95% confidence — the maximum expected\n"- "single-day loss 95% of the time based on historical returns.");-- risk_score_ = add_chip(chips_layout, "RISK", ui::colors::NEGATIVE);- risk_score_.container->setToolTip("Composite risk score from 0 (low) to 100 (high).\n"- "Weighted from: volatility, max drawdown, concentration,\n"- "beta, and VaR. Lower is safer.");-- chips_layout->addStretch(1);- scroll->setWidget(chips_host);-- outer->addWidget(secondary_row_);-}--// ── Hero cell (primary row) ──────────────────────────────────────────────────--PortfolioStatsRibbon::HeroCell PortfolioStatsRibbon::add_hero(QHBoxLayout* row, const QString& label_text,- const char* value_color) {- auto* container = new QWidget(this);- container->setObjectName("pfHeroCell");- container->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);- auto* vlayout = new QVBoxLayout(container);- vlayout->setContentsMargins(14, 4, 14, 4);- vlayout->setSpacing(1);-- HeroCell cell;- cell.container = container;-- cell.label = new QLabel(label_text);- vlayout->addWidget(cell.label);+ auto* row = new QHBoxLayout(this);+ row->setContentsMargins(0, 0, 0, 0);+ row->setSpacing(0);- cell.value = new QLabel("--");- vlayout->addWidget(cell.value);+ // ── Cell 1: PORTFOLIO VALUE — biggest number on the row (24px hero) ──────+ row->addWidget(build_hero(value_cell_, "PORTFOLIO VALUE", 24), 28);+ row->addWidget(make_v_separator(this));- cell.sub = new QLabel;- vlayout->addWidget(cell.sub);+ // ── Cell 2: UNREALIZED P&L — 20px, signed color ──────────────────────────+ row->addWidget(build_hero(pnl_cell_, "UNREALIZED P&L", 20), 20);+ row->addWidget(make_v_separator(this));- apply_hero_styles(cell, value_color);+ // ── Cell 3: TODAY — 20px, signed color ───────────────────────────────────+ row->addWidget(build_hero(day_cell_, "TODAY", 20), 16);+ row->addWidget(make_v_separator(this));- row->addWidget(container, 1);- return cell;+ // ── Cell 4: RISK & POSITIONING — 2×3 chip grid ───────────────────────────+ row->addWidget(build_risk_grid(), 36);}-void PortfolioStatsRibbon::apply_hero_styles(HeroCell& c, const char* value_color) {- const int label_px = ui::fonts::font_px(-3); // ~10–11px- const int value_px = ui::fonts::font_px(+4); // ~18px- const int sub_px = ui::fonts::font_px(-4); // ~9–10px-- if (c.label) {- c.label->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700; letter-spacing:1.2px;"- " background:transparent;")- .arg(ui::colors::TEXT_TERTIARY())- .arg(label_px));- }- if (c.value) {- c.value->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700; letter-spacing:0.2px;"- " background:transparent;")- .arg(value_color)- .arg(value_px));- }- if (c.sub) {- c.sub->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:500;"- " background:transparent;")- .arg(ui::colors::TEXT_TERTIARY())- .arg(sub_px));- }- if (c.container) {- c.container->setStyleSheet(QString("QWidget#pfHeroCell { border-right:1px solid %1; background:transparent; }")- .arg(ui::colors::BORDER_DIM()));- }+QWidget* PortfolioStatsRibbon::build_hero(HeroCell& c, const QString& label_text, int value_px) {+ c.container = new QWidget(this);+ c.container->setStyleSheet("background:transparent;");++ auto* v = new QVBoxLayout(c.container);+ v->setContentsMargins(14, 8, 14, 8);+ v->setSpacing(2);++ c.label = new QLabel(label_text);+ c.label->setStyleSheet(+ QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1.2px; background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ v->addWidget(c.label);++ c.value = new QLabel("--");+ c.value->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700;"+ " letter-spacing:0.2px; background:transparent;")+ .arg(ui::colors::TEXT_PRIMARY())+ .arg(value_px));+ v->addWidget(c.value);++ c.sub = new QLabel;+ c.sub->setStyleSheet(QString("color:%1; font-size:11px; font-weight:600; background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ v->addWidget(c.sub);++ return c.container;}-// ── Chip cell (secondary row) ────────────────────────────────────────────────--PortfolioStatsRibbon::ChipCell PortfolioStatsRibbon::add_chip(QHBoxLayout* row, const QString& label_text,- const char* value_color) {- auto* container = new QWidget(this);- container->setObjectName("pfChipCell");-- auto* hlayout = new QHBoxLayout(container);- hlayout->setContentsMargins(8, 2, 10, 2);- hlayout->setSpacing(5);-- ChipCell cell;- cell.container = container;-- cell.label = new QLabel(label_text);- hlayout->addWidget(cell.label);-- cell.value = new QLabel("--");- hlayout->addWidget(cell.value);-- apply_chip_styles(cell, value_color);-- row->addWidget(container);- return cell;+void PortfolioStatsRibbon::apply_hero_value_color(HeroCell& c, const char* color, int value_px) {+ c.value->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700;"+ " letter-spacing:0.2px; background:transparent;")+ .arg(color)+ .arg(value_px));}-void PortfolioStatsRibbon::apply_chip_styles(ChipCell& c, const char* value_color) {- const int label_px = ui::fonts::font_px(-4);- const int value_px = ui::fonts::font_px(-2);+QWidget* PortfolioStatsRibbon::build_risk_grid() {+ risk_cell_ = new QWidget(this);+ risk_cell_->setStyleSheet("background:transparent;");++ auto* outer = new QVBoxLayout(risk_cell_);+ outer->setContentsMargins(14, 8, 14, 8);+ outer->setSpacing(2);++ auto* header = new QLabel("RISK & POSITIONING");+ header->setStyleSheet(+ QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1.2px; background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ outer->addWidget(header);++ auto* g = new QGridLayout;+ g->setContentsMargins(0, 0, 0, 0);+ g->setHorizontalSpacing(20);+ g->setVerticalSpacing(0);++ // Layout: label TEXT_TERTIARY 10px on left, value 13px / 700 on right.+ // 2 columns × 3 rows. Left column: SHARPE / BETA / MDD. Right: CONC / VOL30 / RISK.+ sharpe_ = add_grid_chip(g, 0, 0, "SHARPE");+ conc_ = add_grid_chip(g, 0, 1, "CONC");+ beta_ = add_grid_chip(g, 1, 0, "BETA");+ vol_ = add_grid_chip(g, 1, 1, "VOL 30D");+ mdd_ = add_grid_chip(g, 2, 0, "MDD");+ risk_ = add_grid_chip(g, 2, 1, "RISK");++ outer->addLayout(g, 1);++ return risk_cell_;+}- if (c.label) {- c.label->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700; letter-spacing:0.8px;"- " background:transparent;")- .arg(ui::colors::TEXT_TERTIARY())- .arg(label_px));- }- if (c.value) {- c.value->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700; letter-spacing:0.2px;"- " background:transparent;")- .arg(value_color)- .arg(value_px));- }- if (c.container) {- c.container->setStyleSheet(QString("QWidget#pfChipCell { background:%1; border:1px solid %2;"- " border-radius:3px; }")- .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));- }+PortfolioStatsRibbon::GridChip PortfolioStatsRibbon::add_grid_chip(QGridLayout* g, int row, int col,+ const QString& label_text) {+ GridChip c;++ // Each chip occupies 2 grid sub-columns within its parent cell so we can+ // align label-left + value-right. We use a small inline QHBoxLayout per+ // chip and place that layout's holder widget at (row, col) of the outer+ // 2-col grid.+ auto* holder = new QWidget(risk_cell_);+ holder->setStyleSheet("background:transparent;");+ auto* h = new QHBoxLayout(holder);+ h->setContentsMargins(0, 0, 0, 0);+ h->setSpacing(8);++ c.label = new QLabel(label_text);+ c.label->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; letter-spacing:0.5px;"+ " background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ h->addWidget(c.label);++ c.value = new QLabel("--");+ c.value->setAlignment(Qt::AlignRight | Qt::AlignVCenter);+ c.value->setStyleSheet(QString("color:%1; font-size:13px; font-weight:700;"+ " background:transparent;")+ .arg(ui::colors::TEXT_PRIMARY()));+ h->addWidget(c.value, 1);++ g->addWidget(holder, row, col);+ return c;}// ── Data setters ─────────────────────────────────────────────────────────────void PortfolioStatsRibbon::set_summary(const portfolio::PortfolioSummary& s) {- auto fmt = [](double v, int dp = 2) { return QString::number(v, 'f', dp); };+ auto fmt = [](double v, int dp = 2) {+ // Add thousands separator for readability on large NAVs.+ return QLocale().toString(v, 'f', dp);+ };auto color_tok = [](double v) -> const char* { return v >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE; };- // Total value- total_value_.value->setText(fmt(s.total_market_value));- total_value_.sub->setText(s.portfolio.currency);- apply_hero_styles(total_value_, ui::colors::WARNING);+ // ── Cell 1: PORTFOLIO VALUE ──────────────────────────────────────────────+ // Value: amber (brand value, neutral semantics). Sub: position count.+ value_cell_.value->setText(QString("%1 %2").arg(fmt(s.total_market_value), s.portfolio.currency));+ apply_hero_value_color(value_cell_, ui::colors::AMBER(), 24);+ value_cell_.sub->setText(QString("▲ %1 positions").arg(s.total_positions));- // P&L — value = absolute P&L, sub = percent- pnl_.value->setText(+ // ── Cell 2: UNREALIZED P&L ───────────────────────────────────────────────+ pnl_cell_.value->setText(QString("%1%2").arg(s.total_unrealized_pnl >= 0 ? "+" : "").arg(fmt(s.total_unrealized_pnl)));- pnl_.sub->setText(- QString("%1%2%").arg(s.total_unrealized_pnl_percent >= 0 ? "+" : "").arg(fmt(s.total_unrealized_pnl_percent)));- apply_hero_styles(pnl_, color_tok(s.total_unrealized_pnl));-- // Day change- day_change_.value->setText(+ apply_hero_value_color(pnl_cell_, color_tok(s.total_unrealized_pnl), 20);+ pnl_cell_.sub->setText(+ QString("%1%2% ▲ %3 ▼ %4")+ .arg(s.total_unrealized_pnl_percent >= 0 ? "+" : "")+ .arg(QString::number(s.total_unrealized_pnl_percent, 'f', 2))+ .arg(s.gainers)+ .arg(s.losers));+ pnl_cell_.sub->setStyleSheet(QString("color:%1; font-size:11px; font-weight:600; background:transparent;")+ .arg(color_tok(s.total_unrealized_pnl)));++ // ── Cell 3: TODAY ────────────────────────────────────────────────────────+ day_cell_.value->setText(QString("%1%2").arg(s.total_day_change >= 0 ? "+" : "").arg(fmt(s.total_day_change)));- day_change_.sub->setText(- QString("%1%2%").arg(s.total_day_change_percent >= 0 ? "+" : "").arg(fmt(s.total_day_change_percent)));- apply_hero_styles(day_change_, color_tok(s.total_day_change));-- // Positions- positions_.value->setText(QString::number(s.total_positions));- positions_.sub->setText(QString("\u25B2 %1 \u25BC %2").arg(s.gainers).arg(s.losers));- apply_hero_styles(positions_, ui::colors::TEXT_PRIMARY);-- // Cost basis chip uses summary too- cost_basis_.value->setText(fmt(s.total_cost_basis));- apply_chip_styles(cost_basis_, ui::colors::CYAN);+ apply_hero_value_color(day_cell_, color_tok(s.total_day_change), 20);+ day_cell_.sub->setText(QString("%1%2%")+ .arg(s.total_day_change_percent >= 0 ? "+" : "")+ .arg(QString::number(s.total_day_change_percent, 'f', 2)));+ day_cell_.sub->setStyleSheet(QString("color:%1; font-size:11px; font-weight:600; background:transparent;")+ .arg(color_tok(s.total_day_change)));++ // CONC chip uses summary as a fallback while ComputedMetrics is loading;+ // ComputedMetrics overrides it below if/when it arrives.+ if (!s.holdings.isEmpty()) {+ // simple top-3 fallback (full calc lives in ComputedMetrics.concentration_top3)+ QVector<double> ws;+ for (const auto& h : s.holdings)+ ws.append(h.weight);+ std::sort(ws.begin(), ws.end(), std::greater<double>());+ double top3 = 0.0;+ for (int i = 0; i < std::min<int>(3, ws.size()); ++i)+ top3 += ws[i];+ conc_.value->setText(QString("%1%").arg(QString::number(top3, 'f', 1)));+ }}void PortfolioStatsRibbon::set_metrics(const portfolio::ComputedMetrics& m) {auto fmt_opt = [](std::optional<double> v, int dp = 2) -> QString {return v.has_value() ? QString::number(*v, 'f', dp) : "--";};-- concentration_.value->setText(m.concentration_top3.has_value()- ? QString("%1%").arg(QString::number(*m.concentration_top3, 'f', 1))- : "--");- apply_chip_styles(concentration_, ui::colors::AMBER);+ auto fmt_pct_opt = [](std::optional<double> v, int dp = 1) -> QString {+ return v.has_value() ? QString("%1%").arg(QString::number(*v, 'f', dp)) : "--";+ };sharpe_.value->setText(fmt_opt(m.sharpe));- apply_chip_styles(sharpe_, ui::colors::CYAN);-beta_.value->setText(fmt_opt(m.beta));- apply_chip_styles(beta_, ui::colors::WARNING);-- volatility_.value->setText(m.volatility.has_value() ? QString("%1%").arg(QString::number(*m.volatility, 'f', 1))- : "--");- apply_chip_styles(volatility_, ui::colors::AMBER);+ vol_.value->setText(fmt_pct_opt(m.volatility));- max_drawdown_.value->setText(m.max_drawdown.has_value()- ? QString("%1%").arg(QString::number(*m.max_drawdown, 'f', 1))- : "--");- apply_chip_styles(max_drawdown_, ui::colors::NEGATIVE);+ if (m.concentration_top3.has_value())+ conc_.value->setText(fmt_pct_opt(m.concentration_top3));- var95_.value->setText(m.var_95.has_value() ? QString::number(*m.var_95, 'f', 2) : "--");- apply_chip_styles(var95_, ui::colors::NEGATIVE);+ // MDD always negative — semantic NEGATIVE color.+ mdd_.value->setText(fmt_pct_opt(m.max_drawdown));+ mdd_.value->setStyleSheet(QString("color:%1; font-size:13px; font-weight:700; background:transparent;")+ .arg(ui::colors::NEGATIVE()));+ // RISK score: threshold-driven semantic color.if (m.risk_score.has_value()) {- double rs = *m.risk_score;- const char* rs_color = rs < 30 ? ui::colors::POSITIVE : rs < 60 ? ui::colors::WARNING : ui::colors::NEGATIVE;- risk_score_.value->setText(QString::number(rs, 'f', 0));- apply_chip_styles(risk_score_, rs_color);+ const double rs = *m.risk_score;+ const char* rs_color = rs < 30 ? ui::colors::POSITIVE+ : rs < 60 ? ui::colors::WARNING+ : ui::colors::NEGATIVE;+ risk_.value->setText(QString::number(rs, 'f', 0));+ risk_.value->setStyleSheet(QString("color:%1; font-size:13px; font-weight:700; background:transparent;")+ .arg(rs_color));} else {- risk_score_.value->setText("--");- apply_chip_styles(risk_score_, ui::colors::NEGATIVE);+ risk_.value->setText("--");+ risk_.value->setStyleSheet(QString("color:%1; font-size:13px; font-weight:700; background:transparent;")+ .arg(ui::colors::TEXT_PRIMARY()));}}void PortfolioStatsRibbon::refresh_theme() {setStyleSheet(QString("#portfolioStatsRibbon { background:%1; border-bottom:1px solid %2; }").arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));- if (secondary_row_) {- secondary_row_->setStyleSheet(QString("#pfStatsSecondary { background:%1; }").arg(ui::colors::BG_BASE()));- }-- apply_hero_styles(total_value_, ui::colors::WARNING);- apply_hero_styles(pnl_, ui::colors::TEXT_PRIMARY);- apply_hero_styles(day_change_, ui::colors::TEXT_PRIMARY);- apply_hero_styles(positions_, ui::colors::TEXT_PRIMARY);-- apply_chip_styles(cost_basis_, ui::colors::CYAN);- apply_chip_styles(concentration_, ui::colors::AMBER);- apply_chip_styles(sharpe_, ui::colors::CYAN);- apply_chip_styles(beta_, ui::colors::WARNING);- apply_chip_styles(volatility_, ui::colors::AMBER);- apply_chip_styles(max_drawdown_, ui::colors::NEGATIVE);- apply_chip_styles(var95_, ui::colors::NEGATIVE);- apply_chip_styles(risk_score_, ui::colors::NEGATIVE);+ // Hero label/sub colors and chip label colors are static per-style; the+ // value colors get re-applied on the next set_summary/set_metrics call,+ // which always fires after a theme switch via PortfolioScreen's+ // refresh_theme path.}} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/portfolio/PortfolioStatsRibbon.h b/fincept-qt/src/screens/portfolio/PortfolioStatsRibbon.hindex 50236d1d9..3c94946d1 100644--- a/fincept-qt/src/screens/portfolio/PortfolioStatsRibbon.h+++ b/fincept-qt/src/screens/portfolio/PortfolioStatsRibbon.h@@ -6,8 +6,19 @@#include <QLabel>#include <QWidget>+class QGridLayout;+namespace fincept::screens {+/// Stats ribbon — the 72px row beneath the command bar.+///+/// Composition (left → right, separated by 1px BORDER_DIM hairlines):+/// [PORTFOLIO VALUE] [UNREALIZED P&L] [TODAY] [RISK & POSITIONING (2×3 chip grid)]+///+/// Designed for unequal cell weights — the first three cells stack a small+/// label, a hero value, and a sub-line; the fourth cell hosts a 2×3 grid of+/// chips (Sharpe, Beta, MDD, Conc, Vol30, Risk). One source of truth for+/// portfolio-level KPIs; the command bar above no longer duplicates them.class PortfolioStatsRibbon : public QWidget {Q_OBJECTpublic:@@ -18,7 +29,7 @@ class PortfolioStatsRibbon : public QWidget {void refresh_theme();private:- // Hero cell — primary row. Large value, label above, sub below.+ // A "hero" cell — small label, big value, smaller sub line.struct HeroCell {QWidget* container = nullptr;QLabel* label = nullptr;@@ -26,36 +37,30 @@ class PortfolioStatsRibbon : public QWidget {QLabel* sub = nullptr;};- // Compact cell — secondary row. Single-line "LABEL value" chip.- struct ChipCell {- QWidget* container = nullptr;+ // A grid chip — two-column "LABEL value" line.+ struct GridChip {QLabel* label = nullptr;QLabel* value = nullptr;};- HeroCell add_hero(QHBoxLayout* row, const QString& label_text, const char* value_color);- ChipCell add_chip(QHBoxLayout* row, const QString& label_text, const char* value_color);- void apply_hero_styles(HeroCell& c, const char* value_color);- void apply_chip_styles(ChipCell& c, const char* value_color);-- QWidget* primary_row_ = nullptr; // hero KPIs- QWidget* secondary_row_ = nullptr; // risk chips-- // Primary (hero) cells- HeroCell total_value_;- HeroCell pnl_;- HeroCell day_change_;- HeroCell positions_;-- // Secondary (chip) cells- ChipCell cost_basis_;- ChipCell concentration_;- ChipCell sharpe_;- ChipCell beta_;- ChipCell volatility_;- ChipCell max_drawdown_;- ChipCell var95_;- ChipCell risk_score_;+ QWidget* build_hero(HeroCell& cell, const QString& label_text, int value_px);+ QWidget* build_risk_grid();+ GridChip add_grid_chip(QGridLayout* g, int row, int col, const QString& label_text);+ void apply_hero_value_color(HeroCell& c, const char* color, int value_px);++ // Cells+ HeroCell value_cell_; // PORTFOLIO VALUE+ HeroCell pnl_cell_; // UNREALIZED P&L+ HeroCell day_cell_; // TODAY+ QWidget* risk_cell_ = nullptr;++ // Risk-grid chips+ GridChip sharpe_;+ GridChip conc_;+ GridChip beta_;+ GridChip vol_;+ GridChip mdd_;+ GridChip risk_;};} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/portfolio/PortfolioTxnPanel.cpp b/fincept-qt/src/screens/portfolio/PortfolioTxnPanel.cppindex 048636ac5..791095210 100644--- a/fincept-qt/src/screens/portfolio/PortfolioTxnPanel.cpp+++ b/fincept-qt/src/screens/portfolio/PortfolioTxnPanel.cpp@@ -1,6 +1,7 @@// src/screens/portfolio/PortfolioTxnPanel.cpp#include "screens/portfolio/PortfolioTxnPanel.h"+#include "screens/portfolio/PortfolioPanelHeader.h"#include "ui/theme/Theme.h"#include <QHBoxLayout>@@ -21,27 +22,35 @@ void PortfolioTxnPanel::build_ui() {layout->setContentsMargins(0, 0, 0, 0);layout->setSpacing(0);- // Header bar- auto* header = new QWidget(this);- header->setFixedHeight(28);- header->setStyleSheet(QString("background:%1; border-top:1px solid %2; border-bottom:1px solid %2;")- .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));- auto* hl = new QHBoxLayout(header);- hl->setContentsMargins(10, 0, 10, 0);- hl->setSpacing(8);-- auto* title = new QLabel("TRANSACTION HISTORY");- title->setStyleSheet(- QString("color:%1; font-size:10px; font-weight:700; letter-spacing:1px;").arg(ui::colors::TEXT_SECONDARY()));- hl->addWidget(title);-- hl->addStretch();+ // Unified panel header — TRANSACTION HISTORY title + count badge + collapse+ // chevron in slot. The chevron toggles a collapse_toggled signal that the+ // owner (PortfolioScreen) uses to shrink the panel to header height.+ auto header = make_panel_header("TRANSACTION HISTORY", this);count_label_ = new QLabel;- count_label_->setStyleSheet(QString("color:%1; font-size:9px; font-weight:600;").arg(ui::colors::TEXT_TERTIARY()));- hl->addWidget(count_label_);-- layout->addWidget(header);+ count_label_->setStyleSheet(QString("color:%1; font-size:10px; font-weight:600;"+ " background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ header.controls_slot->layout()->addWidget(count_label_);++ // Collapse chevron — ▼ when expanded (clicking will collapse), ▶ when+ // collapsed (clicking will expand).+ collapse_btn_ = new QPushButton("▾");+ collapse_btn_->setFixedSize(22, 22);+ collapse_btn_->setCursor(Qt::PointingHandCursor);+ collapse_btn_->setToolTip("Collapse / expand transaction history");+ collapse_btn_->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %2;"+ " font-size:11px; font-weight:700; }"+ "QPushButton:hover { color:%3; border-color:%3; }")+ .arg(ui::colors::TEXT_TERTIARY(), ui::colors::BORDER_DIM(), ui::colors::AMBER()));+ connect(collapse_btn_, &QPushButton::clicked, this, [this]() {+ collapsed_ = !collapsed_;+ apply_collapsed_state();+ emit collapse_toggled(collapsed_);+ });+ header.controls_slot->layout()->addWidget(collapse_btn_);++ layout->addWidget(header.header);// Tablestatic const QStringList kHeaders = {"Date", "Symbol", "Type", "Qty", "Price", "Total", "Notes"};@@ -93,6 +102,14 @@ void PortfolioTxnPanel::clear() {count_label_->clear();}+void PortfolioTxnPanel::apply_collapsed_state() {+ // Hide the table when collapsed; chevron flips between ▾ (expanded) and ▸.+ if (table_)+ table_->setVisible(!collapsed_);+ if (collapse_btn_)+ collapse_btn_->setText(collapsed_ ? "▸" : "▾");+}+void PortfolioTxnPanel::populate() {table_->setSortingEnabled(false);table_->setRowCount(0);@@ -124,7 +141,8 @@ void PortfolioTxnPanel::populate() {elsetype_color = QColor(ui::colors::TEXT_SECONDARY());type_item->setForeground(type_color);- type_item->setFont(QFont(ui::fonts::DATA_FAMILY, 9, QFont::Bold));+ // 11px floor (was 9px) per unified scale.+ type_item->setFont(QFont(ui::fonts::DATA_FAMILY, 11, QFont::Bold));table_->setItem(row, 2, type_item);// Qtydiff --git a/fincept-qt/src/screens/portfolio/PortfolioTxnPanel.h b/fincept-qt/src/screens/portfolio/PortfolioTxnPanel.hindex f86ae307a..07040999b 100644--- a/fincept-qt/src/screens/portfolio/PortfolioTxnPanel.h+++ b/fincept-qt/src/screens/portfolio/PortfolioTxnPanel.h@@ -3,6 +3,7 @@#include "screens/portfolio/PortfolioTypes.h"#include <QLabel>+#include <QPushButton>#include <QTableWidget>#include <QWidget>@@ -22,12 +23,21 @@ class PortfolioTxnPanel : public QWidget {void clear();void refresh_theme();+ signals:+ /// Emitted when the user toggles the collapse chevron in the header.+ /// `collapsed=true` → caller should shrink the panel to header height;+ /// `collapsed=false` → restore to its full size.+ void collapse_toggled(bool collapsed);+private:void build_ui();void populate();+ void apply_collapsed_state();QLabel* count_label_ = nullptr;+ QPushButton* collapse_btn_ = nullptr;QTableWidget* table_ = nullptr;+ bool collapsed_ = false;QVector<portfolio::Transaction> txns_;};diff --git a/fincept-qt/src/screens/recovery/CrashRecoveryDialog.cpp b/fincept-qt/src/screens/recovery/CrashRecoveryDialog.cppnew file mode 100644index 000000000..7a4ab1b9f--- /dev/null+++ b/fincept-qt/src/screens/recovery/CrashRecoveryDialog.cpp@@ -0,0 +1,210 @@+#include "screens/recovery/CrashRecoveryDialog.h"++#include "core/layout/LayoutTypes.h"+#include "core/layout/WorkspaceShell.h"+#include "core/logging/Logger.h"+#include "storage/workspace/CrashRecovery.h"+#include "storage/workspace/WorkspaceSnapshotRing.h"++#include <QDateTime>+#include <QHBoxLayout>+#include <QJsonDocument>+#include <QJsonObject>+#include <QJsonParseError>+#include <QLabel>+#include <QListWidget>+#include <QListWidgetItem>+#include <QPushButton>+#include <QVBoxLayout>++namespace {+constexpr const char* kRecoveryTag = "CrashRecovery";+constexpr int kMaxListed = 5;+} // namespace++namespace fincept::screens {++CrashRecoveryDialog::CrashRecoveryDialog(fincept::CrashRecovery* recovery,+ fincept::WorkspaceSnapshotRing* ring,+ QWidget* parent)+ : QDialog(parent), recovery_(recovery), ring_(ring) {+ setWindowTitle(QStringLiteral("Fincept Terminal — Recover Previous Session"));+ setObjectName(QStringLiteral("CrashRecoveryDialog"));+ setModal(true);+ resize(560, 420);++ build_ui();+ populate_snapshots();+}++void CrashRecoveryDialog::build_ui() {+ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(20, 20, 20, 16);+ root->setSpacing(12);++ heading_ = new QLabel(QStringLiteral("The previous session ended unexpectedly."), this);+ heading_->setObjectName(QStringLiteral("recoveryHeading"));+ QFont f = heading_->font();+ f.setBold(true);+ f.setPointSize(f.pointSize() + 2);+ heading_->setFont(f);++ explainer_ = new QLabel(this);+ explainer_->setObjectName(QStringLiteral("recoveryExplainer"));+ explainer_->setWordWrap(true);+ explainer_->setText(QStringLiteral(+ "Fincept Terminal saves periodic snapshots of your workspace so you "+ "can recover from a crash, power loss, or process kill. Pick a "+ "snapshot to restore your windows and panels, or skip to start "+ "fresh. Skipping does not delete the snapshots."));++ list_ = new QListWidget(this);+ list_->setObjectName(QStringLiteral("recoverySnapshotList"));+ list_->setSelectionMode(QAbstractItemView::SingleSelection);+ list_->setUniformItemSizes(true);+ list_->setAlternatingRowColors(true);+ connect(list_, &QListWidget::itemSelectionChanged, this,+ &CrashRecoveryDialog::on_selection_changed);+ connect(list_, &QListWidget::itemDoubleClicked, this,+ [this](QListWidgetItem*) { on_restore_clicked(); });++ auto* button_row = new QHBoxLayout();+ button_row->setContentsMargins(0, 0, 0, 0);+ button_row->addStretch();++ skip_button_ = new QPushButton(QStringLiteral("Skip"), this);+ skip_button_->setObjectName(QStringLiteral("recoverySkipButton"));+ skip_button_->setAutoDefault(false);+ connect(skip_button_, &QPushButton::clicked, this, &CrashRecoveryDialog::on_skip_clicked);++ restore_button_ = new QPushButton(QStringLiteral("Restore Selected"), this);+ restore_button_->setObjectName(QStringLiteral("recoveryRestoreButton"));+ restore_button_->setDefault(true);+ restore_button_->setEnabled(false);+ connect(restore_button_, &QPushButton::clicked, this, &CrashRecoveryDialog::on_restore_clicked);++ button_row->addWidget(skip_button_);+ button_row->addSpacing(8);+ button_row->addWidget(restore_button_);++ root->addWidget(heading_);+ root->addWidget(explainer_);+ root->addWidget(list_, 1);+ root->addLayout(button_row);+}++void CrashRecoveryDialog::populate_snapshots() {+ list_->clear();+ entries_.clear();++ if (!recovery_) {+ LOG_WARN(kRecoveryTag, "CrashRecoveryDialog has no recovery pointer — empty list");+ return;+ }++ auto r = recovery_->latest_snapshots(kMaxListed);+ if (r.is_err()) {+ LOG_ERROR(kRecoveryTag,+ QString("latest_snapshots failed: %1").arg(QString::fromStdString(r.error())));+ return;+ }++ entries_ = r.value();+ for (const auto& e : entries_) {+ const QString ts = format_timestamp(e.created_at_ms);+ const QString kind = format_kind(e.kind);+ QString label = e.name.isEmpty()+ ? QString("%1 — %2").arg(ts, kind)+ : QString("%1 — %2 — %3").arg(ts, kind, e.name);+ auto* item = new QListWidgetItem(label, list_);+ item->setData(Qt::UserRole, e.snapshot_id);+ }++ if (!entries_.isEmpty()) {+ list_->setCurrentRow(0); // pre-select newest+ }+}++QString CrashRecoveryDialog::format_timestamp(qint64 unix_ms) const {+ if (unix_ms <= 0) return QStringLiteral("(unknown time)");+ const auto dt = QDateTime::fromMSecsSinceEpoch(unix_ms);+ return dt.toLocalTime().toString(QStringLiteral("yyyy-MM-dd hh:mm:ss"));+}++QString CrashRecoveryDialog::format_kind(const QString& kind) const {+ if (kind == QLatin1String("auto")) return QStringLiteral("autosave");+ if (kind == QLatin1String("crash_recovery")) return QStringLiteral("crash snapshot");+ if (kind == QLatin1String("named_save")) return QStringLiteral("named");+ return kind;+}++void CrashRecoveryDialog::on_selection_changed() {+ restore_button_->setEnabled(list_->currentItem() != nullptr);+}++void CrashRecoveryDialog::on_restore_clicked() {+ auto* item = list_->currentItem();+ if (!item || !ring_) {+ reject();+ return;+ }++ const qint64 id = item->data(Qt::UserRole).toLongLong();+ auto payload_r = ring_->load_payload(id);+ if (payload_r.is_err()) {+ LOG_ERROR(kRecoveryTag,+ QString("load_payload(%1) failed: %2")+ .arg(id)+ .arg(QString::fromStdString(payload_r.error())));+ // Stay open so the user can pick a different snapshot.+ item->setFlags(item->flags() & ~Qt::ItemIsEnabled);+ return;+ }++ const QByteArray payload = payload_r.value();+ if (payload.isEmpty()) {+ LOG_WARN(kRecoveryTag, QString("snapshot %1 has empty payload — skipping").arg(id));+ item->setFlags(item->flags() & ~Qt::ItemIsEnabled);+ return;+ }++ QJsonParseError err{};+ const auto doc = QJsonDocument::fromJson(payload, &err);+ if (err.error != QJsonParseError::NoError || !doc.isObject()) {+ LOG_ERROR(kRecoveryTag,+ QString("snapshot %1 JSON parse error: %2").arg(id).arg(err.errorString()));+ item->setFlags(item->flags() & ~Qt::ItemIsEnabled);+ return;+ }++ layout::Workspace ws = layout::Workspace::from_json(doc.object());+ if (ws.frames.isEmpty()) {+ LOG_WARN(kRecoveryTag,+ QString("snapshot %1 decoded with zero frames — nothing to restore").arg(id));+ item->setFlags(item->flags() & ~Qt::ItemIsEnabled);+ return;+ }++ LOG_INFO(kRecoveryTag,+ QString("Restoring snapshot %1 ('%2', %3 frames)")+ .arg(id)+ .arg(ws.name.isEmpty() ? QStringLiteral("(unnamed)") : ws.name)+ .arg(ws.frames.size()));++ const int applied = layout::WorkspaceShell::apply(ws);+ LOG_INFO(kRecoveryTag,+ QString("WorkspaceShell::apply returned %1/%2 frames")+ .arg(applied)+ .arg(ws.frames.size()));++ restored_ = (applied > 0);+ accept();+}++void CrashRecoveryDialog::on_skip_clicked() {+ LOG_INFO(kRecoveryTag, "User skipped crash recovery dialog");+ restored_ = false;+ reject();+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/recovery/CrashRecoveryDialog.h b/fincept-qt/src/screens/recovery/CrashRecoveryDialog.hnew file mode 100644index 000000000..f9db5c1df--- /dev/null+++ b/fincept-qt/src/screens/recovery/CrashRecoveryDialog.h@@ -0,0 +1,78 @@+#pragma once++#include "storage/workspace/WorkspaceSnapshotRing.h"++#include <QDialog>+#include <QList>++class QListWidget;+class QListWidgetItem;+class QPushButton;+class QLabel;++namespace fincept {++class CrashRecovery;+class WorkspaceSnapshotRing;++} // namespace fincept++namespace fincept::screens {++/// Phase 6 final: modal dialog shown at startup when the previous session+/// ended uncleanly and at least one auto/crash_recovery snapshot is available.+///+/// Behaviour:+/// - Lists the last N snapshots (default 5) newest-first, with timestamp ++/// kind label ("auto" / "crash_recovery" / "named_save"). Selecting a+/// row enables the Restore button.+/// - "Restore" loads the snapshot payload, parses it as a Workspace, and+/// applies it via `WorkspaceShell::apply` after the dialog accepts.+/// - "Skip" dismisses the dialog with reject(); main.cpp continues with+/// the normal startup path (primary frame is constructed afterwards).+/// - The dialog is intentionally **not** modal-to-a-window, because it+/// runs *before* any WindowFrame exists. parent==nullptr is normal.+///+/// Threading: UI thread only. SQL reads go through WorkspaceDb's mutex via+/// the snapshot ring, so the list-load is safe even if SessionManager is+/// already running an autosave on its own thread.+class CrashRecoveryDialog : public QDialog {+ Q_OBJECT+ public:+ /// Construct with the live CrashRecovery + ring pointers from+ /// TerminalShell. Both must outlive the dialog (they're owned by the+ /// shell and only released in shutdown()).+ explicit CrashRecoveryDialog(fincept::CrashRecovery* recovery,+ fincept::WorkspaceSnapshotRing* ring,+ QWidget* parent = nullptr);++ /// True iff the user picked "Restore" and the snapshot was successfully+ /// decoded + applied. False when the user picked "Skip" or no snapshot+ /// could be parsed (parse failures fall back to skip with a warning).+ bool was_restored() const { return restored_; }++ private slots:+ void on_selection_changed();+ void on_restore_clicked();+ void on_skip_clicked();++ private:+ void build_ui();+ void populate_snapshots();+ QString format_timestamp(qint64 unix_ms) const;+ QString format_kind(const QString& kind) const;++ fincept::CrashRecovery* recovery_ = nullptr;+ fincept::WorkspaceSnapshotRing* ring_ = nullptr;++ QLabel* heading_ = nullptr;+ QLabel* explainer_ = nullptr;+ QListWidget* list_ = nullptr;+ QPushButton* restore_button_ = nullptr;+ QPushButton* skip_button_ = nullptr;++ QList<fincept::WorkspaceSnapshotRing::Entry> entries_;+ bool restored_ = false;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/settings/SettingsScreen.cpp b/fincept-qt/src/screens/settings/SettingsScreen.cppindex df11b0f29..654b280e7 100644--- a/fincept-qt/src/screens/settings/SettingsScreen.cpp+++ b/fincept-qt/src/screens/settings/SettingsScreen.cpp@@ -2727,21 +2727,45 @@ QWidget* SettingsScreen::build_security() {const QString new_pin = sec_new_pin_->text();const QString confirm = sec_confirm_pin_->text();+ // Surface lockout BEFORE attempting change_pin — otherwise change_pin+ // returns "Current PIN is incorrect" because verify_pin's locked-out+ // path also returns false. Misleading: the user thinks they typed+ // the wrong PIN when actually they're rate-limited.+ if (pm.is_locked_out()) {+ int secs = pm.lockout_remaining_seconds();+ sec_pin_error_->setText(+ QString("Locked out — try again in %1s").arg(secs));+ sec_pin_error_->show();+ sec_current_pin_->clear();+ sec_new_pin_->clear();+ sec_confirm_pin_->clear();+ return;+ }+if (new_pin != confirm) {sec_pin_error_->setText("New PINs do not match");sec_pin_error_->show();+ // Clear both new-PIN fields, not just confirm — leaving the+ // entered PIN visible-as-text in the masked field is mild+ // process-memory exposure and forces a full retype anyway.+ sec_new_pin_->clear();sec_confirm_pin_->clear();- sec_confirm_pin_->setFocus();+ sec_new_pin_->setFocus();return;}auto result = pm.change_pin(current, new_pin);if (result.is_err()) {- sec_pin_error_->setText(QString::fromStdString(result.error()));+ // If verify_pin tripped the lockout on this very attempt, show+ // the countdown rather than the generic "incorrect" message.+ if (pm.is_locked_out()) {+ int secs = pm.lockout_remaining_seconds();+ sec_pin_error_->setText(+ QString("Too many failed attempts — locked for %1s").arg(secs));+ } else {+ sec_pin_error_->setText(QString::fromStdString(result.error()));+ }sec_pin_error_->show();- // On a wrong current PIN the manager incremented the attempt- // counter; clear the field and let the user try again (up to- // kMaxAttempts, at which point the lock screen takes over).sec_current_pin_->clear();sec_current_pin_->setFocus();return;@@ -2802,6 +2826,7 @@ QWidget* SettingsScreen::build_security() {connect(save_btn, &QPushButton::clicked, this, [this]() {auto& repo = SettingsRepository::instance();auto& guard = auth::InactivityGuard::instance();+ auto& pm = auth::PinManager::instance();bool autolock = sec_autolock_toggle_->isChecked();int minutes = sec_lock_timeout_->currentData().toInt();@@ -2813,10 +2838,17 @@ QWidget* SettingsScreen::build_security() {sec_lock_on_minimize_->isChecked() ? "true" : "false", "security");}+ // Always update the interval so the change takes effect on the next+ // run regardless of current PIN state. Only flip the enabled flag if+ // a PIN is configured — otherwise the timer fires and lock_requested+ // is suppressed by show_lock_screen()'s no-PIN guard, leaving the+ // timer churning invisibly.guard.set_timeout_minutes(minutes);- guard.set_enabled(autolock);+ guard.set_enabled(autolock && pm.has_pin());- LOG_INFO("Settings", QString("Security settings saved: autolock=%1, timeout=%2min").arg(autolock).arg(minutes));+ LOG_INFO("Settings",+ QString("Security settings saved: autolock=%1, timeout=%2min, has_pin=%3")+ .arg(autolock).arg(minutes).arg(pm.has_pin()));});vl->addWidget(save_btn);diff --git a/fincept-qt/src/screens/watchlist/WatchlistScreen.cpp b/fincept-qt/src/screens/watchlist/WatchlistScreen.cppindex 42a7d938d..b8731930d 100644--- a/fincept-qt/src/screens/watchlist/WatchlistScreen.cpp+++ b/fincept-qt/src/screens/watchlist/WatchlistScreen.cpp@@ -413,23 +413,15 @@ void WatchlistScreen::load_watchlists() {watchlists_ = r.value();}- // Ensure at least one default watchlist exists+ // Ensure at least one default watchlist exists. We deliberately leave it+ // empty rather than seeding US large-caps — those weren't user-chosen and+ // confused the AI Chat flow ("I added RITES" appeared to fail because the+ // user saw the stale starter set after restart).if (watchlists_.isEmpty()) {QColor acc(colors::AMBER());auto cr = fincept::WatchlistRepository::instance().create("Default", acc.name());- if (cr.is_ok()) {+ if (cr.is_ok())watchlists_.append(cr.value());- // Add some starter symbols- auto& repo = fincept::WatchlistRepository::instance();- repo.add_stock(watchlists_.first().id, "AAPL", "Apple Inc");- repo.add_stock(watchlists_.first().id, "MSFT", "Microsoft Corp");- repo.add_stock(watchlists_.first().id, "GOOGL", "Alphabet Inc");- repo.add_stock(watchlists_.first().id, "AMZN", "Amazon.com Inc");- repo.add_stock(watchlists_.first().id, "NVDA", "NVIDIA Corp");- repo.add_stock(watchlists_.first().id, "TSLA", "Tesla Inc");- repo.add_stock(watchlists_.first().id, "META", "Meta Platforms");- repo.add_stock(watchlists_.first().id, "JPM", "JPMorgan Chase");- }}wl_list_->blockSignals(true);diff --git a/fincept-qt/src/services/ai_quant_lab/AIQuantLabService.cpp b/fincept-qt/src/services/ai_quant_lab/AIQuantLabService.cppindex 7d6abdf22..dea4def22 100644--- a/fincept-qt/src/services/ai_quant_lab/AIQuantLabService.cpp+++ b/fincept-qt/src/services/ai_quant_lab/AIQuantLabService.cpp@@ -245,6 +245,159 @@ void AIQuantLabService::gs_statistics(const QJsonObject& params) {run_python("Analytics/gs_quant_wrapper/gs_quant_service.py", {"statistics", json}, "gs_quant", "statistics");}+// ── Functime ─────────────────────────────────────────────────────────────────+namespace {+constexpr const char* kFunctimeScript = "Analytics/functime_wrapper/functime_service.py";+} // namespace++void AIQuantLabService::functime_check_status() {+ run_python(kFunctimeScript, {"check_status", "{}"}, "functime", "check_status");+}++void AIQuantLabService::functime_forecast(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kFunctimeScript, {"forecast", json}, "functime", "forecast");+}++void AIQuantLabService::functime_anomaly_detection(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kFunctimeScript, {"anomaly_detection", json}, "functime", "anomaly_detection");+}++void AIQuantLabService::functime_seasonality(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kFunctimeScript, {"seasonality", json}, "functime", "seasonality");+}++void AIQuantLabService::functime_metrics(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kFunctimeScript, {"metrics", json}, "functime", "metrics");+}++void AIQuantLabService::functime_confidence_intervals(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kFunctimeScript, {"confidence_intervals", json}, "functime", "confidence_intervals");+}++void AIQuantLabService::functime_stationarity(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kFunctimeScript, {"stationarity", json}, "functime", "stationarity");+}++// ── Statsmodels ──────────────────────────────────────────────────────────────+namespace {+constexpr const char* kStatsmodelsScript = "Analytics/statsmodels_wrapper/statsmodels_service.py";+} // namespace++void AIQuantLabService::sm_check_status() {+ run_python(kStatsmodelsScript, {"check_status", "{}"}, "statsmodels", "check_status");+}++void AIQuantLabService::sm_ols(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kStatsmodelsScript, {"ols", json}, "statsmodels", "ols");+}++void AIQuantLabService::sm_arima(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kStatsmodelsScript, {"arima", json}, "statsmodels", "arima");+}++void AIQuantLabService::sm_stationarity_tests(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kStatsmodelsScript, {"stationarity_tests", json}, "statsmodels", "stationarity_tests");+}++void AIQuantLabService::sm_acf_pacf(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kStatsmodelsScript, {"acf_pacf", json}, "statsmodels", "acf_pacf");+}++void AIQuantLabService::sm_granger_causality(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kStatsmodelsScript, {"granger_causality", json}, "statsmodels", "granger_causality");+}++void AIQuantLabService::sm_descriptive(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kStatsmodelsScript, {"descriptive", json}, "statsmodels", "descriptive");+}++// ── Fortitudo ────────────────────────────────────────────────────────────────+namespace {+constexpr const char* kFortitudoScript = "Analytics/fortitudo_tech_wrapper/fortitudo_service.py";+} // namespace++void AIQuantLabService::fort_check_status() {+ run_python(kFortitudoScript, {"check_status", "{}"}, "fortitudo", "check_status");+}++void AIQuantLabService::fort_portfolio_metrics(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kFortitudoScript, {"portfolio_metrics", json}, "fortitudo", "portfolio_metrics");+}++void AIQuantLabService::fort_covariance_matrix(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kFortitudoScript, {"covariance_matrix", json}, "fortitudo", "covariance_matrix");+}++void AIQuantLabService::fort_mean_variance_optimize(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kFortitudoScript, {"mean_variance_optimize", json}, "fortitudo",+ "mean_variance_optimize");+}++void AIQuantLabService::fort_mean_cvar_optimize(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kFortitudoScript, {"mean_cvar_optimize", json}, "fortitudo", "mean_cvar_optimize");+}++void AIQuantLabService::fort_efficient_frontier(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kFortitudoScript, {"efficient_frontier", json}, "fortitudo", "efficient_frontier");+}++void AIQuantLabService::fort_exp_decay_probabilities(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kFortitudoScript, {"exp_decay_probabilities", json}, "fortitudo",+ "exp_decay_probabilities");+}++// ── GluonTS ──────────────────────────────────────────────────────────────────+namespace {+constexpr const char* kGluonTsScript = "Analytics/gluonts_wrapper/gluonts_service.py";+} // namespace++void AIQuantLabService::gluon_check_status() {+ run_python(kGluonTsScript, {"check_status", "{}"}, "gluonts", "check_status");+}++void AIQuantLabService::gluon_probabilistic_forecast(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kGluonTsScript, {"probabilistic_forecast", json}, "gluonts", "probabilistic_forecast");+}++void AIQuantLabService::gluon_quantile_forecast(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kGluonTsScript, {"quantile_forecast", json}, "gluonts", "quantile_forecast");+}++void AIQuantLabService::gluon_distribution_fit(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kGluonTsScript, {"distribution_fit", json}, "gluonts", "distribution_fit");+}++void AIQuantLabService::gluon_evaluate_forecast(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kGluonTsScript, {"evaluate_forecast", json}, "gluonts", "evaluate_forecast");+}++void AIQuantLabService::gluon_seasonal_naive(const QJsonObject& params) {+ auto json = QJsonDocument(params).toJson(QJsonDocument::Compact);+ run_python(kGluonTsScript, {"seasonal_naive", json}, "gluonts", "seasonal_naive");+}+// ── CFA Quant ────────────────────────────────────────────────────────────────void AIQuantLabService::cfa_trend_analysis(const QJsonObject& params) {run_module("cfa_quant", "trend_analysis", params);@@ -570,6 +723,10 @@ void AIQuantLabService::dataproc_process_data(const QJsonObject& params) {}// ── Quant Reporting ───────────────────────────────────────────────────────────+void AIQuantLabService::reporting_check_status() {+ run_module("quant_reporting", "check_status", {});+}+void AIQuantLabService::reporting_ic_analysis(const QJsonObject& params) {run_module("quant_reporting", "ic_analysis", params);}@@ -579,7 +736,15 @@ void AIQuantLabService::reporting_model_performance(const QJsonObject& params) {}void AIQuantLabService::reporting_cumulative_returns(const QJsonObject& params) {- run_module("quant_reporting", "cumulative_return_graph", params);+ run_module("quant_reporting", "cumulative_returns", params);+}++void AIQuantLabService::reporting_risk_report(const QJsonObject& params) {+ run_module("quant_reporting", "risk_report", params);+}++void AIQuantLabService::reporting_factor_quantiles(const QJsonObject& params) {+ run_module("quant_reporting", "factor_quantiles", params);}} // namespace fincept::services::quantdiff --git a/fincept-qt/src/services/ai_quant_lab/AIQuantLabService.h b/fincept-qt/src/services/ai_quant_lab/AIQuantLabService.hindex 582616ea4..7ed43465f 100644--- a/fincept-qt/src/services/ai_quant_lab/AIQuantLabService.h+++ b/fincept-qt/src/services/ai_quant_lab/AIQuantLabService.h@@ -39,6 +39,41 @@ class AIQuantLabService : public QObject {void gs_backtest(const QJsonObject& params);void gs_statistics(const QJsonObject& params);+ // ── Functime ────────────────────────────────────────────────────────────+ void functime_check_status();+ void functime_forecast(const QJsonObject& params);+ void functime_anomaly_detection(const QJsonObject& params);+ void functime_seasonality(const QJsonObject& params);+ void functime_metrics(const QJsonObject& params);+ void functime_confidence_intervals(const QJsonObject& params);+ void functime_stationarity(const QJsonObject& params);++ // ── Statsmodels ─────────────────────────────────────────────────────────+ void sm_check_status();+ void sm_ols(const QJsonObject& params);+ void sm_arima(const QJsonObject& params);+ void sm_stationarity_tests(const QJsonObject& params);+ void sm_acf_pacf(const QJsonObject& params);+ void sm_granger_causality(const QJsonObject& params);+ void sm_descriptive(const QJsonObject& params);++ // ── Fortitudo ───────────────────────────────────────────────────────────+ void fort_check_status();+ void fort_portfolio_metrics(const QJsonObject& params);+ void fort_covariance_matrix(const QJsonObject& params);+ void fort_mean_variance_optimize(const QJsonObject& params);+ void fort_mean_cvar_optimize(const QJsonObject& params);+ void fort_efficient_frontier(const QJsonObject& params);+ void fort_exp_decay_probabilities(const QJsonObject& params);++ // ── GluonTS ─────────────────────────────────────────────────────────────+ void gluon_check_status();+ void gluon_probabilistic_forecast(const QJsonObject& params);+ void gluon_quantile_forecast(const QJsonObject& params);+ void gluon_distribution_fit(const QJsonObject& params);+ void gluon_evaluate_forecast(const QJsonObject& params);+ void gluon_seasonal_naive(const QJsonObject& params);+// ── CFA Quant ───────────────────────────────────────────────────────────void cfa_trend_analysis(const QJsonObject& params);void cfa_stationarity_test(const QJsonObject& params);@@ -140,9 +175,12 @@ class AIQuantLabService : public QObject {void dataproc_process_data(const QJsonObject& params);// ── Quant Reporting ─────────────────────────────────────────────────────+ void reporting_check_status();void reporting_ic_analysis(const QJsonObject& params);void reporting_model_performance(const QJsonObject& params);void reporting_cumulative_returns(const QJsonObject& params);+ void reporting_risk_report(const QJsonObject& params);+ void reporting_factor_quantiles(const QJsonObject& params);signals:void result_ready(QString module_id, QString command, QJsonObject data);diff --git a/fincept-qt/src/services/ai_quant_lab/AIQuantLabTypes.h b/fincept-qt/src/services/ai_quant_lab/AIQuantLabTypes.hindex 535aa3c43..684cedfda 100644--- a/fincept-qt/src/services/ai_quant_lab/AIQuantLabTypes.h+++ b/fincept-qt/src/services/ai_quant_lab/AIQuantLabTypes.h@@ -70,14 +70,18 @@ inline QVector<QuantModule> all_quant_modules() {"Trend, ARIMA, ML prediction, PCA, bootstrap"},{"gs_quant", "GS Quant", "GS", "ANALYTICS", QColor("#9D4EDD"), "Analytics/gs_quant_wrapper/gs_quant_service.py","Risk metrics, portfolio analytics, options Greeks, VaR"},- {"statsmodels", "Statsmodels", "STATS", "ANALYTICS", QColor("#2196F3"), "Analytics/statsmodels_cli.py",- "Statistical modeling and econometrics"},- {"functime", "Functime", "FUNC", "ANALYTICS", QColor("#4CAF50"), "Analytics/quantstats_analytics.py",- "Time-series forecasting and analysis"},- {"fortitudo", "Fortitudo", "FORT", "ANALYTICS", QColor("#FF5722"), "Analytics/riskfoliolib_wrapper.py",- "Risk-aware portfolio optimization"},- {"gluonts", "GluonTS", "GLUON", "ANALYTICS", QColor("#795548"), "Analytics/quantstats_analytics.py",- "Probabilistic time-series forecasting"},+ {"statsmodels", "Statsmodels", "STATS", "ANALYTICS", QColor("#2196F3"),+ "Analytics/statsmodels_wrapper/statsmodels_service.py",+ "OLS, ARIMA, stationarity, ACF/PACF, Granger causality, descriptive"},+ {"functime", "Functime", "FUNC", "ANALYTICS", QColor("#4CAF50"),+ "Analytics/functime_wrapper/functime_service.py",+ "Forecasting, anomaly detection, seasonality, intervals, stationarity"},+ {"fortitudo", "Fortitudo", "FORT", "ANALYTICS", QColor("#FF5722"),+ "Analytics/fortitudo_tech_wrapper/fortitudo_service.py",+ "Portfolio metrics, MV/CVaR optimization, efficient frontier, exp-decay weights"},+ {"gluonts", "GluonTS", "GLUON", "ANALYTICS", QColor("#795548"),+ "Analytics/gluonts_wrapper/gluonts_service.py",+ "Probabilistic + quantile forecasts, distribution fits, forecast evaluation, baselines"},};}diff --git a/fincept-qt/src/services/backtesting/BacktestingService.cpp b/fincept-qt/src/services/backtesting/BacktestingService.cppindex a77a6039a..902ffbc65 100644--- a/fincept-qt/src/services/backtesting/BacktestingService.cpp+++ b/fincept-qt/src/services/backtesting/BacktestingService.cpp@@ -59,8 +59,24 @@ void BacktestingService::execute(const QString& provider, const QString& commandemit self->error_occurred(ctx, "Invalid JSON response");return;}+ // All Python providers wrap their payload in {success, data, error?}.+ // Surface failures via error_occurred and emit the inner `data` so+ // the screen sees the raw result (performance/trades/etc.) directly.+ auto root = doc.object();+ const bool ok = root.value("success").toBool(true);+ if (!ok) {+ auto err = root.value("error").toString();+ if (err.isEmpty())+ err = root.value("message").toString("Backtest failed");+ LOG_ERROR("Backtesting", QString("[%1] Provider error: %2").arg(ctx, err));+ emit self->error_occurred(ctx, err);+ return;+ }+ QJsonObject payload = root.contains("data") && root.value("data").isObject()+ ? root.value("data").toObject()+ : root;LOG_INFO("Backtesting", QString("[%1] Result ready").arg(ctx));- emit self->result_ready(provider, command, doc.object());+ emit self->result_ready(provider, command, payload);});}diff --git a/fincept-qt/src/services/billing/FeeDiscountService.cpp b/fincept-qt/src/services/billing/FeeDiscountService.cppindex 5462d1555..cd28943ea 100644--- a/fincept-qt/src/services/billing/FeeDiscountService.cpp+++ b/fincept-qt/src/services/billing/FeeDiscountService.cpp@@ -12,7 +12,7 @@ namespace fincept::billing {namespace {-constexpr const char* kFamilyPrefix = "billing:fncpt_discount:";+constexpr const char* kFeeDiscountFamilyPrefix = "billing:fncpt_discount:";quint64 fncpt_raw_amount(const fincept::wallet::WalletBalance& bal) {if (auto* h = bal.fncpt_holding()) {@@ -34,7 +34,7 @@ QStringList FeeDiscountService::topic_patterns() const {}QString FeeDiscountService::pubkey_from_topic(const QString& topic) {- return topic.mid(static_cast<int>(qstrlen(kFamilyPrefix)));+ return topic.mid(static_cast<int>(qstrlen(kFeeDiscountFamilyPrefix)));}QString FeeDiscountService::balance_topic_for(const QString& pubkey) {@@ -88,7 +88,7 @@ void FeeDiscountService::wire_balance_listener() {if (!topic.startsWith(prefix)) return;const auto pubkey = topic.mid(prefix.size());if (pubkey.isEmpty()) return;- const auto out_topic = QString::fromLatin1(kFamilyPrefix) + pubkey;+ const auto out_topic = QString::fromLatin1(kFeeDiscountFamilyPrefix) + pubkey;// Only republish if someone is actually listening (cheap check —// if nobody subscribed, the hub will skip the publish anyway,// but we save the QVariant copy).diff --git a/fincept-qt/src/services/billing/TierConfig.h b/fincept-qt/src/services/billing/TierConfig.hnew file mode 100644index 000000000..8c475744f--- /dev/null+++ b/fincept-qt/src/services/billing/TierConfig.h@@ -0,0 +1,88 @@+#pragma once++#include "services/wallet/WalletTypes.h"++#include <QString>+#include <QStringList>++namespace fincept::billing {++/// Tier thresholds + cross-screen gating config (Phase 3 §3.6).+///+/// Header-only — bumped to a config file by Phase 4 if thresholds need to+/// vary by environment. For now they're pinned and the derivation is pure.+///+/// Atomic units (decimals = 6 to match $FNCPT). veFNCPT weight = locked+/// $FNCPT × duration multiplier, so the thresholds compare apples to+/// apples — 100 veFNCPT means either 100 $FNCPT locked for 4 yrs (1.0×)+/// or 1,600 $FNCPT locked for 3 mo (0.0625×), etc.+struct TierConfig {+ static constexpr int kDecimals = 6;++ static constexpr quint64 kBronzeThresholdRaw = 100ULL * 1'000'000ULL; ///< 100 veFNCPT+ static constexpr quint64 kSilverThresholdRaw = 1'000ULL * 1'000'000ULL; ///< 1,000 veFNCPT+ static constexpr quint64 kGoldThresholdRaw = 10'000ULL * 1'000'000ULL; ///< 10,000 veFNCPT++ /// Tier from atomic weight. Pure function — used by both `TierService`+ /// (when publishing the topic) and any caller that needs a synchronous+ /// view (cross-screen gating in `AI Quant Lab`, `Alpha Arena`).+ static fincept::wallet::TierStatus::Tier tier_from_weight(quint64 weight_raw) noexcept {+ using Tier = fincept::wallet::TierStatus::Tier;+ if (weight_raw >= kGoldThresholdRaw) return Tier::Gold;+ if (weight_raw >= kSilverThresholdRaw) return Tier::Silver;+ if (weight_raw >= kBronzeThresholdRaw) return Tier::Bronze;+ return Tier::Free;+ }++ /// Raw amount of veFNCPT required to reach the next tier from `current`.+ /// Returns 0 at Gold (no next tier).+ static quint64 next_threshold_raw(fincept::wallet::TierStatus::Tier current) noexcept {+ using Tier = fincept::wallet::TierStatus::Tier;+ switch (current) {+ case Tier::Free: return kBronzeThresholdRaw;+ case Tier::Bronze: return kSilverThresholdRaw;+ case Tier::Silver: return kGoldThresholdRaw;+ case Tier::Gold: return 0;+ }+ return 0;+ }++ /// User-facing label.+ static QString label_for(fincept::wallet::TierStatus::Tier t) {+ using Tier = fincept::wallet::TierStatus::Tier;+ switch (t) {+ case Tier::Free: return QStringLiteral("FREE");+ case Tier::Bronze: return QStringLiteral("BRONZE");+ case Tier::Silver: return QStringLiteral("SILVER");+ case Tier::Gold: return QStringLiteral("GOLD");+ }+ return {};+ }++ /// Stable feature IDs that each tier unlocks. Consumed by gating+ /// checks elsewhere in the terminal (AI Quant Lab, Alpha Arena, paid+ /// screens). The exhaustive list below is the **plan §3.6 mapping**+ /// — keep it tight; new gates require an explicit decision.+ static QStringList features_unlocked_by(fincept::wallet::TierStatus::Tier t) {+ using Tier = fincept::wallet::TierStatus::Tier;+ switch (t) {+ case Tier::Free:+ return {};+ case Tier::Bronze:+ return {QStringLiteral("api-quota-basic")};+ case Tier::Silver:+ return {QStringLiteral("api-quota-basic"),+ QStringLiteral("premium-screens"),+ QStringLiteral("ai-quant-lab")};+ case Tier::Gold:+ return {QStringLiteral("api-quota-basic"),+ QStringLiteral("premium-screens"),+ QStringLiteral("ai-quant-lab"),+ QStringLiteral("alpha-arena"),+ QStringLiteral("all-agents")};+ }+ return {};+ }+};++} // namespace fincept::billingdiff --git a/fincept-qt/src/services/billing/TierService.cpp b/fincept-qt/src/services/billing/TierService.cppnew file mode 100644index 000000000..2fa486c1e--- /dev/null+++ b/fincept-qt/src/services/billing/TierService.cpp@@ -0,0 +1,126 @@+#include "services/billing/TierService.h"++#include "core/logging/Logger.h"+#include "datahub/DataHub.h"+#include "services/billing/TierConfig.h"+#include "services/wallet/WalletTypes.h"++#include <QDateTime>+#include <QHash>+#include <QVariant>++namespace fincept::billing {++namespace {++constexpr const char* kTierFamilyPrefix = "billing:tier:";+constexpr const char* kVeFncptPrefix = "wallet:vefncpt:";++// Per-process cache of last-published tier per pubkey. Used by both+// `get_cached_tier` (synchronous gating) and the `tier_changed` signal+// emission (skip noise re-emits when the tier hasn't actually moved).+QHash<QString, fincept::wallet::TierStatus::Tier>& tier_cache() {+ static QHash<QString, fincept::wallet::TierStatus::Tier> c;+ return c;+}++} // namespace++TierService& TierService::instance() {+ static TierService inst;+ return inst;+}++TierService::TierService(QObject* parent) : QObject(parent) {}++TierService::~TierService() = default;++QStringList TierService::topic_patterns() const {+ return QStringList{QStringLiteral("billing:tier:*")};+}++QString TierService::pubkey_from_topic(const QString& topic) {+ return topic.mid(static_cast<int>(qstrlen(kTierFamilyPrefix)));+}++QString TierService::vefncpt_topic_for(const QString& pubkey) {+ return QString::fromLatin1(kVeFncptPrefix) + pubkey;+}++fincept::wallet::TierStatus::Tier+TierService::get_cached_tier(const QString& pubkey) const {+ return tier_cache().value(pubkey, fincept::wallet::TierStatus::Tier::Free);+}++void TierService::refresh(const QStringList& topics) {+ wire_vefncpt_listener();+ for (const auto& topic : topics) {+ const auto pubkey = pubkey_from_topic(topic);+ if (pubkey.isEmpty()) continue;+ publish_for(topic, pubkey);+ }+}++void TierService::publish_for(const QString& topic, const QString& pubkey) {+ auto& hub = fincept::datahub::DataHub::instance();+ const auto v = hub.peek(vefncpt_topic_for(pubkey));++ fincept::wallet::TierStatus s;+ s.pubkey_b58 = pubkey;+ s.decimals = TierConfig::kDecimals;+ s.ts_ms = QDateTime::currentMSecsSinceEpoch();++ quint64 weight_raw = 0;+ bool any_data = false;+ if (v.canConvert<fincept::wallet::VeFncptAggregate>()) {+ const auto agg = v.value<fincept::wallet::VeFncptAggregate>();+ bool ok = false;+ weight_raw = agg.total_weight_raw.toULongLong(&ok);+ if (!ok) weight_raw = 0;+ any_data = true;+ s.is_mock = agg.is_mock;+ }++ s.tier = TierConfig::tier_from_weight(weight_raw);+ s.weight_raw = QString::number(weight_raw);+ const auto next = TierConfig::next_threshold_raw(s.tier);+ s.next_threshold_raw = next == 0 ? QString() : QString::number(next);++ // Update cache + emit on change. The cache is also the source for+ // synchronous gating in screens that haven't subscribed yet.+ auto& cache = tier_cache();+ const auto prev = cache.value(pubkey, fincept::wallet::TierStatus::Tier::Free);+ cache.insert(pubkey, s.tier);++ hub.publish(topic, QVariant::fromValue(s));++ if (prev != s.tier) {+ if (any_data) {+ // Only emit when we actually have a weight number to back the+ // claim — otherwise the very first publish (Free → Free) would+ // fire a noisy signal for every connected pubkey at startup.+ emit tier_changed(pubkey, static_cast<int>(s.tier));+ LOG_INFO("Tier", QStringLiteral("%1: %2 → %3")+ .arg(pubkey.left(12))+ .arg(TierConfig::label_for(prev))+ .arg(TierConfig::label_for(s.tier)));+ }+ }+}++void TierService::wire_vefncpt_listener() {+ if (listener_wired_) return;+ auto& hub = fincept::datahub::DataHub::instance();+ QObject::connect(&hub, &fincept::datahub::DataHub::topic_updated, this,+ [this](const QString& topic, const QVariant& /*value*/) {+ if (!topic.startsWith(QLatin1String(kVeFncptPrefix))) return;+ const auto pubkey = topic.mid(qstrlen(kVeFncptPrefix));+ if (pubkey.isEmpty()) return;+ const auto out_topic = QString::fromLatin1(kTierFamilyPrefix) + pubkey;+ publish_for(out_topic, pubkey);+ });+ listener_wired_ = true;+ LOG_INFO("Tier", "veFNCPT listener wired");+}++} // namespace fincept::billingdiff --git a/fincept-qt/src/services/billing/TierService.h b/fincept-qt/src/services/billing/TierService.hnew file mode 100644index 000000000..4e8896600--- /dev/null+++ b/fincept-qt/src/services/billing/TierService.h@@ -0,0 +1,68 @@+#pragma once++#include "datahub/Producer.h"+#include "services/wallet/WalletTypes.h"++#include <QObject>+#include <QString>++namespace fincept::billing {++/// Producer for `billing:tier:<pubkey>` (Phase 3 §3.6).+///+/// Like `FeeDiscountService`, this is a **derived producer** — eligibility+/// is computed from another hub topic (`wallet:vefncpt:<pubkey>`) rather+/// than fetched from anything external. The service:+///+/// 1. Subscribes to `wallet:vefncpt:*` internally.+/// 2. Whenever a veFNCPT aggregate publishes, recomputes the tier from+/// `total_weight_raw` against `TierConfig` thresholds.+/// 3. Republishes `billing:tier:<pubkey>` on every weight change.+///+/// Cross-screen gating: emits `tier_changed(pubkey, tier)` so paid screens+/// (AI Quant Lab, Alpha Arena, etc.) can react without polling the hub.+/// `get_cached_tier(pubkey)` provides a synchronous lookup for nav-level+/// gating that runs before the hub has emitted.+class TierService : public QObject, public fincept::datahub::Producer {+ Q_OBJECT+ public:+ static TierService& instance();++ QStringList topic_patterns() const override;+ void refresh(const QStringList& topics) override;+ int max_requests_per_sec() const override { return 0; }++ /// Synchronous tier lookup. Returns `Free` when no veFNCPT data is+ /// cached yet — paid screens should treat that as "not yet eligible"+ /// and re-check on the `tier_changed` signal.+ fincept::wallet::TierStatus::Tier get_cached_tier(const QString& pubkey) const;++ signals:+ /// Fires whenever the published tier for a pubkey changes. Cross-screen+ /// gates connect to this and re-evaluate.+ void tier_changed(QString pubkey, int new_tier);++ private:+ explicit TierService(QObject* parent = nullptr);+ ~TierService() override;+ TierService(const TierService&) = delete;+ TierService& operator=(const TierService&) = delete;++ /// `billing:tier:<pubkey>` → pubkey, or "" if invalid.+ static QString pubkey_from_topic(const QString& topic);++ /// `wallet:vefncpt:<pubkey>` for the given pubkey.+ static QString vefncpt_topic_for(const QString& pubkey);++ /// Publish a `TierStatus` for `topic`/`pubkey` by peeking the latest+ /// veFNCPT aggregate from the hub. Idempotent.+ void publish_for(const QString& topic, const QString& pubkey);++ /// Set up cross-subscription so weight changes re-emit eligibility+ /// immediately rather than waiting on the hub TTL tick.+ void wire_vefncpt_listener();++ bool listener_wired_ = false;+};++} // namespace fincept::billingdiff --git a/fincept-qt/src/services/maritime/MaritimePortTypes.h b/fincept-qt/src/services/maritime/MaritimePortTypes.hnew file mode 100644index 000000000..f9115b9af--- /dev/null+++ b/fincept-qt/src/services/maritime/MaritimePortTypes.h@@ -0,0 +1,43 @@+// src/services/maritime/MaritimePortTypes.h+#pragma once+#include <QMetaType>+#include <QString>+#include <QVector>++namespace fincept::services::maritime {++/// Where a port record came from. Used by the UI to display a small badge so+/// the user can tell that, e.g., a hit with no UN/LOCODE came from OSM rather+/// than the canonical Wikidata catalogue.+enum class PortSource {+ Unknown = 0,+ Wikidata,+ MarineRegions,+ OSM,+};++inline QString port_source_name(PortSource s) {+ switch (s) {+ case PortSource::Wikidata: return QStringLiteral("Wikidata");+ case PortSource::MarineRegions: return QStringLiteral("MarineRegions");+ case PortSource::OSM: return QStringLiteral("OSM");+ default: return QStringLiteral("?");+ }+}++/// One port record. `locode` is the 5-letter UN/LOCODE (e.g. "SGSIN") and is+/// optional — Marine Regions and OSM never provide it. `country` is also+/// optional for the same reason.+struct PortRecord {+ QString name;+ QString country;+ QString locode;+ double latitude = 0.0;+ double longitude = 0.0;+ PortSource source = PortSource::Unknown;+};++} // namespace fincept::services::maritime++Q_DECLARE_METATYPE(fincept::services::maritime::PortRecord)+Q_DECLARE_METATYPE(QVector<fincept::services::maritime::PortRecord>)diff --git a/fincept-qt/src/services/maritime/PortsCatalog.cpp b/fincept-qt/src/services/maritime/PortsCatalog.cppnew file mode 100644index 000000000..b41212bb9--- /dev/null+++ b/fincept-qt/src/services/maritime/PortsCatalog.cpp@@ -0,0 +1,498 @@+// src/services/maritime/PortsCatalog.cpp+#include "services/maritime/PortsCatalog.h"++#include "core/logging/Logger.h"+#include "datahub/DataHub.h"+#include "datahub/DataHubMetaTypes.h"+#include "storage/cache/CacheManager.h"++#include <QCryptographicHash>+#include <QJsonArray>+#include <QJsonDocument>+#include <QJsonObject>+#include <QNetworkAccessManager>+#include <QNetworkReply>+#include <QNetworkRequest>+#include <QPointer>+#include <QRegularExpression>+#include <QUrl>+#include <QUrlQuery>++namespace fincept::services::maritime {++namespace {++constexpr const char* kWikidataEndpoint = "https://query.wikidata.org/sparql";+constexpr const char* kMarineRegionsBase = "https://www.marineregions.org/rest/getGazetteerRecordsByName.json";+constexpr const char* kOverpassEndpoint = "https://overpass-api.de/api/interpreter";++// Wikidata's "honest API access" policy requires a real User-Agent. Anonymous+// or library-default UAs get throttled hard; including contact info here is+// the recommended convention.+constexpr const char* kUserAgent = "FinceptTerminal/4.0 (https://fincept.in; [email protected])";++// Cache TTL — UN/LOCODE / Wikidata port data drifts on a quarterly cadence.+// Seven days keeps the screen snappy across launches without going stale.+constexpr int kCacheTtlSec = 7 * 24 * 60 * 60;++QString cache_key_for(const QString& kind, const QString& payload) {+ const auto hash = QCryptographicHash::hash(payload.toUtf8(), QCryptographicHash::Sha1).toHex().left(12);+ return QStringLiteral("maritime:ports:%1:%2").arg(kind, QString::fromLatin1(hash));+}++// Local helper — renamed from `publish_to_hub` so unity builds don't collide+// with the identically-named helper in MaritimeService.cpp. Both lived in+// anonymous namespaces in their own TUs, but unity merging collapses them.+inline void publish_ports_to_hub(const QString& topic, const QVariant& value) {+ fincept::datahub::DataHub::instance().publish(topic, value);+}++// ── Wikidata WKT parser ─────────────────────────────────────────────────────+//+// Wikidata returns coordinates as a `Point(lng lat)` literal with the+// `geosparql#wktLiteral` datatype. Note the order: longitude first, latitude+// second — opposite of the lat/lng convention used everywhere else in the+// codebase.+bool parse_wkt_point(const QString& wkt, double* out_lat, double* out_lng) {+ static const QRegularExpression re(QStringLiteral(R"(Point\(\s*([-\d\.]+)\s+([-\d\.]+)\s*\))"));+ const auto m = re.match(wkt);+ if (!m.hasMatch()) return false;+ bool ok1 = false, ok2 = false;+ const double lng = m.captured(1).toDouble(&ok1);+ const double lat = m.captured(2).toDouble(&ok2);+ if (!ok1 || !ok2) return false;+ *out_lat = lat;+ *out_lng = lng;+ return true;+}++// ── PortRecord ↔ JSON helpers (cache round-trip) ─────────────────────────────+QJsonObject to_json(const PortRecord& p) {+ QJsonObject o;+ o["name"] = p.name;+ o["country"] = p.country;+ o["locode"] = p.locode;+ o["lat"] = p.latitude;+ o["lng"] = p.longitude;+ o["source"] = static_cast<int>(p.source);+ return o;+}++PortRecord from_json(const QJsonObject& o) {+ PortRecord p;+ p.name = o["name"].toString();+ p.country = o["country"].toString();+ p.locode = o["locode"].toString();+ p.latitude = o["lat"].toDouble();+ p.longitude = o["lng"].toDouble();+ p.source = static_cast<PortSource>(o["source"].toInt());+ return p;+}++QByteArray serialize_results(const QVector<PortRecord>& rows) {+ QJsonArray arr;+ for (const auto& p : rows) arr.append(to_json(p));+ return QJsonDocument(arr).toJson(QJsonDocument::Compact);+}++QVector<PortRecord> deserialize_results(const QByteArray& blob) {+ QVector<PortRecord> out;+ const auto arr = QJsonDocument::fromJson(blob).array();+ out.reserve(arr.size());+ for (const auto& v : arr) out.append(from_json(v.toObject()));+ return out;+}++} // namespace++// ── Singleton ────────────────────────────────────────────────────────────────+PortsCatalog& PortsCatalog::instance() {+ static PortsCatalog inst;+ return inst;+}++PortsCatalog::PortsCatalog(QObject* parent) : QObject(parent) {+ nam_ = new QNetworkAccessManager(this);+}++// ═══════════════════════════════════════════════════════════════════════════════+// PUBLIC API+// ═══════════════════════════════════════════════════════════════════════════════++void PortsCatalog::search_by_name(const QString& query, int limit) {+ const QString q = query.trimmed();+ if (q.isEmpty()) return;+ const QString context = QStringLiteral("name:") + q.toLower();++ // Cache hit — skip network entirely.+ const QString cache_key = cache_key_for("name", q.toLower() + ":" + QString::number(limit));+ const QVariant cached = fincept::CacheManager::instance().get(cache_key);+ if (!cached.isNull()) {+ const auto rows = deserialize_results(cached.toString().toUtf8());+ emit ports_found(rows, context);+ return;+ }+ fetch_wikidata_by_name(q, limit, context);+}++void PortsCatalog::search_by_bbox(double min_lat, double max_lat,+ double min_lng, double max_lng, int limit) {+ if (max_lat <= min_lat || max_lng <= min_lng) {+ emit error_occurred(QStringLiteral("bbox"), QStringLiteral("Invalid bbox"));+ return;+ }+ const QString context = QStringLiteral("bbox:%1,%2,%3,%4")+ .arg(min_lat).arg(max_lat).arg(min_lng).arg(max_lng);++ const QString cache_key = cache_key_for("bbox",+ QStringLiteral("%1,%2,%3,%4,%5").arg(min_lat).arg(max_lat).arg(min_lng).arg(max_lng).arg(limit));+ const QVariant cached = fincept::CacheManager::instance().get(cache_key);+ if (!cached.isNull()) {+ const auto rows = deserialize_results(cached.toString().toUtf8());+ emit ports_found(rows, context);+ return;+ }+ fetch_wikidata_by_bbox(min_lat, max_lat, min_lng, max_lng, limit, context);+}++// ═══════════════════════════════════════════════════════════════════════════════+// WIKIDATA SPARQL — primary+// ═══════════════════════════════════════════════════════════════════════════════++namespace {++// Parse a `application/sparql-results+json` body into PortRecords. The expected+// shape is:+// { "head": {"vars": [...]},+// "results": { "bindings": [+// {"port": {...}, "portLabel": {...}, "countryLabel": {...},+// "coord": {"value": "Point(<lng> <lat>)"}, "unlocode": {...} },+// ...+// ]}}+QVector<PortRecord> parse_wikidata_response(const QByteArray& body) {+ QVector<PortRecord> out;+ const auto doc = QJsonDocument::fromJson(body);+ if (!doc.isObject()) return out;+ const auto bindings = doc.object()["results"].toObject()["bindings"].toArray();+ out.reserve(bindings.size());+ for (const auto& v : bindings) {+ const auto obj = v.toObject();+ const QString wkt = obj["coord"].toObject()["value"].toString();+ double lat = 0, lng = 0;+ if (!parse_wkt_point(wkt, &lat, &lng)) continue;+ PortRecord p;+ p.name = obj["portLabel"].toObject()["value"].toString();+ p.country = obj["countryLabel"].toObject()["value"].toString();+ p.locode = obj["unlocode"].toObject()["value"].toString();+ p.latitude = lat;+ p.longitude = lng;+ p.source = PortSource::Wikidata;+ // Drop entries where the label is just the Q-id (no English label+ // available on that entity) — they're useless to a human reader.+ if (p.name.isEmpty() || p.name.startsWith(QLatin1Char('Q'))) {+ const QUrl uri(obj["port"].toObject()["value"].toString());+ const auto qid = uri.fileName();+ if (p.name.isEmpty()) p.name = qid;+ }+ out.append(p);+ }+ return out;+}++} // namespace++void PortsCatalog::fetch_wikidata_by_name(const QString& query, int limit, const QString& context) {+ // SPARQL: free-text name match (case-insensitive contains) over the+ // canonical port type (Q44782 — port) and its subclasses. Service label+ // resolves portLabel/countryLabel to English; we scope wikibase:label to+ // the SERVICE block so UNION/OPTIONAL don't multiply rows.+ const QString sparql = QStringLiteral(+ "SELECT DISTINCT ?port ?portLabel ?countryLabel ?coord ?unlocode WHERE {"+ " ?port wdt:P31/wdt:P279* wd:Q44782 ."+ " ?port wdt:P625 ?coord ."+ " ?port rdfs:label ?label ."+ " FILTER(LANG(?label) = \"en\") ."+ " FILTER(CONTAINS(LCASE(?label), LCASE(\"%1\"))) ."+ " OPTIONAL { ?port wdt:P17 ?country . }"+ " OPTIONAL { ?port wdt:P1937 ?unlocode . }"+ " SERVICE wikibase:label { bd:serviceParam wikibase:language \"en\". }"+ "} LIMIT %2"+ ).arg(query.toLower().replace(QStringLiteral("\""), QStringLiteral("\\\""))).arg(limit);++ QUrl url(kWikidataEndpoint);+ QUrlQuery q;+ q.addQueryItem("query", sparql);+ q.addQueryItem("format", "json");+ url.setQuery(q);++ QNetworkRequest req(url);+ req.setHeader(QNetworkRequest::UserAgentHeader, kUserAgent);+ req.setRawHeader("Accept", "application/sparql-results+json");++ auto* reply = nam_->get(req);+ QPointer<PortsCatalog> self = this;+ connect(reply, &QNetworkReply::finished, this, [self, reply, query, limit, context]() {+ reply->deleteLater();+ if (!self) return;+ if (reply->error() != QNetworkReply::NoError) {+ LOG_WARN("PortsCatalog", QString("Wikidata name search failed: %1").arg(reply->errorString()));+ // Fall through to Marine Regions instead of failing the search.+ self->fetch_marineregions_by_name(query, limit, context);+ return;+ }+ auto rows = parse_wikidata_response(reply->readAll());+ if (rows.isEmpty()) {+ LOG_INFO("PortsCatalog", QString("Wikidata empty for '%1' — trying Marine Regions").arg(query));+ self->fetch_marineregions_by_name(query, limit, context);+ return;+ }+ const QString cache_key = cache_key_for("name", query.toLower() + ":" + QString::number(limit));+ fincept::CacheManager::instance().put(+ cache_key, QVariant(QString::fromUtf8(serialize_results(rows))), kCacheTtlSec, "maritime");+ LOG_INFO("PortsCatalog", QString("Wikidata: %1 ports for '%2'").arg(rows.size()).arg(query));+ emit self->ports_found(rows, context);+ if (self->hub_registered_)+ publish_ports_to_hub(QStringLiteral("maritime:ports:") + context, QVariant::fromValue(rows));+ });+}++void PortsCatalog::fetch_wikidata_by_bbox(double min_lat, double max_lat,+ double min_lng, double max_lng,+ int limit, const QString& context) {+ // Wikidata's wikibase:box service — south-west and north-east corners as+ // Point literals. Note that here, like all WKT in Wikidata, longitude is+ // first, latitude second.+ const QString sparql = QStringLiteral(+ "SELECT DISTINCT ?port ?portLabel ?countryLabel ?coord ?unlocode WHERE {"+ " SERVICE wikibase:box {"+ " ?port wdt:P625 ?coord ."+ " bd:serviceParam wikibase:cornerSouthWest \"Point(%1 %2)\"^^geo:wktLiteral ."+ " bd:serviceParam wikibase:cornerNorthEast \"Point(%3 %4)\"^^geo:wktLiteral ."+ " }"+ " ?port wdt:P31/wdt:P279* wd:Q44782 ."+ " OPTIONAL { ?port wdt:P17 ?country . }"+ " OPTIONAL { ?port wdt:P1937 ?unlocode . }"+ " SERVICE wikibase:label { bd:serviceParam wikibase:language \"en\". }"+ "} LIMIT %5"+ ).arg(min_lng).arg(min_lat).arg(max_lng).arg(max_lat).arg(limit);++ QUrl url(kWikidataEndpoint);+ QUrlQuery q;+ q.addQueryItem("query", sparql);+ q.addQueryItem("format", "json");+ url.setQuery(q);++ QNetworkRequest req(url);+ req.setHeader(QNetworkRequest::UserAgentHeader, kUserAgent);+ req.setRawHeader("Accept", "application/sparql-results+json");++ auto* reply = nam_->get(req);+ QPointer<PortsCatalog> self = this;+ connect(reply, &QNetworkReply::finished, this,+ [self, reply, min_lat, max_lat, min_lng, max_lng, limit, context]() {+ reply->deleteLater();+ if (!self) return;+ if (reply->error() != QNetworkReply::NoError) {+ LOG_WARN("PortsCatalog", QString("Wikidata bbox failed: %1").arg(reply->errorString()));+ self->fetch_overpass_by_bbox(min_lat, max_lat, min_lng, max_lng, limit, context);+ return;+ }+ auto rows = parse_wikidata_response(reply->readAll());+ // < 3 hits in a region usually means thin coverage — supplement with+ // OSM. The two sources are merged client-side; dedup is done by+ // (rounded-coord, lower-name) below.+ if (rows.size() < 3) {+ LOG_INFO("PortsCatalog", QString("Wikidata bbox sparse (%1) — supplementing with OSM").arg(rows.size()));+ self->fetch_overpass_by_bbox(min_lat, max_lat, min_lng, max_lng, limit, context);+ // Cache what we got from Wikidata so the supplemental call's+ // results merge can read it back. We use a very short partial-+ // cache here — overpass callback reads it and republishes with+ // dedup, then writes the merged blob.+ return;+ }+ const QString cache_key = cache_key_for("bbox",+ QStringLiteral("%1,%2,%3,%4,%5").arg(min_lat).arg(max_lat).arg(min_lng).arg(max_lng).arg(limit));+ fincept::CacheManager::instance().put(+ cache_key, QVariant(QString::fromUtf8(serialize_results(rows))), kCacheTtlSec, "maritime");+ LOG_INFO("PortsCatalog", QString("Wikidata: %1 ports in bbox").arg(rows.size()));+ emit self->ports_found(rows, context);+ if (self->hub_registered_)+ publish_ports_to_hub(QStringLiteral("maritime:ports:") + context, QVariant::fromValue(rows));+ });+}++// ═══════════════════════════════════════════════════════════════════════════════+// MARINE REGIONS — name-search fallback+// ═══════════════════════════════════════════════════════════════════════════════++void PortsCatalog::fetch_marineregions_by_name(const QString& query, int limit, const QString& context) {+ QUrl url(QString(kMarineRegionsBase) + "/" + QUrl::toPercentEncoding(query) + "/");+ QUrlQuery q;+ q.addQueryItem("like", "true");+ q.addQueryItem("fuzzy", "true");+ url.setQuery(q);++ QNetworkRequest req(url);+ req.setHeader(QNetworkRequest::UserAgentHeader, kUserAgent);+ req.setRawHeader("Accept", "application/json");++ auto* reply = nam_->get(req);+ QPointer<PortsCatalog> self = this;+ connect(reply, &QNetworkReply::finished, this, [self, reply, query, limit, context]() {+ reply->deleteLater();+ if (!self) return;+ if (reply->error() != QNetworkReply::NoError) {+ emit self->error_occurred(context, QString("Marine Regions: %1").arg(reply->errorString()));+ return;+ }+ const auto arr = QJsonDocument::fromJson(reply->readAll()).array();+ // Marine Regions returns one row per language label per gazetteer+ // record — dedup by MRGID, prefer English label, filter to actual+ // harbour entries (the API will happily return communes / bays /+ // marine regions named "Rotterdam").+ QHash<int, PortRecord> by_mrgid;+ QHash<int, int> language_priority; // 0=en, 1=other; lower wins+ for (const auto& v : arr) {+ const auto o = v.toObject();+ if (o["placeType"].toString() != QStringLiteral("Harbour")) continue;+ const int mrgid = o["MRGID"].toInt();+ const QString lang = o["preferredGazetteerNameLang"].toString();+ const int prio = (lang == QStringLiteral("English")) ? 0 : 1;+ if (by_mrgid.contains(mrgid) && language_priority.value(mrgid, 99) <= prio)+ continue;+ PortRecord p;+ p.name = o["preferredGazetteerName"].toString();+ p.latitude = o["latitude"].toDouble();+ p.longitude = o["longitude"].toDouble();+ p.source = PortSource::MarineRegions;+ by_mrgid.insert(mrgid, p);+ language_priority.insert(mrgid, prio);+ }+ QVector<PortRecord> rows;+ rows.reserve(by_mrgid.size());+ for (auto it = by_mrgid.cbegin(); it != by_mrgid.cend() && rows.size() < limit; ++it)+ rows.append(it.value());+ const QString cache_key = cache_key_for("name", query.toLower() + ":" + QString::number(limit));+ fincept::CacheManager::instance().put(+ cache_key, QVariant(QString::fromUtf8(serialize_results(rows))), kCacheTtlSec, "maritime");+ LOG_INFO("PortsCatalog", QString("MarineRegions: %1 ports for '%2'").arg(rows.size()).arg(query));+ emit self->ports_found(rows, context);+ if (self->hub_registered_)+ publish_ports_to_hub(QStringLiteral("maritime:ports:") + context, QVariant::fromValue(rows));+ });+}++// ═══════════════════════════════════════════════════════════════════════════════+// OVERPASS — bbox fallback+// ═══════════════════════════════════════════════════════════════════════════════++void PortsCatalog::fetch_overpass_by_bbox(double min_lat, double max_lat,+ double min_lng, double max_lng,+ int limit, const QString& context) {+ // Overpass takes (south, west, north, east). Match the common port-ish+ // tag combinations: seamark:type=harbour (canonical maritime tag),+ // industrial=port (commercial/container), harbour=yes (catch-all).+ const QString ql = QStringLiteral(+ "[out:json][timeout:25];"+ "("+ "node[\"seamark:type\"=\"harbour\"](%1,%2,%3,%4);"+ "node[\"industrial\"=\"port\"](%1,%2,%3,%4);"+ "node[\"harbour\"=\"yes\"](%1,%2,%3,%4);"+ "way[\"seamark:type\"=\"harbour\"](%1,%2,%3,%4);"+ "way[\"industrial\"=\"port\"](%1,%2,%3,%4);"+ ");"+ "out center %5;"+ ).arg(min_lat).arg(min_lng).arg(max_lat).arg(max_lng).arg(limit);++ const QUrl overpass_url{QString::fromLatin1(kOverpassEndpoint)};+ QNetworkRequest req(overpass_url);+ req.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");+ req.setHeader(QNetworkRequest::UserAgentHeader, kUserAgent);++ QUrlQuery body;+ body.addQueryItem("data", ql);+ const QByteArray body_bytes = body.toString(QUrl::FullyEncoded).toUtf8();+ auto* reply = nam_->post(req, body_bytes);+ QPointer<PortsCatalog> self = this;+ connect(reply, &QNetworkReply::finished, this,+ [self, reply, min_lat, max_lat, min_lng, max_lng, limit, context]() {+ reply->deleteLater();+ if (!self) return;+ if (reply->error() != QNetworkReply::NoError) {+ emit self->error_occurred(context, QString("Overpass: %1").arg(reply->errorString()));+ return;+ }+ const auto root = QJsonDocument::fromJson(reply->readAll()).object();+ const auto elements = root["elements"].toArray();+ QVector<PortRecord> rows;+ rows.reserve(elements.size());+ for (const auto& v : elements) {+ const auto el = v.toObject();+ double lat = 0, lng = 0;+ if (el.contains("lat") && el.contains("lon")) {+ lat = el["lat"].toDouble();+ lng = el["lon"].toDouble();+ } else if (el.contains("center")) {+ lat = el["center"].toObject()["lat"].toDouble();+ lng = el["center"].toObject()["lon"].toDouble();+ } else {+ continue;+ }+ const auto tags = el["tags"].toObject();+ PortRecord p;+ p.name = tags["name"].toString();+ if (p.name.isEmpty())+ p.name = tags["seamark:name"].toString();+ // Skip unnamed POIs — they're noisy on a results table.+ if (p.name.isEmpty()) continue;+ p.latitude = lat;+ p.longitude = lng;+ p.source = PortSource::OSM;+ rows.append(p);+ if (rows.size() >= limit) break;+ }+ const QString cache_key = cache_key_for("bbox",+ QStringLiteral("%1,%2,%3,%4,%5").arg(min_lat).arg(max_lat).arg(min_lng).arg(max_lng).arg(limit));+ fincept::CacheManager::instance().put(+ cache_key, QVariant(QString::fromUtf8(serialize_results(rows))), kCacheTtlSec, "maritime");+ LOG_INFO("PortsCatalog", QString("Overpass: %1 ports in bbox").arg(rows.size()));+ emit self->ports_found(rows, context);+ if (self->hub_registered_)+ publish_ports_to_hub(QStringLiteral("maritime:ports:") + context, QVariant::fromValue(rows));+ });+}++// ═══════════════════════════════════════════════════════════════════════════════+// DATAHUB PRODUCER — maritime:ports:*+// ═══════════════════════════════════════════════════════════════════════════════++QStringList PortsCatalog::topic_patterns() const {+ return {QStringLiteral("maritime:ports:*")};+}++void PortsCatalog::refresh(const QStringList& topics) {+ // Searches are user-driven and parameterised by the query string baked+ // into the topic suffix — re-firing them on a hub schedule would only+ // burn requests against Wikidata's polite-use limits. Push-only.+ Q_UNUSED(topics);+}++int PortsCatalog::max_requests_per_sec() const {+ return 1; // Wikidata enforces polite-use; one call per second is plenty.+}++void PortsCatalog::ensure_registered_with_hub() {+ if (hub_registered_) return;+ auto& hub = fincept::datahub::DataHub::instance();+ hub.register_producer(this);++ fincept::datahub::TopicPolicy policy;+ policy.push_only = true;+ policy.ttl_ms = kCacheTtlSec * 1000;+ hub.set_policy_pattern(QStringLiteral("maritime:ports:*"), policy);++ hub_registered_ = true;+ LOG_INFO("PortsCatalog", "Registered with DataHub (maritime:ports:*)");+}++} // namespace fincept::services::maritimediff --git a/fincept-qt/src/services/maritime/PortsCatalog.h b/fincept-qt/src/services/maritime/PortsCatalog.hnew file mode 100644index 000000000..026e8ceba--- /dev/null+++ b/fincept-qt/src/services/maritime/PortsCatalog.h@@ -0,0 +1,79 @@+// src/services/maritime/PortsCatalog.h+#pragma once+#include "datahub/Producer.h"+#include "services/maritime/MaritimePortTypes.h"++#include <QObject>+#include <QString>+#include <QStringList>+#include <QVector>++class QNetworkAccessManager;+class QNetworkReply;++namespace fincept::services::maritime {++/// Singleton port-directory service.+///+/// Live data sources (no API key, no static bundle):+/// • Wikidata SPARQL — primary; canonical port set with UN/LOCODE+/// • Marine Regions Gazetteer — name-search fallback when Wikidata is empty+/// • OSM Overpass — bbox fallback when Wikidata returns < 3 hits+///+/// All requests are asynchronous and post results back through the+/// `ports_found(results, context)` signal where `context` echoes the caller's+/// query string so multiple in-flight searches can be disambiguated.+class PortsCatalog : public QObject+ , public fincept::datahub::Producer+{+ Q_OBJECT+ public:+ static PortsCatalog& instance();++ /// Register with DataHub + install policies. Idempotent.+ void ensure_registered_with_hub();++ // ── fincept::datahub::Producer ─────────────────────────────────────────+ QStringList topic_patterns() const override;+ void refresh(const QStringList& topics) override;+ int max_requests_per_sec() const override;++ /// Free-text name search. Falls back to Marine Regions if Wikidata+ /// returns zero rows. `limit` caps the returned vector size.+ void search_by_name(const QString& query, int limit = 50);++ /// Geographic bbox search. Falls back to Overpass if Wikidata returns+ /// fewer than 3 ports — useful in regions where Wikidata coverage is+ /// thin (e.g. inland rivers, small Pacific atolls).+ void search_by_bbox(double min_lat, double max_lat,+ double min_lng, double max_lng,+ int limit = 100);++ signals:+ /// `context` is the original query string ("name:rotterdam" or+ /// "bbox:lat0,lat1,lng0,lng1") so handlers can match results back to+ /// the search that triggered them.+ void ports_found(QVector<fincept::services::maritime::PortRecord> ports, QString context);+ void error_occurred(QString context, QString message);++ private:+ explicit PortsCatalog(QObject* parent = nullptr);+ Q_DISABLE_COPY(PortsCatalog)++ // Underlying fetchers. All are non-blocking; each posts to ports_found+ // with the same `context` string the public API received so the caller+ // never has to disambiguate.+ void fetch_wikidata_by_name(const QString& query, int limit, const QString& context);+ void fetch_wikidata_by_bbox(double min_lat, double max_lat,+ double min_lng, double max_lng,+ int limit, const QString& context);+ void fetch_marineregions_by_name(const QString& query, int limit, const QString& context);+ void fetch_overpass_by_bbox(double min_lat, double max_lat,+ double min_lng, double max_lng,+ int limit, const QString& context);++ QNetworkAccessManager* nam_ = nullptr;+ bool hub_registered_ = false;+};++} // namespace fincept::services::maritimediff --git a/fincept-qt/src/services/markets/MarketDataService.cpp b/fincept-qt/src/services/markets/MarketDataService.cppindex 802dcf3f9..1caa8a514 100644--- a/fincept-qt/src/services/markets/MarketDataService.cpp+++ b/fincept-qt/src/services/markets/MarketDataService.cpp@@ -245,18 +245,30 @@ void MarketDataService::ensure_registered_with_hub() {// Quotes: 30s TTL, 2s min interval. Dropped min_interval from 5s → 2s so// user-triggered refreshes and initial cold-start paint don't queue behind// the gate. 2s still prevents hammering yfinance on scheduler ticks.+ //+ // Phase 8 / decision 9.2: pause_when_inactive=true. Quotes drive+ // visible price tickers; when a frame is minimised the user can't see+ // them and the fan-out cost (table re-paints, format computations) is+ // pure waste. The cached value still updates so the next show reads+ // a fresh price from peek().datahub::TopicPolicy quote_p;quote_p.ttl_ms = 30'000;quote_p.min_interval_ms = 2'000;+ quote_p.pause_when_inactive = true;hub.set_policy_pattern(QStringLiteral("market:quote:*"), quote_p);// Sparklines: 5-day hourly data, changes slowly — cache 10 minutes,// refresh at most every 30s. Reduced from 60s so a user flipping between// screens doesn't wait a full minute for sparkline refresh after swapping// the symbol set.+ //+ // Phase 8 / decision 9.2: pause_when_inactive=true. Sparkline updates+ // re-paint inline charts in tables — substantial work for inactive+ // frames. Same reasoning as quotes.datahub::TopicPolicy spark_p;spark_p.ttl_ms = 10 * 60'000;spark_p.min_interval_ms = 30'000;+ spark_p.pause_when_inactive = true;hub.set_policy_pattern(QStringLiteral("market:sparkline:*"), spark_p);// History: OHLCV series. One-shot per chart; policies are conservative todiff --git a/fincept-qt/src/services/prediction/fincept_internal/FinceptInternalAdapter.cpp b/fincept-qt/src/services/prediction/fincept_internal/FinceptInternalAdapter.cppnew file mode 100644index 000000000..a6986212e--- /dev/null+++ b/fincept-qt/src/services/prediction/fincept_internal/FinceptInternalAdapter.cpp@@ -0,0 +1,448 @@+#include "services/prediction/fincept_internal/FinceptInternalAdapter.h"++#include "core/logging/Logger.h"+#include "datahub/DataHub.h"+#include "datahub/TopicPolicy.h"+#include "storage/secure/SecureStorage.h"++#include <QDateTime>+#include <QNetworkAccessManager>+#include <QPointer>+#include <QTimer>+#include <QVector>++#include <atomic>++namespace fincept::services::prediction::fincept_internal {++namespace {++// SecureStorage keys.+constexpr const char* kKeyEndpoint = "fincept.markets_endpoint";+constexpr const char* kKeyMarketProgramId = "fincept.market_program_id";++// Hub topic prefix — mirrors `prediction:polymarket:*` and+// `prediction:kalshi:*` already in DATAHUB_TOPICS.md. The wildcard tail+// matches asset_ids and market_ids exactly the way the existing adapters+// do, so screens iterate the registry without special-casing.+constexpr const char* kTopicPrefixMarkets = "prediction:fincept:markets";+constexpr const char* kTopicPrefixOrderbook = "prediction:fincept:orderbook:";+constexpr const char* kTopicPrefixPrice = "prediction:fincept:price:";++// Curated demo dataset. The three example markets from plan §4.2 — used+// when `fincept.markets_endpoint` is unset so the MarketsTab is reviewable+// before the matching engine is deployed. Numbers are intentionally+// rounded — these are demo prices, not implied probabilities.+struct DemoMarketSeed {+ const char* market_id; ///< stable id, used as an asset_id suffix too+ const char* question;+ const char* category;+ double yes_price; ///< 0..1+ double volume;+ const char* end_date_iso;+};++constexpr DemoMarketSeed kDemoMarkets[] = {+ {"fincept-fed-cuts-2026-05",+ "Fed cuts in May 2026",+ "Macro", 0.62, 1'200'000.0, "2026-05-07"},+ {"fincept-nyc-80f-2026-05-01",+ "NYC max 80F+ on May 1",+ "Weather", 0.71, 83'000.0, "2026-05-01"},+ {"fincept-fncpt-1bp-2026-05-31",+ "$FNCPT > $0.0001 by month end",+ "Crypto", 0.45, 421'000.0, "2026-05-31"},+};++QString trim_trailing_slash(QString s) {+ while (s.endsWith('/')) s.chop(1);+ return s;+}++PredictionMarket build_demo_market(const DemoMarketSeed& seed) {+ PredictionMarket m;+ m.key.exchange_id = QStringLiteral("fincept");+ m.key.market_id = QString::fromLatin1(seed.market_id);+ m.key.event_id = m.key.market_id; // 1:1 for binary demo markets+ m.key.asset_ids = {+ m.key.market_id + QStringLiteral(":yes"),+ m.key.market_id + QStringLiteral(":no"),+ };+ m.question = QString::fromUtf8(seed.question);+ m.category = QString::fromUtf8(seed.category);+ m.end_date_iso = QString::fromLatin1(seed.end_date_iso);+ m.volume = seed.volume;+ m.liquidity = seed.volume * 0.05; // illustrative+ m.active = true;+ m.closed = false;++ Outcome yes;+ yes.name = QStringLiteral("Yes");+ yes.asset_id = m.key.asset_ids.value(0);+ yes.price = seed.yes_price;++ Outcome no;+ no.name = QStringLiteral("No");+ no.asset_id = m.key.asset_ids.value(1);+ no.price = 1.0 - seed.yes_price;++ m.outcomes = {yes, no};+ m.tags = {m.category};+ m.extras.insert(QStringLiteral("is_demo"), true);+ m.extras.insert(QStringLiteral("settlement_currency"), QStringLiteral("FNCPT"));+ return m;+}++} // namespace++FinceptInternalAdapter::FinceptInternalAdapter(QObject* parent)+ : PredictionExchangeAdapter(parent) {+ nam_ = new QNetworkAccessManager(this);+}++FinceptInternalAdapter::~FinceptInternalAdapter() = default;++// ── Identity ───────────────────────────────────────────────────────────────++QString FinceptInternalAdapter::id() const {+ return QStringLiteral("fincept");+}++QString FinceptInternalAdapter::display_name() const {+ return QStringLiteral("Fincept Internal");+}++ExchangeCapabilities FinceptInternalAdapter::capabilities() const {+ ExchangeCapabilities c;+ c.has_events = true;+ c.has_multi_outcome = false; // binary markets only at launch+ 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 = false;+ c.supports_fok = true;+ c.supports_fak = true;+ c.supports_decrease_order = false;+ c.supports_batch_orders = false;+ c.quote_currency = QStringLiteral("FNCPT");+ c.min_order_size = 1.0;+ c.default_tick_size = 0.01;+ c.max_requests_per_sec = 5;+ return c;+}++// ── Endpoint resolution ────────────────────────────────────────────────────++QString FinceptInternalAdapter::resolve_endpoint() const {+ auto r = SecureStorage::instance().retrieve(QString::fromLatin1(kKeyEndpoint));+ if (r.is_ok()) return trim_trailing_slash(r.value().trimmed());+ return {};+}++bool FinceptInternalAdapter::is_demo_mode() const {+ return resolve_endpoint().isEmpty();+}++// ── Read endpoints ─────────────────────────────────────────────────────────+//+// All read endpoints currently route through the demo emitters when the+// markets endpoint is unset. The HTTP path is left as a TODO seam: when+// the Fincept matching engine ships, swap the demo emit for a fetch+// against `<endpoint>/markets`, `<endpoint>/orderbook/<asset_id>`, etc.++void FinceptInternalAdapter::list_markets(const QString& /*category*/,+ const QString& /*sort_by*/,+ int /*limit*/, int /*offset*/) {+ if (is_demo_mode()) {+ emit_mock_markets();+ } else {+ // Real HTTP path lands when the matching engine ships. For now,+ // surface a clean error so the UI shows "service unavailable"+ // instead of hanging.+ emit_demo_unavailable(QStringLiteral("list_markets"));+ }+}++void FinceptInternalAdapter::list_events(const QString& /*category*/,+ const QString& /*sort_by*/,+ int /*limit*/, int /*offset*/) {+ if (is_demo_mode()) {+ emit_mock_events();+ } else {+ emit_demo_unavailable(QStringLiteral("list_events"));+ }+}++void FinceptInternalAdapter::search(const QString& query, int /*limit*/) {+ if (is_demo_mode()) {+ // Filter the curated dataset client-side. Cheap and good enough+ // for demo mode.+ QVector<PredictionMarket> hits;+ for (const auto& seed : kDemoMarkets) {+ const auto question = QString::fromUtf8(seed.question);+ if (query.isEmpty() ||+ question.contains(query, Qt::CaseInsensitive)) {+ hits.push_back(build_demo_market(seed));+ }+ }+ QPointer<FinceptInternalAdapter> self = this;+ QTimer::singleShot(0, this, [self, hits]() {+ if (!self) return;+ emit self->search_results_ready(hits, {});+ });+ return;+ }+ emit_demo_unavailable(QStringLiteral("search"));+}++void FinceptInternalAdapter::list_tags() {+ if (is_demo_mode()) {+ QPointer<FinceptInternalAdapter> self = this;+ QTimer::singleShot(0, this, [self]() {+ if (!self) return;+ emit self->tags_ready(QStringList{+ QStringLiteral("Macro"),+ QStringLiteral("Weather"),+ QStringLiteral("Crypto"),+ });+ });+ return;+ }+ emit_demo_unavailable(QStringLiteral("list_tags"));+}++void FinceptInternalAdapter::fetch_market(const MarketKey& key) {+ if (is_demo_mode()) {+ for (const auto& seed : kDemoMarkets) {+ if (key.market_id == QString::fromLatin1(seed.market_id)) {+ auto m = build_demo_market(seed);+ QPointer<FinceptInternalAdapter> self = this;+ QTimer::singleShot(0, this, [self, m]() {+ if (!self) return;+ emit self->market_detail_ready(m);+ });+ return;+ }+ }+ }+ emit_demo_unavailable(QStringLiteral("fetch_market"));+}++void FinceptInternalAdapter::fetch_event(const MarketKey& key) {+ fetch_market(key); // 1:1 in demo binary markets+}++void FinceptInternalAdapter::fetch_order_book(const QString& asset_id) {+ if (is_demo_mode()) {+ // A flat shallow book centred on each demo asset's price. Replace+ // with a real orderbook fetch when the matching engine ships.+ PredictionOrderBook book;+ book.asset_id = asset_id;+ for (const auto& seed : kDemoMarkets) {+ const auto yes_id = QString::fromLatin1(seed.market_id) ++ QStringLiteral(":yes");+ if (asset_id == yes_id) {+ const double mid = seed.yes_price;+ book.bids = {+ {mid - 0.01, 250.0},+ {mid - 0.02, 500.0},+ {mid - 0.05, 1'200.0},+ };+ book.asks = {+ {mid + 0.01, 250.0},+ {mid + 0.02, 500.0},+ {mid + 0.05, 1'200.0},+ };+ break;+ }+ }+ QPointer<FinceptInternalAdapter> self = this;+ QTimer::singleShot(0, this, [self, book]() {+ if (!self) return;+ emit self->order_book_ready(book);+ });+ return;+ }+ emit_demo_unavailable(QStringLiteral("fetch_order_book"));+}++void FinceptInternalAdapter::fetch_price_history(const QString& /*asset_id*/,+ const QString& /*interval*/,+ int /*fidelity*/) {+ if (is_demo_mode()) {+ emit_demo_unavailable(QStringLiteral("fetch_price_history (demo)"));+ return;+ }+ emit_demo_unavailable(QStringLiteral("fetch_price_history"));+}++void FinceptInternalAdapter::fetch_recent_trades(const MarketKey& /*key*/, int /*limit*/) {+ QPointer<FinceptInternalAdapter> self = this;+ QTimer::singleShot(0, this, [self]() {+ if (!self) return;+ emit self->recent_trades_ready({});+ });+}++// ── Real-time ──────────────────────────────────────────────────────────────++void FinceptInternalAdapter::subscribe_market(const QStringList& /*asset_ids*/) {+ // No-op in demo mode. Real path: open a WS to <endpoint>/ws and forward+ // ws_price_updated / ws_orderbook_updated when the engine ships.+}++void FinceptInternalAdapter::unsubscribe_market(const QStringList& /*asset_ids*/) {+ // No-op in demo mode.+}++bool FinceptInternalAdapter::is_ws_connected() const {+ // Demo mode is never "connected" — screens use this to choose a+ // disabled state for live-stream-only widgets.+ return false;+}++// ── Trading ────────────────────────────────────────────────────────────────+//+// Trading is gated behind both `has_credentials()` and the existence of+// the on-chain `fincept_market` program. Until either lands, all trading+// methods emit `error_occurred("not deployed", …)` so the order ticket+// can stay disabled with a clear message.++bool FinceptInternalAdapter::has_credentials() const {+ auto r = SecureStorage::instance().retrieve(+ QString::fromLatin1(kKeyMarketProgramId));+ return r.is_ok() && !r.value().trimmed().isEmpty();+}++QString FinceptInternalAdapter::account_label() const {+ return QStringLiteral("(connect wallet)");+}++void FinceptInternalAdapter::fetch_balance() { emit_demo_unavailable(QStringLiteral("fetch_balance")); }+void FinceptInternalAdapter::fetch_positions() { emit_demo_unavailable(QStringLiteral("fetch_positions")); }+void FinceptInternalAdapter::fetch_open_orders() { emit_demo_unavailable(QStringLiteral("fetch_open_orders")); }+void FinceptInternalAdapter::fetch_user_activity(int) { emit_demo_unavailable(QStringLiteral("fetch_user_activity")); }++void FinceptInternalAdapter::place_order(const OrderRequest& /*req*/) {+ emit_demo_unavailable(QStringLiteral("place_order"));+}++void FinceptInternalAdapter::cancel_order(const QString& order_id) {+ emit error_occurred(QStringLiteral("cancel_order"),+ QStringLiteral("fincept_market program not deployed"));+ emit order_cancelled(order_id, /*ok=*/false,+ QStringLiteral("fincept_market program not deployed"));+}++void FinceptInternalAdapter::cancel_all_for_market(const MarketKey& /*key*/,+ const QString& /*asset_id*/) {+ emit_demo_unavailable(QStringLiteral("cancel_all_for_market"));+}++// ── Hub ────────────────────────────────────────────────────────────────────++void FinceptInternalAdapter::ensure_registered_with_hub() {+ if (hub_registered_) return;+ hub_registered_ = true;++ // No producer to register yet — until the matching engine is up,+ // the adapter doesn't own any topic family that's ready to publish.+ // Reserve the topic policies anyway so subscribers in screens see a+ // policy when they peek (TTL applied to mock publishes once we have+ // a producer for them).+ auto& hub = fincept::datahub::DataHub::instance();+ fincept::datahub::TopicPolicy markets_p;+ markets_p.ttl_ms = 30 * 1000;+ markets_p.min_interval_ms = 10 * 1000;+ hub.set_policy_pattern(QString::fromLatin1(kTopicPrefixMarkets), markets_p);++ fincept::datahub::TopicPolicy book_p;+ book_p.ttl_ms = 5 * 1000;+ book_p.min_interval_ms = 1 * 1000;+ hub.set_policy_pattern(QString::fromLatin1(kTopicPrefixOrderbook) ++ QStringLiteral("*"), book_p);++ fincept::datahub::TopicPolicy price_p;+ price_p.ttl_ms = 5 * 1000;+ price_p.min_interval_ms = 1 * 1000;+ hub.set_policy_pattern(QString::fromLatin1(kTopicPrefixPrice) ++ QStringLiteral("*"), price_p);++ static std::atomic<bool> logged{false};+ if (!logged.exchange(true)) {+ if (is_demo_mode()) {+ LOG_INFO("FinceptInternalAdapter",+ "registered (demo mode — no fincept.markets_endpoint configured)");+ } else {+ LOG_INFO("FinceptInternalAdapter",+ QString("registered (endpoint=%1)").arg(resolve_endpoint()));+ }+ }+}++// ── Mock emitters ──────────────────────────────────────────────────────────++void FinceptInternalAdapter::emit_mock_markets() {+ QVector<PredictionMarket> markets;+ markets.reserve(static_cast<int>(std::size(kDemoMarkets)));+ for (const auto& seed : kDemoMarkets) {+ markets.push_back(build_demo_market(seed));+ }+ QPointer<FinceptInternalAdapter> self = this;+ QTimer::singleShot(0, this, [self, markets]() {+ if (!self) return;+ emit self->markets_ready(markets);+ });+}++void FinceptInternalAdapter::emit_mock_events() {+ QVector<PredictionEvent> events;+ events.reserve(static_cast<int>(std::size(kDemoMarkets)));+ for (const auto& seed : kDemoMarkets) {+ PredictionEvent e;+ e.key.exchange_id = QStringLiteral("fincept");+ e.key.event_id = QString::fromLatin1(seed.market_id);+ e.title = QString::fromUtf8(seed.question);+ e.category = QString::fromUtf8(seed.category);+ e.volume = seed.volume;+ e.active = true;+ e.markets = {build_demo_market(seed)};+ e.tags = {e.category};+ e.extras.insert(QStringLiteral("is_demo"), true);+ events.push_back(e);+ }+ QPointer<FinceptInternalAdapter> self = this;+ QTimer::singleShot(0, this, [self, events]() {+ if (!self) return;+ emit self->events_ready(events);+ });+}++void FinceptInternalAdapter::emit_mock_tags() {+ QPointer<FinceptInternalAdapter> self = this;+ QTimer::singleShot(0, this, [self]() {+ if (!self) return;+ emit self->tags_ready(QStringList{+ QStringLiteral("Macro"),+ QStringLiteral("Weather"),+ QStringLiteral("Crypto"),+ });+ });+}++void FinceptInternalAdapter::emit_demo_unavailable(const QString& context) {+ QPointer<FinceptInternalAdapter> self = this;+ const auto msg = QStringLiteral(+ "Fincept Internal markets are in demo mode — set "+ "`fincept.markets_endpoint` in SecureStorage to enable live data.");+ QTimer::singleShot(0, this, [self, context, msg]() {+ if (!self) return;+ emit self->error_occurred(context, msg);+ });+}++} // namespace fincept::services::prediction::fincept_internaldiff --git a/fincept-qt/src/services/prediction/fincept_internal/FinceptInternalAdapter.h b/fincept-qt/src/services/prediction/fincept_internal/FinceptInternalAdapter.hnew file mode 100644index 000000000..3139df20f--- /dev/null+++ b/fincept-qt/src/services/prediction/fincept_internal/FinceptInternalAdapter.h@@ -0,0 +1,100 @@+#pragma once++#include "services/prediction/PredictionExchangeAdapter.h"++#include <QString>+#include <QStringList>++class QNetworkAccessManager;++namespace fincept::services::prediction::fincept_internal {++/// Internal Fincept prediction-market exchange adapter (Phase 4).+///+/// Joins `PolymarketAdapter` and `KalshiAdapter` as a third member of+/// `PredictionExchangeRegistry`. The exchange is operated by Fincept and+/// settles in $FNCPT — see `plans/crypto-center-future-phases.md` §4.+///+/// **Endpoint resolution:** the adapter reads `fincept.markets_endpoint`+/// from `SecureStorage`. Examples: `https://markets.fincept.in/api/v1`,+/// `wss://markets.fincept.in/ws`. When unset, the adapter operates in+/// **demo mode** — every read method emits a curated mock dataset (the+/// three example markets from plan §4.2: "Fed cuts in May 2026",+/// "NYC max 80F+ on May 1", "$FNCPT > $0.0001 by month end") and every+/// authenticated method emits an `error_occurred("not deployed", …)`+/// signal so screens can surface a "service unavailable" banner.+///+/// **On-chain dependency.** Real settlement requires the `fincept_market`+/// Anchor program (`solana/programs/fincept_market/`) which lives in a+/// separate repo and isn't deployed yet. Per CLAUDE.md, no Rust source+/// in this tree. The adapter is forward-compatible: when the program ID+/// is configured (`fincept.market_program_id`), `place_order` and the+/// resolution flows can be wired up without touching the screen layer.+///+/// **Hub topics:** when the endpoint is configured, the adapter publishes+/// to `prediction:fincept:*` topics following the same family pattern+/// Polymarket / Kalshi already use. In demo mode, no topics are published+/// — screens read from the adapter's Qt signals directly.+class FinceptInternalAdapter : public PredictionExchangeAdapter {+ Q_OBJECT+ public:+ explicit FinceptInternalAdapter(QObject* parent = nullptr);+ ~FinceptInternalAdapter() override;++ // ── Identity ─────────────────────────────────────────────────────────+ QString id() const override;+ QString display_name() const override;+ 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 MarketKey& key) override;+ void fetch_event(const 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 MarketKey& key, int limit) override;++ // ── Real-time ────────────────────────────────────────────────────────+ void subscribe_market(const QStringList& asset_ids) override;+ void unsubscribe_market(const QStringList& asset_ids) override;+ bool is_ws_connected() const override;++ // ── Trading (auth-gated) ─────────────────────────────────────────────+ 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 OrderRequest& req) override;+ void cancel_order(const QString& order_id) override;+ void cancel_all_for_market(const MarketKey& key, const QString& asset_id) override;++ // ── Hub ──────────────────────────────────────────────────────────────+ void ensure_registered_with_hub() override;++ /// True iff `fincept.markets_endpoint` is configured. Screens can use+ /// this to surface a "service in demo mode" banner when the endpoint+ /// is missing — distinct from `has_credentials()` which gates trading.+ bool is_demo_mode() const;++ private:+ /// Resolve the endpoint from SecureStorage. Empty string → demo mode.+ QString resolve_endpoint() const;++ /// Mock-mode emitters — emit the curated dataset described in plan §4.2.+ /// All three return synchronously via QTimer::singleShot(0) so signal+ /// handlers see the same async semantics as the real path.+ void emit_mock_markets();+ void emit_mock_events();+ void emit_mock_tags();+ void emit_demo_unavailable(const QString& context);++ QNetworkAccessManager* nam_ = nullptr;+ bool hub_registered_ = false;+};++} // namespace fincept::services::prediction::fincept_internaldiff --git a/fincept-qt/src/services/wallet/BuybackBurnService.cpp b/fincept-qt/src/services/wallet/BuybackBurnService.cppnew file mode 100644index 000000000..12d8065ba--- /dev/null+++ b/fincept-qt/src/services/wallet/BuybackBurnService.cpp@@ -0,0 +1,279 @@+#include "services/wallet/BuybackBurnService.h"++#include "core/logging/Logger.h"+#include "datahub/DataHub.h"+#include "storage/secure/SecureStorage.h"++#include <QDateTime>+#include <QJsonArray>+#include <QJsonDocument>+#include <QJsonObject>+#include <QNetworkAccessManager>+#include <QNetworkReply>+#include <QNetworkRequest>+#include <QPointer>+#include <QUrl>+#include <QVariant>++#include <atomic>++namespace fincept::wallet {++namespace {++// Topic constants — terminal-wide (no <pubkey> segment).+constexpr const char* kTopicBuybackEpoch = "treasury:buyback_epoch";+constexpr const char* kTopicBurnTotal = "treasury:burn_total";+constexpr const char* kTopicSupplyHistory = "treasury:supply_history";++// SecureStorage keys — endpoint is shared across treasury producers.+constexpr const char* kKeyEndpoint = "fincept.treasury_endpoint";++QString trim_trailing_slash(QString s) {+ while (s.endsWith('/')) s.chop(1);+ return s;+}++} // namespace++BuybackBurnService::BuybackBurnService(QObject* parent) : QObject(parent) {+ nam_ = new QNetworkAccessManager(this);+}++BuybackBurnService::~BuybackBurnService() = default;++QStringList BuybackBurnService::topic_patterns() const {+ return QStringList{+ QString::fromLatin1(kTopicBuybackEpoch),+ QString::fromLatin1(kTopicBurnTotal),+ QString::fromLatin1(kTopicSupplyHistory),+ };+}++QString BuybackBurnService::resolve_endpoint() const {+ auto r = SecureStorage::instance().retrieve(QString::fromLatin1(kKeyEndpoint));+ if (r.is_ok()) return trim_trailing_slash(r.value().trimmed());+ return {};+}++void BuybackBurnService::refresh(const QStringList& topics) {+ const auto endpoint = resolve_endpoint();+ const bool mock = endpoint.isEmpty();+ if (mock) {+ // Log once per process — refresh fires every 30 s in mock mode and+ // we don't want 2 INFO lines/min indefinitely while the worker is+ // un-deployed. Subsequent refreshes use LOG_DEBUG.+ static std::atomic<bool> once{false};+ if (!once.exchange(true)) {+ LOG_INFO("BuybackBurn",+ "no fincept.treasury_endpoint configured — serving mock data");+ } else {+ LOG_DEBUG("BuybackBurn", "mock-mode refresh");+ }+ }+ for (const auto& topic : topics) {+ if (topic == QLatin1String(kTopicBuybackEpoch)) {+ mock ? publish_mock_buyback_epoch() : refresh_buyback_epoch(endpoint);+ } else if (topic == QLatin1String(kTopicBurnTotal)) {+ mock ? publish_mock_burn_total() : refresh_burn_total(endpoint);+ } else if (topic == QLatin1String(kTopicSupplyHistory)) {+ mock ? publish_mock_supply_history() : refresh_supply_history(endpoint);+ }+ // Unknown topic — silently ignore. The hub only routes patterns+ // we registered for, so this branch is defensive.+ }+}++// ── HTTP fetch paths ───────────────────────────────────────────────────────++void BuybackBurnService::refresh_buyback_epoch(const QString& endpoint) {+ QNetworkRequest req(QUrl(endpoint + QStringLiteral("/buyback/current")));+ req.setHeader(QNetworkRequest::UserAgentHeader,+ QStringLiteral("FinceptTerminal/BuybackBurnService"));++ auto* reply = nam_->get(req);+ QPointer<BuybackBurnService> self = this;+ QObject::connect(reply, &QNetworkReply::finished, this, [self, reply]() {+ reply->deleteLater();+ if (!self) return;+ auto& hub = fincept::datahub::DataHub::instance();+ if (reply->error() != QNetworkReply::NoError) {+ hub.publish_error(QString::fromLatin1(kTopicBuybackEpoch),+ reply->errorString());+ return;+ }+ const auto doc = QJsonDocument::fromJson(reply->readAll());+ if (!doc.isObject()) {+ hub.publish_error(QString::fromLatin1(kTopicBuybackEpoch),+ QStringLiteral("malformed JSON"));+ return;+ }+ const auto j = doc.object();++ BuybackEpoch e;+ e.epoch_no = j.value(QStringLiteral("epoch_no")).toInt();+ e.start_ts_ms = static_cast<qint64>(+ j.value(QStringLiteral("start_ts_ms")).toDouble());+ e.end_ts_ms = static_cast<qint64>(+ j.value(QStringLiteral("end_ts_ms")).toDouble());+ e.revenue_total_usd = j.value(QStringLiteral("revenue_total_usd")).toDouble();+ e.revenue_subs_usd = j.value(QStringLiteral("revenue_subs_usd")).toDouble();+ e.revenue_predmkt_usd = j.value(QStringLiteral("revenue_predmkt_usd")).toDouble();+ e.revenue_misc_usd = j.value(QStringLiteral("revenue_misc_usd")).toDouble();+ e.buyback_usd = j.value(QStringLiteral("buyback_usd")).toDouble();+ e.staker_yield_usd = j.value(QStringLiteral("staker_yield_usd")).toDouble();+ e.treasury_topup_usd = j.value(QStringLiteral("treasury_topup_usd")).toDouble();+ e.fncpt_bought_raw = j.value(QStringLiteral("fncpt_bought_raw")).toString();+ e.fncpt_burned_raw = j.value(QStringLiteral("fncpt_burned_raw")).toString();+ e.fncpt_decimals = j.value(QStringLiteral("fncpt_decimals")).toInt(6);+ e.avg_buy_price_usd = j.value(QStringLiteral("avg_buy_price_usd")).toDouble();+ e.burn_signature = j.value(QStringLiteral("burn_signature")).toString();+ e.ts_ms = QDateTime::currentMSecsSinceEpoch();+ e.is_mock = false;+ hub.publish(QString::fromLatin1(kTopicBuybackEpoch), QVariant::fromValue(e));+ });+}++void BuybackBurnService::refresh_burn_total(const QString& endpoint) {+ QNetworkRequest req(QUrl(endpoint + QStringLiteral("/burn/total")));+ auto* reply = nam_->get(req);+ QPointer<BuybackBurnService> self = this;+ QObject::connect(reply, &QNetworkReply::finished, this, [self, reply]() {+ reply->deleteLater();+ if (!self) return;+ auto& hub = fincept::datahub::DataHub::instance();+ if (reply->error() != QNetworkReply::NoError) {+ hub.publish_error(QString::fromLatin1(kTopicBurnTotal),+ reply->errorString());+ return;+ }+ const auto doc = QJsonDocument::fromJson(reply->readAll());+ if (!doc.isObject()) {+ hub.publish_error(QString::fromLatin1(kTopicBurnTotal),+ QStringLiteral("malformed JSON"));+ return;+ }+ const auto j = doc.object();++ BurnTotal t;+ t.total_burned_raw = j.value(QStringLiteral("total_burned_raw")).toString();+ t.supply_remaining_raw = j.value(QStringLiteral("supply_remaining_raw")).toString();+ t.decimals = j.value(QStringLiteral("decimals")).toInt(6);+ t.spent_on_buyback_usd = j.value(QStringLiteral("spent_on_buyback_usd")).toDouble();+ t.ts_ms = QDateTime::currentMSecsSinceEpoch();+ t.is_mock = false;+ hub.publish(QString::fromLatin1(kTopicBurnTotal), QVariant::fromValue(t));+ });+}++void BuybackBurnService::refresh_supply_history(const QString& endpoint) {+ QNetworkRequest req(QUrl(endpoint + QStringLiteral("/supply/history")));+ auto* reply = nam_->get(req);+ QPointer<BuybackBurnService> self = this;+ QObject::connect(reply, &QNetworkReply::finished, this, [self, reply]() {+ reply->deleteLater();+ if (!self) return;+ auto& hub = fincept::datahub::DataHub::instance();+ if (reply->error() != QNetworkReply::NoError) {+ hub.publish_error(QString::fromLatin1(kTopicSupplyHistory),+ reply->errorString());+ return;+ }+ const auto doc = QJsonDocument::fromJson(reply->readAll());+ if (!doc.isObject()) {+ hub.publish_error(QString::fromLatin1(kTopicSupplyHistory),+ QStringLiteral("malformed JSON"));+ return;+ }+ // Expected shape: { "points": [ { ts_ms, total_raw, circulating_raw, burned_raw, decimals }, ... ] }+ const auto arr = doc.object().value(QStringLiteral("points")).toArray();+ QVector<SupplyHistoryPoint> points;+ points.reserve(arr.size());+ for (const auto& v : arr) {+ const auto p = v.toObject();+ SupplyHistoryPoint sp;+ sp.ts_ms = static_cast<qint64>(p.value(QStringLiteral("ts_ms")).toDouble());+ sp.total_raw = p.value(QStringLiteral("total_raw")).toString();+ sp.circulating_raw = p.value(QStringLiteral("circulating_raw")).toString();+ sp.burned_raw = p.value(QStringLiteral("burned_raw")).toString();+ sp.decimals = p.value(QStringLiteral("decimals")).toInt(6);+ points.push_back(sp);+ }+ hub.publish(QString::fromLatin1(kTopicSupplyHistory),+ QVariant::fromValue(points));+ });+}++// ── Mock paths (used when no endpoint is configured) ───────────────────────+//+// Numbers below are illustrative — chosen to make the dashboard look+// plausible in screenshots and demos. They should NEVER be presented as+// real data: every payload sets `is_mock=true` and the UI surfaces the+// state explicitly.++void BuybackBurnService::publish_mock_buyback_epoch() {+ BuybackEpoch e;+ e.epoch_no = 47;+ const auto now = QDateTime::currentMSecsSinceEpoch();+ constexpr qint64 kWeekMs = 7LL * 24 * 60 * 60 * 1000;+ e.start_ts_ms = now - kWeekMs;+ e.end_ts_ms = now;+ e.revenue_total_usd = 42'310.0;+ e.revenue_subs_usd = 32'150.0;+ e.revenue_predmkt_usd = 8'120.0;+ e.revenue_misc_usd = 2'040.0;+ // 50/25/25 split per plan §5.4 — keeps the demo numbers internally+ // consistent: 21,155 + 10,577.50 + 10,577.50 ≈ 42,310 (rounded).+ e.buyback_usd = 21'155.0;+ e.staker_yield_usd = 10'577.5;+ e.treasury_topup_usd = 10'577.5;+ e.fncpt_bought_raw = QStringLiteral("82400000000000"); // 82.4M @ 6 decimals+ e.fncpt_burned_raw = QStringLiteral("82400000000000");+ e.fncpt_decimals = 6;+ e.avg_buy_price_usd = 0.000257;+ e.burn_signature = QStringLiteral("5kj3wMockBurnSignaturePlaceholderXXXXXXXXXXX");+ e.ts_ms = now;+ e.is_mock = true;+ fincept::datahub::DataHub::instance().publish(+ QString::fromLatin1(kTopicBuybackEpoch), QVariant::fromValue(e));+}++void BuybackBurnService::publish_mock_burn_total() {+ BurnTotal t;+ t.total_burned_raw = QStringLiteral("1420000000000000"); // 1.42 B+ t.supply_remaining_raw = QStringLiteral("8580000000000000"); // 8.58 B+ t.decimals = 6;+ t.spent_on_buyback_usd = 384'201.0;+ t.ts_ms = QDateTime::currentMSecsSinceEpoch();+ t.is_mock = true;+ fincept::datahub::DataHub::instance().publish(+ QString::fromLatin1(kTopicBurnTotal), QVariant::fromValue(t));+}++void BuybackBurnService::publish_mock_supply_history() {+ // 12 monthly samples, ending now. Burn grows roughly linearly; circulating+ // shrinks accordingly. Total stays flat (10B). Numbers are deliberately+ // smooth so the chart doesn't lie about precision in mock mode.+ QVector<SupplyHistoryPoint> points;+ constexpr qint64 kMonthMs = 30LL * 24 * 60 * 60 * 1000;+ const auto now = QDateTime::currentMSecsSinceEpoch();+ constexpr qint64 kTotal = 10'000'000'000'000'000LL; // 10 B @ 6 decimals+ constexpr qint64 kStartBurn = 200'000'000'000'000LL; // 200 M start+ constexpr qint64 kEndBurn = 1'420'000'000'000'000LL; // 1.42 B end+ for (int i = 11; i >= 0; --i) {+ SupplyHistoryPoint sp;+ sp.ts_ms = now - (i * kMonthMs);+ const double t = static_cast<double>(11 - i) / 11.0; // 0..1+ const qint64 burned = kStartBurn ++ static_cast<qint64>((kEndBurn - kStartBurn) * t);+ sp.total_raw = QString::number(kTotal);+ sp.burned_raw = QString::number(burned);+ sp.circulating_raw = QString::number(kTotal - burned);+ sp.decimals = 6;+ points.push_back(sp);+ }+ fincept::datahub::DataHub::instance().publish(+ QString::fromLatin1(kTopicSupplyHistory), QVariant::fromValue(points));+}++} // namespace fincept::walletdiff --git a/fincept-qt/src/services/wallet/BuybackBurnService.h b/fincept-qt/src/services/wallet/BuybackBurnService.hnew file mode 100644index 000000000..f36a5a88e--- /dev/null+++ b/fincept-qt/src/services/wallet/BuybackBurnService.h@@ -0,0 +1,65 @@+#pragma once++#include "datahub/Producer.h"+#include "services/wallet/WalletTypes.h"++#include <QObject>+#include <QString>++class QNetworkAccessManager;++namespace fincept::wallet {++/// Producer for the terminal-wide buyback & burn dashboard topics+/// (Phase 5 §5.3):+///+/// - `treasury:buyback_epoch` → `BuybackEpoch` (TTL 60 s)+/// - `treasury:burn_total` → `BurnTotal` (TTL 5 min)+/// - `treasury:supply_history` → `QVector<SupplyHistoryPoint>` (TTL 1 h)+///+/// **No on-chain code.** The Fincept-operated buyback worker+/// (`services/buyback-worker/`) tallies revenue, executes Jupiter buys,+/// burns the bought $FNCPT via SPL Token `burn_checked` from the treasury+/// account, then publishes per-epoch summaries to a Fincept HTTP endpoint+/// configured via SecureStorage `fincept.treasury_endpoint`.+///+/// **Mock mode.** When `fincept.treasury_endpoint` is unset, the service+/// publishes a built-in mock payload (flagged via `is_mock=true` on every+/// POD) so the dashboard renders before the worker is deployed. This is+/// the explicit "demo before infra" path called out in the Phase 5 plan.+class BuybackBurnService : public QObject, public fincept::datahub::Producer {+ Q_OBJECT+ public:+ explicit BuybackBurnService(QObject* parent = nullptr);+ ~BuybackBurnService() override;++ QStringList topic_patterns() const override;+ void refresh(const QStringList& topics) override;++ /// Treasury endpoint dispatches three round-trips per refresh — each+ /// topic family in the pattern list. Cap at 3/s so a flurry of+ /// re-subscribes doesn't hammer.+ int max_requests_per_sec() const override { return 3; }++ private:+ /// Resolve the configured Fincept treasury endpoint, or empty string.+ /// When empty, the service uses `publish_mock_*` paths instead of HTTP.+ QString resolve_endpoint() const;++ /// Per-topic-family fetch handlers. Each builds a GET against+ /// `<endpoint>/<path>`, parses the JSON response, and calls+ /// `DataHub::publish` (or `publish_error` on failure).+ void refresh_buyback_epoch(const QString& endpoint);+ void refresh_burn_total(const QString& endpoint);+ void refresh_supply_history(const QString& endpoint);++ /// Mock-mode publishers — used when the endpoint isn't configured.+ /// All payloads carry `is_mock=true` so the UI can show a chip.+ void publish_mock_buyback_epoch();+ void publish_mock_burn_total();+ void publish_mock_supply_history();++ QNetworkAccessManager* nam_ = nullptr;+};++} // namespace fincept::walletdiff --git a/fincept-qt/src/services/wallet/RealYieldService.cpp b/fincept-qt/src/services/wallet/RealYieldService.cppnew file mode 100644index 000000000..f70edef5a--- /dev/null+++ b/fincept-qt/src/services/wallet/RealYieldService.cpp@@ -0,0 +1,197 @@+#include "services/wallet/RealYieldService.h"++#include "core/logging/Logger.h"+#include "datahub/DataHub.h"+#include "storage/secure/SecureStorage.h"++#include <QDateTime>+#include <QJsonDocument>+#include <QJsonObject>+#include <QNetworkAccessManager>+#include <QNetworkReply>+#include <QNetworkRequest>+#include <QPointer>+#include <QUrl>+#include <QVariant>++#include <atomic>++namespace fincept::wallet {++namespace {++constexpr const char* kYieldFamily = "wallet:yield:";+constexpr const char* kTopicRevenue = "treasury:revenue";++// Symbol names suffixed with _yield to avoid unity-build collisions with the+// matching constants/helper in BuybackBurnService.cpp's anonymous namespace.+constexpr const char* kKeyEndpoint_yield = "fincept.yield_endpoint";++constexpr qint64 kWeekMs = 7LL * 24 * 60 * 60 * 1000;++QString trim_trailing_slash_yield(QString s) {+ while (s.endsWith('/')) s.chop(1);+ return s;+}++} // namespace++RealYieldService& RealYieldService::instance() {+ static RealYieldService inst;+ return inst;+}++RealYieldService::RealYieldService(QObject* parent) : QObject(parent) {+ nam_ = new QNetworkAccessManager(this);+}++RealYieldService::~RealYieldService() = default;++QStringList RealYieldService::topic_patterns() const {+ return QStringList{+ QStringLiteral("wallet:yield:*"),+ QString::fromLatin1(kTopicRevenue),+ };+}++QString RealYieldService::resolve_endpoint() const {+ auto r = SecureStorage::instance().retrieve(QString::fromLatin1(kKeyEndpoint_yield));+ if (r.is_ok()) return trim_trailing_slash_yield(r.value().trimmed());+ return {};+}++QString RealYieldService::pubkey_from_yield_topic(const QString& topic) {+ return topic.mid(static_cast<int>(qstrlen(kYieldFamily)));+}++void RealYieldService::refresh(const QStringList& topics) {+ const auto endpoint = resolve_endpoint();+ const bool mock = endpoint.isEmpty();+ if (mock) {+ static std::atomic<bool> once{false};+ if (!once.exchange(true)) {+ LOG_INFO("RealYield",+ "no fincept.yield_endpoint configured — serving mock yield");+ } else {+ LOG_DEBUG("RealYield", "mock-mode refresh");+ }+ }++ for (const auto& topic : topics) {+ if (topic.startsWith(QLatin1String(kYieldFamily))) {+ const auto pk = pubkey_from_yield_topic(topic);+ if (pk.isEmpty()) continue;+ mock ? publish_mock_yield(topic, pk)+ : refresh_yield_real(endpoint, topic, pk);+ } else if (topic == QLatin1String(kTopicRevenue)) {+ mock ? publish_mock_revenue() : refresh_revenue_real(endpoint);+ }+ }+}++// ── Real fetch paths ───────────────────────────────────────────────────────++void RealYieldService::refresh_yield_real(const QString& endpoint,+ const QString& topic,+ const QString& pubkey) {+ QNetworkRequest req(QUrl(endpoint + QStringLiteral("/yield/") + pubkey));+ req.setHeader(QNetworkRequest::UserAgentHeader,+ QStringLiteral("FinceptTerminal/RealYieldService"));+ auto* reply = nam_->get(req);+ QPointer<RealYieldService> self = this;+ QObject::connect(reply, &QNetworkReply::finished, this,+ [self, reply, topic, pubkey]() {+ reply->deleteLater();+ if (!self) return;+ auto& hub = fincept::datahub::DataHub::instance();+ if (reply->error() != QNetworkReply::NoError) {+ hub.publish_error(topic, reply->errorString());+ return;+ }+ const auto doc = QJsonDocument::fromJson(reply->readAll());+ if (!doc.isObject()) {+ hub.publish_error(topic, QStringLiteral("malformed JSON"));+ return;+ }+ const auto j = doc.object();+ YieldSnapshot s;+ s.pubkey_b58 = pubkey;+ s.lifetime_usdc = j.value(QStringLiteral("lifetime_usdc")).toDouble();+ s.last_period_usdc = j.value(QStringLiteral("last_period_usdc")).toDouble();+ s.last_period_end_ts = static_cast<qint64>(+ j.value(QStringLiteral("last_period_end_ts")).toDouble());+ s.ts_ms = QDateTime::currentMSecsSinceEpoch();+ s.is_mock = false;+ hub.publish(topic, QVariant::fromValue(s));+ });+}++void RealYieldService::refresh_revenue_real(const QString& endpoint) {+ QNetworkRequest req(QUrl(endpoint + QStringLiteral("/revenue/current")));+ req.setHeader(QNetworkRequest::UserAgentHeader,+ QStringLiteral("FinceptTerminal/RealYieldService"));+ auto* reply = nam_->get(req);+ QPointer<RealYieldService> self = this;+ QObject::connect(reply, &QNetworkReply::finished, this,+ [self, reply]() {+ reply->deleteLater();+ if (!self) return;+ auto& hub = fincept::datahub::DataHub::instance();+ if (reply->error() != QNetworkReply::NoError) {+ hub.publish_error(QString::fromLatin1(kTopicRevenue), reply->errorString());+ return;+ }+ const auto doc = QJsonDocument::fromJson(reply->readAll());+ if (!doc.isObject()) {+ hub.publish_error(QString::fromLatin1(kTopicRevenue),+ QStringLiteral("malformed JSON"));+ return;+ }+ const auto j = doc.object();+ TreasuryRevenue r;+ r.period_start_ts = static_cast<qint64>(+ j.value(QStringLiteral("period_start_ts")).toDouble());+ r.period_end_ts = static_cast<qint64>(+ j.value(QStringLiteral("period_end_ts")).toDouble());+ r.total_usd = j.value(QStringLiteral("total_usd")).toDouble();+ r.ts_ms = QDateTime::currentMSecsSinceEpoch();+ r.is_mock = false;+ hub.publish(QString::fromLatin1(kTopicRevenue), QVariant::fromValue(r));+ });+}++// ── Mock paths ─────────────────────────────────────────────────────────────+//+// Numbers chosen for internal consistency with the Phase 5 mock buyback+// epoch ($42,310 weekly revenue, 25 % staker share = $10,577.50 distributed).+// The single "demo wallet" is assumed to own 100 % of veFNCPT weight, so+// `lifetime_usdc` matches the sum of `LockPosition.lifetime_yield_usdc`+// from the StakingService mock (1,240 + 42 + 14 = 1,296). `last_period_usdc`+// matches the 1-yr position's most recent share — a tractable demo number.++void RealYieldService::publish_mock_yield(const QString& topic, const QString& pubkey) {+ YieldSnapshot s;+ s.pubkey_b58 = pubkey;+ s.lifetime_usdc = 1'296.0; // sum of mock LockPosition.lifetime_yield_usdc+ s.last_period_usdc = 42.0;+ const qint64 now = QDateTime::currentMSecsSinceEpoch();+ // Most recent epoch ended now; aligns with the buyback mock's end_ts.+ s.last_period_end_ts = now;+ s.ts_ms = now;+ s.is_mock = true;+ fincept::datahub::DataHub::instance().publish(topic, QVariant::fromValue(s));+}++void RealYieldService::publish_mock_revenue() {+ TreasuryRevenue r;+ const qint64 now = QDateTime::currentMSecsSinceEpoch();+ r.period_start_ts = now - kWeekMs;+ r.period_end_ts = now;+ r.total_usd = 42'310.0; // matches Phase 5 mock buyback epoch+ r.ts_ms = now;+ r.is_mock = true;+ fincept::datahub::DataHub::instance().publish(+ QString::fromLatin1(kTopicRevenue), QVariant::fromValue(r));+}++} // namespace fincept::walletdiff --git a/fincept-qt/src/services/wallet/RealYieldService.h b/fincept-qt/src/services/wallet/RealYieldService.hnew file mode 100644index 000000000..6c39db418--- /dev/null+++ b/fincept-qt/src/services/wallet/RealYieldService.h@@ -0,0 +1,66 @@+#pragma once++#include "datahub/Producer.h"+#include "services/wallet/WalletTypes.h"++#include <QObject>+#include <QString>++class QNetworkAccessManager;++namespace fincept::wallet {++/// Producer for the Phase 3 real-yield topics (plan §3.4):+///+/// - `wallet:yield:<pubkey>` → `YieldSnapshot` (TTL 5 min)+/// - `treasury:revenue` → `TreasuryRevenue` (TTL 1 h, terminal-wide)+///+/// **Real path** (deferred): polls a Fincept HTTP endpoint configured via+/// SecureStorage `fincept.yield_endpoint`. Endpoint shape is symmetrical to+/// the Phase 5 buyback worker — `<endpoint>/yield/<pubkey>` for per-pubkey+/// realised yield, `<endpoint>/revenue/current` for the terminal-wide+/// weekly bucket.+///+/// **Mock path** (active until endpoint is configured): publishes derived+/// numbers consistent with the Phase 5 mock buyback ($42,310 / 25 % staker+/// share = $10,577.50 distributed) and the StakingService mock locks+/// (3 demo positions, lifetime $1,296). Same `is_mock=true` discipline.+///+/// Cross-phase reuse: `treasury:revenue` is also consumed by the Phase 5+/// dashboard and any future revenue-driven UI. Bucketed weekly to match+/// the buyback worker's epoch cadence.+class RealYieldService : public QObject, public fincept::datahub::Producer {+ Q_OBJECT+ public:+ static RealYieldService& instance();++ QStringList topic_patterns() const override;+ void refresh(const QStringList& topics) override;+ int max_requests_per_sec() const override { return 2; }++ private:+ explicit RealYieldService(QObject* parent = nullptr);+ ~RealYieldService() override;+ RealYieldService(const RealYieldService&) = delete;+ RealYieldService& operator=(const RealYieldService&) = delete;++ /// Resolve the configured Fincept yield endpoint, or empty string.+ /// When empty, the service uses `publish_mock_*` paths instead of HTTP.+ QString resolve_endpoint() const;++ /// `wallet:yield:<pubkey>` → pubkey.+ static QString pubkey_from_yield_topic(const QString& topic);++ /// Real-path handlers.+ void refresh_yield_real(const QString& endpoint, const QString& topic,+ const QString& pubkey);+ void refresh_revenue_real(const QString& endpoint);++ /// Mock-path handlers.+ void publish_mock_yield(const QString& topic, const QString& pubkey);+ void publish_mock_revenue();++ QNetworkAccessManager* nam_ = nullptr;+};++} // namespace fincept::walletdiff --git a/fincept-qt/src/services/wallet/SolanaRpcClient.cpp b/fincept-qt/src/services/wallet/SolanaRpcClient.cppindex 26b7079b5..b7b8fb066 100644--- a/fincept-qt/src/services/wallet/SolanaRpcClient.cpp+++ b/fincept-qt/src/services/wallet/SolanaRpcClient.cpp@@ -408,4 +408,69 @@ void SolanaRpcClient::get_signatures_for_address(const QString& address_b58,});}+void SolanaRpcClient::simulate_transaction(const QString& tx_base64,+ SimulateTransactionCallback callback,+ bool replace_recent_blockhash) {+ // simulateTransaction takes the encoded tx as a positional arg, with an+ // options object as the second positional arg. We pass:+ // - encoding: base64 (matches PumpPortal's output)+ // - sigVerify: false (tx is unsigned)+ // - replaceRecentBlockhash: caller-controlled (see header docs)+ // - commitment: confirmed+ //+ // MITM gate path uses replace=true (logic-only check); freshness gate+ // path uses replace=false (catches stale blockhash via BlockhashNotFound).+ QJsonObject opts;+ opts[QStringLiteral("encoding")] = QStringLiteral("base64");+ opts[QStringLiteral("sigVerify")] = false;+ opts[QStringLiteral("replaceRecentBlockhash")] = replace_recent_blockhash;+ opts[QStringLiteral("commitment")] = QStringLiteral("confirmed");++ QJsonObject params;+ params[QStringLiteral("__array")] = QJsonArray{tx_base64, opts};++ post_rpc(QStringLiteral("simulateTransaction"), params,+ [cb = std::move(callback)](Result<QJsonObject> r) {+ if (r.is_err()) {+ cb(Result<SimulationResult>::err(r.error()));+ return;+ }+ const auto root = r.value();+ const auto result_v = root.value(QStringLiteral("result"));+ if (!result_v.isObject()) {+ cb(Result<SimulationResult>::err("malformed simulateTransaction response"));+ return;+ }+ const auto result = result_v.toObject();+ const auto value_v = result.value(QStringLiteral("value"));+ if (!value_v.isObject()) {+ cb(Result<SimulationResult>::err("missing simulation value"));+ return;+ }+ const auto value = value_v.toObject();++ SimulationResult sr;+ const auto err_v = value.value(QStringLiteral("err"));+ if (err_v.isNull() || err_v.isUndefined()) {+ sr.ok = true;+ } else {+ sr.ok = false;+ sr.err = QString::fromUtf8(+ QJsonDocument::fromVariant(err_v.toVariant())+ .toJson(QJsonDocument::Compact));+ }+ const auto logs_v = value.value(QStringLiteral("logs"));+ if (logs_v.isArray()) {+ for (const auto& l : logs_v.toArray()) {+ sr.logs.append(l.toString());+ }+ }+ const auto units_v = value.value(QStringLiteral("unitsConsumed"));+ if (units_v.isDouble()) {+ sr.units_consumed = static_cast<quint64>(units_v.toDouble());+ }+ cb(Result<SimulationResult>::ok(std::move(sr)));+ });+}+} // namespace fincept::walletdiff --git a/fincept-qt/src/services/wallet/SolanaRpcClient.h b/fincept-qt/src/services/wallet/SolanaRpcClient.hindex 4ff8f0599..4c27af5a5 100644--- a/fincept-qt/src/services/wallet/SolanaRpcClient.h+++ b/fincept-qt/src/services/wallet/SolanaRpcClient.h@@ -73,6 +73,26 @@ class SolanaRpcClient : public QObject {using SignaturesForAddressCallback =std::function<void(Result<std::vector<SignatureRow>>)>;+ /// Result of `simulateTransaction`. `err` is the JSON-RPC `err` field+ /// stringified — empty if simulation succeeded; non-empty (e.g.+ /// "InstructionError" / "InsufficientFundsForFee") if the tx would fail+ /// on-chain. `units_consumed` is informational only.+ ///+ /// Phase 2 plan §2 uses this as a pre-sign MITM gate: a malicious+ /// PumpPortal response that would actually revert (drain attempt with a+ /// failing safety check, malformed instructions, account mismatches) is+ /// caught here before the wallet is asked to sign. Non-trivial token+ /// balance-delta inspection (parsing inner instructions to verify only+ /// SOL/wSOL/$FNCPT change hands) is a Phase 2.5 polish — this gate+ /// catches the structural-error class of attacks.+ struct SimulationResult {+ bool ok = false; ///< true iff err is empty+ QString err; ///< stringified JSON-RPC err; empty on success+ QStringList logs; ///< program log output, for diagnostics+ quint64 units_consumed = 0;+ };+ using SimulateTransactionCallback = std::function<void(Result<SimulationResult>)>;+/// `getBalance` — returns lamports (1 SOL = 1e9 lamports).void get_sol_balance(const QString& pubkey_b58, BalanceCallback callback);@@ -110,6 +130,24 @@ class SolanaRpcClient : public QObject {const QString& before_signature,SignaturesForAddressCallback callback);+ /// `simulateTransaction` — runs the unsigned transaction against the+ /// resolved RPC and returns whether it would succeed. The wallet doesn't+ /// have to sign anything for this; `sigVerify: false` is always set.+ ///+ /// `replace_recent_blockhash` controls how staleness is treated:+ /// - `true` (default): the simulator swaps in a fresh blockhash before+ /// running. Use this for the **MITM gate** (Phase 2 §2) — we want to+ /// know whether the tx logic itself would revert, independent of+ /// blockhash freshness.+ /// - `false`: the simulator uses the tx's own embedded blockhash and+ /// fails with `BlockhashNotFound` if it's expired. Use this for the+ /// **freshness gate** (Phase 2 §2) immediately before `sign_and_send`,+ /// so a stale tx that has been sitting in the confirm dialog is+ /// caught before the wallet pops.+ void simulate_transaction(const QString& tx_base64,+ SimulateTransactionCallback callback,+ bool replace_recent_blockhash = true);+/// Refresh the resolved endpoint from KeyConfigManager. Cheap; safe to call.void reload_endpoint();diff --git a/fincept-qt/src/services/wallet/StakingService.cpp b/fincept-qt/src/services/wallet/StakingService.cppnew file mode 100644index 000000000..ab64c7570--- /dev/null+++ b/fincept-qt/src/services/wallet/StakingService.cpp@@ -0,0 +1,278 @@+#include "services/wallet/StakingService.h"++#include "core/logging/Logger.h"+#include "datahub/DataHub.h"+#include "services/wallet/SolanaRpcClient.h"+#include "storage/secure/SecureStorage.h"++#include <QDateTime>+#include <QPointer>+#include <QVariant>++#include <atomic>+#include <cmath>++namespace fincept::wallet {++namespace {++constexpr const char* kLocksFamily = "wallet:locks:";+constexpr const char* kVeFncptFamily = "wallet:vefncpt:";+constexpr const char* kKeyProgramId = "fincept.lock_program_id";++constexpr qint64 kSecondsPerMonth = 30LL * 24 * 60 * 60;+constexpr qint64 kSecondsPerYear = 365LL * 24 * 60 * 60;++/// Demo locks for plan §3.2. Returned for any pubkey in mock mode so the+/// UI is reviewable without an Anchor program. Numbers are anchored to+/// the now() so the "X days remaining" text feels live.+QVector<LockPosition> mock_positions() {+ const qint64 now = QDateTime::currentMSecsSinceEpoch();+ QVector<LockPosition> out;+ out.reserve(3);++ auto make = [now](const QString& id_seed, const QString& amount,+ qint64 duration_sec, double lifetime_yield) {+ LockPosition p;+ p.position_id = QStringLiteral("MockLock") + id_seed;+ p.amount_raw = amount;+ p.decimals = 6;+ // Pretend the lock was created 1/3 of the way through its duration.+ p.lock_start_ts = now - (duration_sec / 3) * 1000;+ p.unlock_ts = p.lock_start_ts + duration_sec * 1000;+ p.duration_secs = duration_sec;+ // Weight = amount × multiplier-for-duration. Multipliers below.+ const double mult = (duration_sec >= kSecondsPerYear * 4) ? 1.0+ : (duration_sec >= kSecondsPerYear * 2) ? 0.5+ : (duration_sec >= kSecondsPerYear) ? 0.25+ : (duration_sec >= kSecondsPerMonth * 6) ? 0.125+ : 0.0625;+ const auto amt_units = amount.toULongLong();+ p.weight_raw = QString::number(static_cast<quint64>(amt_units * mult));+ p.lifetime_yield_usdc = lifetime_yield;+ p.is_mock = true;+ return p;+ };++ out.push_back(make(QStringLiteral("4yr"),+ QStringLiteral("2000000000"), // 2,000 @ 6dp+ kSecondsPerYear * 4, 1240.0));+ out.push_back(make(QStringLiteral("1yr"),+ QStringLiteral("1000000000"), // 1,000 @ 6dp+ kSecondsPerYear, 42.0));+ out.push_back(make(QStringLiteral("6mo"),+ QStringLiteral("500000000"), // 500 @ 6dp+ kSecondsPerMonth * 6, 14.0));+ return out;+}++} // namespace++StakingService& StakingService::instance() {+ static StakingService inst;+ return inst;+}++StakingService::StakingService(QObject* parent) : QObject(parent) {+ rpc_ = new SolanaRpcClient(this);+}++StakingService::~StakingService() = default;++QStringList StakingService::topic_patterns() const {+ return QStringList{+ QStringLiteral("wallet:locks:*"),+ QStringLiteral("wallet:vefncpt:*"),+ };+}++double StakingService::multiplier_for(Duration d) noexcept {+ switch (d) {+ case Duration::ThreeMonths: return 0.0625;+ case Duration::SixMonths: return 0.125;+ case Duration::OneYear: return 0.25;+ case Duration::TwoYears: return 0.5;+ case Duration::FourYears: return 1.0;+ }+ return 0.0;+}++QString StakingService::label_for(Duration d) {+ switch (d) {+ case Duration::ThreeMonths: return QStringLiteral("3 MO");+ case Duration::SixMonths: return QStringLiteral("6 MO");+ case Duration::OneYear: return QStringLiteral("1 YR");+ case Duration::TwoYears: return QStringLiteral("2 YR");+ case Duration::FourYears: return QStringLiteral("4 YR");+ }+ return {};+}++qint64 StakingService::seconds_for(Duration d) noexcept {+ switch (d) {+ case Duration::ThreeMonths: return kSecondsPerMonth * 3;+ case Duration::SixMonths: return kSecondsPerMonth * 6;+ case Duration::OneYear: return kSecondsPerYear;+ case Duration::TwoYears: return kSecondsPerYear * 2;+ case Duration::FourYears: return kSecondsPerYear * 4;+ }+ return 0;+}++QString StakingService::pubkey_from_locks_topic(const QString& topic) {+ return topic.mid(static_cast<int>(qstrlen(kLocksFamily)));+}++QString StakingService::pubkey_from_vefncpt_topic(const QString& topic) {+ return topic.mid(static_cast<int>(qstrlen(kVeFncptFamily)));+}++QString StakingService::resolve_program_id() const {+ auto r = SecureStorage::instance().retrieve(QString::fromLatin1(kKeyProgramId));+ if (r.is_ok()) return r.value().trimmed();+ return {};+}++bool StakingService::program_is_configured() const {+ return !resolve_program_id().isEmpty();+}++void StakingService::refresh(const QStringList& topics) {+ const auto program_id = resolve_program_id();+ const bool mock = program_id.isEmpty();+ if (mock) {+ // Log once per process — refresh fires every 30 s in mock mode.+ static std::atomic<bool> once{false};+ if (!once.exchange(true)) {+ LOG_INFO("Staking",+ "no fincept.lock_program_id configured — serving mock locks");+ } else {+ LOG_DEBUG("Staking", "mock-mode refresh");+ }+ }++ for (const auto& topic : topics) {+ if (topic.startsWith(QLatin1String(kLocksFamily))) {+ const auto pk = pubkey_from_locks_topic(topic);+ if (pk.isEmpty()) continue;+ mock ? publish_mock_locks(topic, pk)+ : refresh_locks_real(topic, pk, program_id);+ } else if (topic.startsWith(QLatin1String(kVeFncptFamily))) {+ const auto pk = pubkey_from_vefncpt_topic(topic);+ if (pk.isEmpty()) continue;+ mock ? publish_mock_vefncpt(topic, pk)+ : refresh_vefncpt_real(topic, pk, program_id);+ }+ }+}++// ── Real path stubs ────────────────────────────────────────────────────────+//+// Real implementation requires:+// - SolanaRpcClient::get_program_accounts (not yet wrapped)+// - Anchor account discriminator + Borsh deserialiser for `LockPosition`+// - PDA derivation: position_pda = find_program_address(["lock", owner, idx])+// All of which depend on the program being deployed. Until then, these+// methods publish_error so the UI shows a clear "program not deployed" state+// rather than silent empty rows.++void StakingService::refresh_locks_real(const QString& topic,+ const QString& /*pubkey*/,+ const QString& /*program_id*/) {+ auto& hub = fincept::datahub::DataHub::instance();+ hub.publish_error(topic,+ QStringLiteral("real fetch not implemented yet — Anchor program "+ "deployment + Borsh deserialiser pending"));+}++void StakingService::refresh_vefncpt_real(const QString& topic,+ const QString& /*pubkey*/,+ const QString& /*program_id*/) {+ auto& hub = fincept::datahub::DataHub::instance();+ hub.publish_error(topic,+ QStringLiteral("real fetch not implemented yet — Anchor program "+ "deployment + Borsh deserialiser pending"));+}++// ── Mock path ──────────────────────────────────────────────────────────────++void StakingService::publish_mock_locks(const QString& topic, const QString& pubkey) {+ auto& hub = fincept::datahub::DataHub::instance();+ auto positions = mock_positions();+ hub.publish(topic, QVariant::fromValue(positions));+ emit locks_published(pubkey);+}++void StakingService::publish_mock_vefncpt(const QString& topic, const QString& pubkey) {+ const auto positions = mock_positions();++ // Sum weights at full precision in atomic units.+ quint64 total_weight = 0;+ for (const auto& p : positions) {+ bool ok = false;+ total_weight += p.weight_raw.toULongLong(&ok);+ // toULongLong silently returns 0 on failure — fine for mock data.+ }++ VeFncptAggregate agg;+ agg.pubkey_b58 = pubkey;+ agg.total_weight_raw = QString::number(total_weight);+ agg.decimals = 6;+ agg.position_count = positions.size();+ // Projected next-period yield: at $42k weekly revenue × 25 % staker+ // share × the user's share of total weight. For the mock, assume the+ // user owns 100 % of the global weight (single-user demo) — projects+ // ~$10,500 per week. Real path divides by the global weight reported+ // by the program.+ agg.projected_next_period_yield_usdc = 42'310.0 * 0.25;+ agg.ts_ms = QDateTime::currentMSecsSinceEpoch();+ agg.is_mock = true;+ fincept::datahub::DataHub::instance().publish(topic, QVariant::fromValue(agg));+}++// ── Tx-building helpers ────────────────────────────────────────────────────+//+// In mock mode these always fail with a clear message. The LOCK / EXTEND /+// WITHDRAW buttons in the UI catch the error and surface it in the panel's+// error strip rather than opening a confirm dialog.++void StakingService::build_lock_tx(const QString& /*pubkey*/,+ const QString& /*amount_raw*/,+ Duration /*duration*/,+ std::function<void(Result<QString>)> callback) {+ if (!program_is_configured()) {+ callback(Result<QString>::err(+ "fincept_lock Anchor program not deployed yet. Configure "+ "SecureStorage `fincept.lock_program_id` once the program "+ "ships to enable real locks."));+ return;+ }+ // Real implementation: build a versioned tx with the `lock` instruction.+ // Requires the Borsh-encoded args and the position-NFT mint PDA.+ callback(Result<QString>::err("real build_lock_tx not yet implemented"));+}++void StakingService::build_extend_tx(const QString& /*pubkey*/,+ const QString& /*position_id*/,+ Duration /*new_duration*/,+ std::function<void(Result<QString>)> callback) {+ if (!program_is_configured()) {+ callback(Result<QString>::err(+ "fincept_lock Anchor program not deployed yet."));+ return;+ }+ callback(Result<QString>::err("real build_extend_tx not yet implemented"));+}++void StakingService::build_withdraw_tx(const QString& /*pubkey*/,+ const QString& /*position_id*/,+ std::function<void(Result<QString>)> callback) {+ if (!program_is_configured()) {+ callback(Result<QString>::err(+ "fincept_lock Anchor program not deployed yet."));+ return;+ }+ callback(Result<QString>::err("real build_withdraw_tx not yet implemented"));+}++} // namespace fincept::walletdiff --git a/fincept-qt/src/services/wallet/StakingService.h b/fincept-qt/src/services/wallet/StakingService.hnew file mode 100644index 000000000..1ccdd7d9d--- /dev/null+++ b/fincept-qt/src/services/wallet/StakingService.h@@ -0,0 +1,133 @@+#pragma once++#include "core/result/Result.h"+#include "datahub/Producer.h"+#include "services/wallet/WalletTypes.h"++#include <QObject>+#include <QString>++#include <functional>++namespace fincept::wallet {++class SolanaRpcClient;++/// Producer for the veFNCPT lock topics (Phase 3 §3.4):+///+/// - `wallet:locks:<pubkey>` → `QVector<LockPosition>` (TTL 60 s)+/// - `wallet:vefncpt:<pubkey>` → `VeFncptAggregate` (TTL 60 s)+///+/// **Real path** (deferred — needs the on-chain Anchor program): query+/// `getProgramAccounts` against the configured `fincept.lock_program_id`,+/// filter by `owner = pubkey`, deserialise position accounts, and publish.+/// The terminal-side surface ships first; the Anchor program lives in+/// `solana/programs/fincept_lock/` (out-of-tree) and lands separately.+///+/// **Mock path** (active until program ID is configured): publishes the+/// 3 demo positions from plan §3.2 — 2,000 @ 4yr, 1,000 @ 1yr, 500 @ 6mo —+/// for any pubkey, with `is_mock=true` on every payload. Lets the dashboard+/// be reviewed before the program ships.+///+/// **Lock / extend / withdraw** transaction-building helpers: in real mode+/// these construct unsigned versioned txs that `WalletService::sign_and_send`+/// can forward to the user's wallet. In mock mode they return+/// `Result::err("…not yet deployed…")` so `LockPanel` can disable the+/// LOCK button with a clear message.+///+/// Duration → veCRV-style multiplier table (4-yr lock = 1.0× the amount):+/// 3 mo → 0.0625+/// 6 mo → 0.125+/// 1 yr → 0.25+/// 2 yr → 0.5+/// 4 yr → 1.0+class StakingService : public QObject, public fincept::datahub::Producer {+ Q_OBJECT+ public:+ static StakingService& instance();++ QStringList topic_patterns() const override;+ void refresh(const QStringList& topics) override;+ int max_requests_per_sec() const override { return 3; }++ /// Duration enum — the only five locks the program accepts. Stored as+ /// seconds in the Anchor program; the multiplier table is derived from+ /// the seconds and a 4-yr max-duration constant.+ enum class Duration {+ ThreeMonths,+ SixMonths,+ OneYear,+ TwoYears,+ FourYears,+ };++ /// Multiplier in [0, 1]. Plan §3.2.+ static double multiplier_for(Duration d) noexcept;++ /// Human-readable label for the duration radio buttons.+ static QString label_for(Duration d);++ /// Seconds count.+ static qint64 seconds_for(Duration d) noexcept;++ /// Build an unsigned `lock` transaction. Async; callback receives the+ /// base64 versioned tx body, or an error if the on-chain program isn't+ /// deployed (mock mode).+ void build_lock_tx(const QString& pubkey,+ const QString& amount_raw,+ Duration duration,+ std::function<void(Result<QString>)> callback);++ /// Build an unsigned `extend` transaction for an existing position.+ void build_extend_tx(const QString& pubkey,+ const QString& position_id,+ Duration new_duration,+ std::function<void(Result<QString>)> callback);++ /// Build an unsigned `withdraw` transaction. Only valid after the+ /// position's `unlock_ts`; the Anchor program rejects early withdrawals.+ void build_withdraw_tx(const QString& pubkey,+ const QString& position_id,+ std::function<void(Result<QString>)> callback);++ /// True iff the on-chain program ID is configured. UI uses this to+ /// disable LOCK/EXTEND/WITHDRAW buttons in mock mode and show+ /// "Anchor program not deployed yet" guidance.+ bool program_is_configured() const;++ signals:+ /// Emitted on every successful publish for a pubkey's locks topic.+ /// Used by `RealYieldService` to recompute projections without+ /// pulling them from the hub.+ void locks_published(QString pubkey_b58);++ private:+ explicit StakingService(QObject* parent = nullptr);+ ~StakingService() override;+ StakingService(const StakingService&) = delete;+ StakingService& operator=(const StakingService&) = delete;++ /// `wallet:locks:<pubkey>` → pubkey.+ static QString pubkey_from_locks_topic(const QString& topic);++ /// `wallet:vefncpt:<pubkey>` → pubkey.+ static QString pubkey_from_vefncpt_topic(const QString& topic);++ /// Resolve the Anchor program ID from SecureStorage. Empty string if+ /// not configured; producer falls back to mock data for both topics.+ QString resolve_program_id() const;++ /// Real-path producers — query `getProgramAccounts` and parse positions.+ void refresh_locks_real(const QString& topic, const QString& pubkey,+ const QString& program_id);+ void refresh_vefncpt_real(const QString& topic, const QString& pubkey,+ const QString& program_id);++ /// Mock-path producers — publish the 3-position demo from plan §3.2.+ void publish_mock_locks(const QString& topic, const QString& pubkey);+ void publish_mock_vefncpt(const QString& topic, const QString& pubkey);++ SolanaRpcClient* rpc_ = nullptr;+};++} // namespace fincept::walletdiff --git a/fincept-qt/src/services/wallet/TokenPriceProducer.cpp b/fincept-qt/src/services/wallet/TokenPriceProducer.cppindex 247b522d9..09614cc68 100644--- a/fincept-qt/src/services/wallet/TokenPriceProducer.cpp+++ b/fincept-qt/src/services/wallet/TokenPriceProducer.cpp@@ -19,7 +19,7 @@ namespace fincept::wallet {namespace {-constexpr const char* kFamilyPrefix = "market:price:token:";+constexpr const char* kTokenPriceFamilyPrefix = "market:price:token:";constexpr const char* kFncptAlias = "market:price:fncpt";// Jupiter Lite Price API v3. Same host we already use; the response shape// keys results by mint, so a single call serves any number of mints.@@ -44,14 +44,14 @@ QString TokenPriceProducer::mint_for_topic(const QString& topic) {if (topic == QString::fromLatin1(kFncptAlias)) {return QString::fromLatin1(kFncptMint);}- if (topic.startsWith(QString::fromLatin1(kFamilyPrefix))) {- return topic.mid(static_cast<int>(qstrlen(kFamilyPrefix)));+ if (topic.startsWith(QString::fromLatin1(kTokenPriceFamilyPrefix))) {+ return topic.mid(static_cast<int>(qstrlen(kTokenPriceFamilyPrefix)));}return {};}QString TokenPriceProducer::topic_for_mint(const QString& mint) {- return QString::fromLatin1(kFamilyPrefix) + mint;+ return QString::fromLatin1(kTokenPriceFamilyPrefix) + mint;}void TokenPriceProducer::refresh(const QStringList& topics) {diff --git a/fincept-qt/src/services/wallet/TreasuryService.cpp b/fincept-qt/src/services/wallet/TreasuryService.cppnew file mode 100644index 000000000..f9cb68e57--- /dev/null+++ b/fincept-qt/src/services/wallet/TreasuryService.cpp@@ -0,0 +1,212 @@+#include "services/wallet/TreasuryService.h"++#include "core/logging/Logger.h"+#include "datahub/DataHub.h"+#include "services/wallet/SolanaRpcClient.h"+#include "services/wallet/WalletTypes.h"+#include "storage/secure/SecureStorage.h"++#include <QDateTime>+#include <QPointer>+#include <QVariant>++#include <atomic>++namespace fincept::wallet {++namespace {++constexpr const char* kTopicReserves = "treasury:reserves";+constexpr const char* kTopicRunway = "treasury:runway";++constexpr const char* kKeyTreasuryPubkey = "fincept.treasury_pubkey";+constexpr const char* kKeyMonthlyOpexUsd = "fincept.treasury_monthly_opex_usd";+constexpr const char* kKeyMultisigLabel = "fincept.treasury_multisig_label";+constexpr const char* kKeyMultisigUrl = "fincept.treasury_multisig_url";++// Defaults used when keys aren't configured. Conservative — better to+// over-state runway pressure than to under-state it.+constexpr double kDefaultMonthlyOpexUsd = 100'000.0;+constexpr const char* kDefaultMultisigLabel = "3-of-5";+constexpr const char* kDefaultMultisigUrl = "https://app.squads.so/";++// Fetch the live SOL price by peeking the hub. Returns 0 if unavailable.+double sol_price_usd_from_hub() {+ auto& hub = fincept::datahub::DataHub::instance();+ const auto v = hub.peek(QStringLiteral("market:price:token:") ++ QString::fromLatin1(kWrappedSolMint));+ if (v.canConvert<TokenPrice>()) {+ const auto p = v.value<TokenPrice>();+ if (p.valid) return p.usd;+ }+ return 0.0;+}++double monthly_opex_usd_or_default() {+ auto r = SecureStorage::instance().retrieve(QString::fromLatin1(kKeyMonthlyOpexUsd));+ if (r.is_ok()) {+ bool ok = false;+ const double v = r.value().toDouble(&ok);+ if (ok && v > 0.0) return v;+ }+ return kDefaultMonthlyOpexUsd;+}++QString multisig_label_or_default() {+ auto r = SecureStorage::instance().retrieve(QString::fromLatin1(kKeyMultisigLabel));+ if (r.is_ok() && !r.value().trimmed().isEmpty()) return r.value();+ return QString::fromLatin1(kDefaultMultisigLabel);+}++QString multisig_url_or_default(const QString& pubkey) {+ auto r = SecureStorage::instance().retrieve(QString::fromLatin1(kKeyMultisigUrl));+ if (r.is_ok() && !r.value().trimmed().isEmpty()) return r.value();+ // Default: Squads vault page for the pubkey, when known. Otherwise the+ // generic Squads landing.+ if (!pubkey.isEmpty()) {+ return QStringLiteral("https://app.squads.so/squads/") + pubkey;+ }+ return QString::fromLatin1(kDefaultMultisigUrl);+}++} // namespace++TreasuryService::TreasuryService(QObject* parent) : QObject(parent) {+ rpc_ = new SolanaRpcClient(this);+}++TreasuryService::~TreasuryService() = default;++QStringList TreasuryService::topic_patterns() const {+ return QStringList{+ QString::fromLatin1(kTopicReserves),+ QString::fromLatin1(kTopicRunway),+ };+}++QString TreasuryService::usdc_mint() {+ // USDC on Solana mainnet. Pinned here rather than in WalletTypes because+ // it's only meaningful in the treasury context for now.+ return QStringLiteral("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v");+}++void TreasuryService::refresh(const QStringList& topics) {+ auto pk = SecureStorage::instance().retrieve(QString::fromLatin1(kKeyTreasuryPubkey));+ const QString treasury_pubkey = pk.is_ok() ? pk.value().trimmed() : QString();++ const bool reserves_requested = topics.contains(QLatin1String(kTopicReserves));+ const bool runway_requested = topics.contains(QLatin1String(kTopicRunway));++ if (treasury_pubkey.isEmpty()) {+ // Log once per process — see BuybackBurnService for the rationale.+ static std::atomic<bool> once{false};+ if (!once.exchange(true)) {+ LOG_INFO("Treasury",+ "no fincept.treasury_pubkey configured — serving mock data");+ } else {+ LOG_DEBUG("Treasury", "mock-mode refresh");+ }+ if (reserves_requested) publish_mock_reserves();+ if (runway_requested) {+ // Mock runway uses the same total as the mock reserves.+ const double mock_total = (8.34 * 84.28) + 1'840'000.0; // hand-tuned+ publish_mock_runway(mock_total);+ }+ return;+ }++ // Real path — one fetch covers both topics, since runway is derived from+ // reserves. We always run the reserves fetch when either is requested.+ refresh_real(treasury_pubkey);+}++// ── Real fetch path ────────────────────────────────────────────────────────++void TreasuryService::refresh_real(const QString& treasury_pubkey) {+ rpc_->reload_endpoint();++ QPointer<TreasuryService> self = this;+ rpc_->get_sol_balance(treasury_pubkey,+ [self, treasury_pubkey](Result<quint64> sol_r) {+ if (!self) return;+ auto& hub = fincept::datahub::DataHub::instance();+ if (sol_r.is_err()) {+ hub.publish_error(QString::fromLatin1(kTopicReserves),+ QString::fromStdString(sol_r.error()));+ return;+ }+ const quint64 sol_lamports = sol_r.value();++ // Now fetch the USDC ATA balance.+ self->rpc_->get_token_balance(treasury_pubkey, usdc_mint(),+ [self, treasury_pubkey, sol_lamports](+ Result<std::vector<SplTokenBalance>> usdc_r) {+ if (!self) return;+ auto& hub = fincept::datahub::DataHub::instance();+ double usdc_amount = 0.0;+ if (usdc_r.is_ok()) {+ for (const auto& b : usdc_r.value()) {+ usdc_amount += b.ui_amount();+ }+ } // soft-fail on USDC: empty ATA is normal, we report 0++ const double sol_price = sol_price_usd_from_hub();+ const double sol_ui = static_cast<double>(sol_lamports) / 1e9;+ const double total_usd = (sol_ui * sol_price) + usdc_amount;++ TreasuryReserves r;+ r.pubkey_b58 = treasury_pubkey;+ r.sol_lamports = sol_lamports;+ r.usdc_amount = usdc_amount;+ r.sol_usd_price = sol_price;+ r.total_usd = total_usd;+ r.multisig_label = multisig_label_or_default();+ r.multisig_url = multisig_url_or_default(treasury_pubkey);+ r.ts_ms = QDateTime::currentMSecsSinceEpoch();+ r.is_mock = false;+ hub.publish(QString::fromLatin1(kTopicReserves), QVariant::fromValue(r));++ // Derive runway from the same total — single source of truth.+ self->publish_runway(total_usd, /*is_mock=*/false);+ });+ });+}++// ── Mock paths ─────────────────────────────────────────────────────────────++void TreasuryService::publish_mock_reserves() {+ // Hand-tuned numbers consistent with the mock buyback epoch.+ const double sol_price = 84.28;+ const double sol_ui = 234.0;+ const double usdc = 1'840'000.0;+ TreasuryReserves r;+ r.pubkey_b58 = QStringLiteral("FinceptTreasuryMockVaultXXXXXXXXXXXXXXXXXXXX");+ r.sol_lamports = static_cast<quint64>(sol_ui * 1e9);+ r.usdc_amount = usdc;+ r.sol_usd_price = sol_price;+ r.total_usd = (sol_ui * sol_price) + usdc;+ r.multisig_label = multisig_label_or_default();+ r.multisig_url = multisig_url_or_default(QString());+ r.ts_ms = QDateTime::currentMSecsSinceEpoch();+ r.is_mock = true;+ fincept::datahub::DataHub::instance().publish(+ QString::fromLatin1(kTopicReserves), QVariant::fromValue(r));+}++void TreasuryService::publish_mock_runway(double total_usd_for_runway) {+ publish_runway(total_usd_for_runway, /*is_mock=*/true);+}++void TreasuryService::publish_runway(double total_usd, bool is_mock) {+ const double opex = monthly_opex_usd_or_default();+ TreasuryRunway w;+ w.total_usd = total_usd;+ w.monthly_opex_usd = opex;+ w.months = (opex > 0.0) ? (total_usd / opex) : 0.0;+ w.ts_ms = QDateTime::currentMSecsSinceEpoch();+ w.is_mock = is_mock;+ fincept::datahub::DataHub::instance().publish(+ QString::fromLatin1(kTopicRunway), QVariant::fromValue(w));+}++} // namespace fincept::walletdiff --git a/fincept-qt/src/services/wallet/TreasuryService.h b/fincept-qt/src/services/wallet/TreasuryService.hnew file mode 100644index 000000000..5db8e04fa--- /dev/null+++ b/fincept-qt/src/services/wallet/TreasuryService.h@@ -0,0 +1,63 @@+#pragma once++#include "datahub/Producer.h"+#include "services/wallet/WalletTypes.h"++#include <QObject>+#include <QString>++namespace fincept::wallet {++class SolanaRpcClient;++/// Producer for the terminal-wide treasury reserves & runway topics+/// (Phase 5 §5.3):+///+/// - `treasury:reserves` → `TreasuryReserves` (TTL 5 min)+/// - `treasury:runway` → `TreasuryRunway` (derived from reserves)+///+/// **Source.** When `fincept.treasury_pubkey` is configured in SecureStorage,+/// the service fetches the multisig vault's SOL + USDC balances via our+/// existing `SolanaRpcClient`. When the key is absent, the service publishes+/// a built-in mock payload (`is_mock=true`) so the dashboard renders before+/// the multisig vault is set up.+///+/// **Runway.** Computed as `total_usd / monthly_opex_usd`. The monthly opex+/// is read from SecureStorage (`fincept.treasury_monthly_opex_usd`) — Phase 5+/// keeps it user-configurable until the buyback worker publishes a tracked+/// figure (which would belong on `treasury:reserves` proper, but that+/// requires payroll integration that's out of scope for the dashboard+/// phase).+class TreasuryService : public QObject, public fincept::datahub::Producer {+ Q_OBJECT+ public:+ explicit TreasuryService(QObject* parent = nullptr);+ ~TreasuryService() override;++ QStringList topic_patterns() const override;+ void refresh(const QStringList& topics) override;+ int max_requests_per_sec() const override { return 2; }++ private:+ /// Fetch the treasury vault's SOL + USDC balances and publish reserves+ /// + derived runway. One round-trip per call.+ void refresh_real(const QString& treasury_pubkey);++ /// Mock paths — `is_mock=true` on every payload.+ void publish_mock_reserves();+ void publish_mock_runway(double total_usd_for_runway);++ /// Compute runway from a reserves total + the configured monthly opex.+ /// Re-publish whenever reserves change.+ void publish_runway(double total_usd, bool is_mock);++ /// USDC mint on Solana mainnet — used to filter+ /// `getTokenAccountsByOwner` to the USDC-only ATA. Constant; pinned+ /// here rather than in WalletTypes because it's only meaningful in the+ /// treasury context for now.+ static QString usdc_mint();++ SolanaRpcClient* rpc_ = nullptr;+};++} // namespace fincept::walletdiff --git a/fincept-qt/src/services/wallet/WalletTypes.h b/fincept-qt/src/services/wallet/WalletTypes.hindex 072bb9125..6b1222292 100644--- a/fincept-qt/src/services/wallet/WalletTypes.h+++ b/fincept-qt/src/services/wallet/WalletTypes.h@@ -132,6 +132,189 @@ struct ParsedActivity {QString counterparty; ///< for SEND/RECEIVE; empty otherwise};+// ── Phase 5 types (ROADMAP tab — buyback & burn dashboard) ──────────────+//+// All five payload types are **terminal-wide** (no <pubkey> segment) — the+// same numbers are shown to every user regardless of who's connected. The+// `BuybackBurnService` and `TreasuryService` producers fetch from the+// Fincept-operated buyback worker (`services/buyback-worker/`) which+// publishes per-epoch summaries to an HTTP endpoint configured via+// SecureStorage (`fincept.treasury_endpoint`). When the endpoint is absent+// the producers return a built-in mock payload so the UI is reviewable+// before the worker is deployed.++/// One epoch's buyback summary. Published on `treasury:buyback_epoch`.+/// "Epoch" is whatever cadence the worker chooses — Phase 5 plan §5.4+/// suggests weekly. `start_ts_ms` / `end_ts_ms` are unix ms; `revenue_*`+/// fields are USD; `fncpt_*_raw` are token-units (atomic, not decimal-shifted).+///+/// Plan §5.4 specifies a **50/25/25 budget split** (buyback / staker yield /+/// treasury top-up). All three USD splits are reported here so the dashboard+/// can show the full value loop, not just the headline buyback number.+/// The split percentages aren't enforced — the worker can choose any+/// distribution; the dashboard just displays whatever the worker reports.+struct BuybackEpoch {+ int epoch_no = 0;+ qint64 start_ts_ms = 0;+ qint64 end_ts_ms = 0;+ double revenue_total_usd = 0.0; ///< end-of-epoch tally+ double revenue_subs_usd = 0.0; ///< subscriptions+ double revenue_predmkt_usd = 0.0; ///< prediction-market fees+ double revenue_misc_usd = 0.0; ///< everything else+ double buyback_usd = 0.0; ///< actually spent on buying $FNCPT (50%)+ double staker_yield_usd = 0.0; ///< paid out to veFNCPT lockers (25%)+ double treasury_topup_usd = 0.0; ///< retained as USDC in treasury (25%)+ QString fncpt_bought_raw; ///< integer string (atomic)+ QString fncpt_burned_raw; ///< usually == bought; may diverge briefly+ int fncpt_decimals = 6; ///< pump.fun standard+ double avg_buy_price_usd = 0.0; ///< buyback_usd / fncpt_bought_ui+ QString burn_signature; ///< base58 tx sig of the burn (Solscan-clickable)+ qint64 ts_ms = 0;+ bool is_mock = false; ///< true if the worker endpoint isn't configured+};++/// All-time totals. Published on `treasury:burn_total`.+struct BurnTotal {+ QString total_burned_raw; ///< integer string (atomic)+ QString supply_remaining_raw; ///< current circulating + uncirculated, minus burned+ int decimals = 6;+ double spent_on_buyback_usd = 0.0;+ qint64 ts_ms = 0;+ bool is_mock = false;+};++/// One sample of supply over time. The supply chart subscribes+/// `treasury:supply_history` which carries a `QVector<SupplyHistoryPoint>`.+struct SupplyHistoryPoint {+ qint64 ts_ms = 0; ///< sample time (unix ms, weekly bucket)+ QString total_raw; ///< total supply at sample time (atomic)+ QString circulating_raw; ///< circulating only (excludes vesting/locked)+ QString burned_raw; ///< cumulative burned to date+ int decimals = 6;+};++/// Treasury reserves snapshot. Published on `treasury:reserves`.+struct TreasuryReserves {+ QString pubkey_b58; ///< treasury multisig pubkey (Squads vault)+ quint64 sol_lamports = 0; ///< native SOL+ double usdc_amount = 0.0; ///< already decimal-shifted (UI-ready)+ double sol_usd_price = 0.0; ///< spot at sample time+ double total_usd = 0.0; ///< (sol_lamports/1e9 * sol_usd_price) + usdc_amount+ QString multisig_label; ///< "3-of-5" / "2-of-3" — for the chip+ QString multisig_url; ///< deeplink (squads.so/...) — for the chip click+ qint64 ts_ms = 0;+ bool is_mock = false;+};++/// Treasury runway. Published on `treasury:runway`.+/// Months = `total_usd / monthly_opex_usd`. `monthly_opex_usd` comes from+/// SecureStorage (`fincept.treasury_monthly_opex_usd`) until the worker+/// publishes a tracked figure.+struct TreasuryRunway {+ double total_usd = 0.0; ///< snapshot from TreasuryReserves+ double monthly_opex_usd = 0.0; ///< current burn rate+ double months = 0.0; ///< total_usd / monthly_opex_usd+ qint64 ts_ms = 0;+ bool is_mock = false;+};++// ── Phase 3 types (STAKE tab — veFNCPT lock + tier system) ──────────────+//+// veFNCPT model (Curve veCRV-style, sized down): users lock $FNCPT for+// 3 months / 6 mo / 1 yr / 2 yr / 4 yr. Weight = amount × duration_multiplier+// where the multipliers are 0.0625 / 0.125 / 0.25 / 0.5 / 1.0 of a 4-yr+// max-weight lock. Yield: real-yield USDC distributions pro-rata by weight,+// settled per epoch by an admin-signed `emit_distribution` instruction.+// Plan §3.5 deciding factor: ship a minimal `fincept_lock` Anchor program+// in `solana/programs/fincept_lock/` (out-of-tree, separate repo).+//+// The terminal-side surface ships in mock mode (`is_mock=true` on every+// payload) until the Anchor program is deployed and `fincept.lock_program_id`+// is configured in SecureStorage.++/// One lock position. Published as part of `QVector<LockPosition>` on+/// `wallet:locks:<pubkey>`. A position is a non-transferable NFT under the+/// fincept_lock program; `position_id` is the on-chain account address+/// (base58) that uniquely identifies it.+struct LockPosition {+ QString position_id; ///< base58 PDA / position NFT mint+ QString amount_raw; ///< $FNCPT escrowed (atomic)+ int decimals = 6; ///< $FNCPT decimals+ qint64 lock_start_ts = 0; ///< unix ms — when the lock was created+ qint64 unlock_ts = 0; ///< unix ms — `lock_start + duration`+ qint64 duration_secs = 0; ///< original lock duration+ QString weight_raw; ///< veFNCPT weight (atomic, decimals match $FNCPT)+ double lifetime_yield_usdc = 0.0; ///< total USDC paid to this position+ bool is_mock = false;+};++/// Aggregate veFNCPT view per pubkey. Published on `wallet:vefncpt:<pubkey>`.+/// Sum across the user's `LockPosition`s, plus a forward-looking projection+/// for the next epoch's distribution.+struct VeFncptAggregate {+ QString pubkey_b58;+ QString total_weight_raw; ///< sum of `LockPosition.weight_raw`+ int decimals = 6;+ int position_count = 0;+ double projected_next_period_yield_usdc = 0.0; ///< weight share × next-epoch revenue × 25%+ qint64 ts_ms = 0;+ bool is_mock = false;+};++/// Yield earned by a wallet. Published on `wallet:yield:<pubkey>`.+/// Decoupled from `VeFncptAggregate` because yield realised vs projected+/// have very different semantics — projection is forward-looking math,+/// realised is a sum of past on-chain distribution events.+struct YieldSnapshot {+ QString pubkey_b58;+ double lifetime_usdc = 0.0; ///< all-time+ double last_period_usdc = 0.0; ///< most recent epoch distribution+ qint64 last_period_end_ts = 0; ///< unix ms — settlement time+ qint64 ts_ms = 0;+ bool is_mock = false;+};++/// Terminal-wide weekly revenue aggregate. Published on `treasury:revenue`.+/// Used by `LockPanel` to compute "EST. YIELD" before the user locks; also+/// consumed by the Phase 5 buyback dashboard. Bucketed weekly to match+/// the buyback worker's epoch cadence.+struct TreasuryRevenue {+ qint64 period_start_ts = 0;+ qint64 period_end_ts = 0;+ double total_usd = 0.0;+ qint64 ts_ms = 0;+ bool is_mock = false;+};++/// Billing tier derived from a wallet's veFNCPT weight. Published on+/// `billing:tier:<pubkey>` by `TierService` (consumer-producer pattern,+/// like `FeeDiscountService`).+///+/// Tier thresholds live in `services/billing/TierConfig.h`. Plan §3.6:+/// Bronze 100+ veFNCPT → basic API quota+/// Silver 1k+ veFNCPT → premium screens+/// Gold 10k+ veFNCPT → all agents + arena+///+/// `Free` is the implicit zero-stake tier — no veFNCPT held. Drives the+/// nav-level gating: paid screens are hidden for Free, revealed for+/// Silver+ via a `tier_changed` signal.+struct TierStatus {+ enum class Tier {+ Free, ///< no veFNCPT+ Bronze, ///< 100++ Silver, ///< 1k++ Gold ///< 10k++ };++ QString pubkey_b58;+ Tier tier = Tier::Free;+ QString weight_raw; ///< current veFNCPT weight (atomic)+ QString next_threshold_raw; ///< raw amount needed to reach next tier; empty at Gold+ int decimals = 6;+ qint64 ts_ms = 0;+ bool is_mock = false;+};+} // namespace fincept::walletQ_DECLARE_METATYPE(fincept::wallet::WalletBalance)@@ -141,4 +324,16 @@ Q_DECLARE_METATYPE(fincept::wallet::TokenMetadata)Q_DECLARE_METATYPE(fincept::wallet::ParsedActivity)Q_DECLARE_METATYPE(QVector<fincept::wallet::ParsedActivity>)Q_DECLARE_METATYPE(fincept::wallet::FncptDiscount)+Q_DECLARE_METATYPE(fincept::wallet::BuybackEpoch)+Q_DECLARE_METATYPE(fincept::wallet::BurnTotal)+Q_DECLARE_METATYPE(fincept::wallet::SupplyHistoryPoint)+Q_DECLARE_METATYPE(QVector<fincept::wallet::SupplyHistoryPoint>)+Q_DECLARE_METATYPE(fincept::wallet::TreasuryReserves)+Q_DECLARE_METATYPE(fincept::wallet::TreasuryRunway)+Q_DECLARE_METATYPE(fincept::wallet::LockPosition)+Q_DECLARE_METATYPE(QVector<fincept::wallet::LockPosition>)+Q_DECLARE_METATYPE(fincept::wallet::VeFncptAggregate)+Q_DECLARE_METATYPE(fincept::wallet::YieldSnapshot)+Q_DECLARE_METATYPE(fincept::wallet::TreasuryRevenue)+Q_DECLARE_METATYPE(fincept::wallet::TierStatus)// FncptPrice is `TokenPrice`; no separate metatype needed.diff --git a/fincept-qt/src/services/workspace/WorkspaceManager.h b/fincept-qt/src/services/workspace/WorkspaceManager.hindex 313997a75..e473719cf 100644--- a/fincept-qt/src/services/workspace/WorkspaceManager.h+++ b/fincept-qt/src/services/workspace/WorkspaceManager.h@@ -1,4 +1,4 @@-#pragma once+#pragma once#include "core/result/Result.h"#include "services/workspace/IWorkspaceParticipant.h"#include "services/workspace/WorkspaceTypes.h"@@ -17,7 +17,7 @@ class ScreenRouter;/// Central workspace service — singleton QObject on the UI thread.////// Lifecycle:-/// MainWindow creates it after setup_app_screens().+/// WindowFrame creates it after setup_app_screens()./// load_last_workspace() is called after auth resolves./// save_workspace() is called in closeEvent().class WorkspaceManager : public QObject {diff --git a/fincept-qt/src/storage/cache/TabSessionStore.cpp b/fincept-qt/src/storage/cache/TabSessionStore.cppindex 0d42e7d4f..dc1761785 100644--- a/fincept-qt/src/storage/cache/TabSessionStore.cpp+++ b/fincept-qt/src/storage/cache/TabSessionStore.cpp@@ -117,4 +117,92 @@ Result<QJsonObject> TabSessionStore::load_screen_state(const QString& key, int ereturn Result<QJsonObject>::ok(obj);}+// ── Phase 4b: instance-UUID-keyed screen state ───────────────────────────────++Result<void> TabSessionStore::save_screen_state_by_uuid(const QString& instance_uuid,+ const QString& screen_key,+ const QJsonObject& state,+ int state_version,+ const QString& session_id) {+ auto& cdb = CacheDatabase::instance();+ if (!cdb.is_open())+ return Result<void>::err("Cache database not open");+ if (instance_uuid.isEmpty())+ return Result<void>::err("instance_uuid is required for UUID-keyed save");++ const QString json = QString::fromUtf8(QJsonDocument(state).toJson(QJsonDocument::Compact));++ // The legacy table has screen_key as PRIMARY KEY, which we keep for+ // backward compat. UUID-keyed rows use a synthesised screen_key of the+ // form "uuid:<instance_uuid>" so they don't collide with type-id keys+ // in the legacy code path. The real type id is preserved separately+ // by writing it back via screen_key column for diagnostics — wait,+ // primary key collision. Use upsert on the synthesised key but store+ // the real screen type in the json blob instead. Simplest invariant.+ const QString synthesised_key = "uuid:" + instance_uuid;++ // Embed the screen_type into the saved object so consumers reading by+ // UUID still know what type id this state belongs to. The screen+ // restore_state() callback ignores unknown keys, so no incompatibility.+ QJsonObject augmented = state;+ if (!screen_key.isEmpty())+ augmented.insert("__screen_type__", screen_key);+ const QString augmented_json =+ QString::fromUtf8(QJsonDocument(augmented).toJson(QJsonDocument::Compact));++ auto r = cdb.execute(+ "INSERT OR REPLACE INTO screen_state "+ "(screen_key, state_version, state_json, updated_at, session_id, instance_uuid) "+ "VALUES (?, ?, ?, strftime('%Y-%m-%dT%H:%M:%fZ','now'), ?, ?)",+ {synthesised_key, state_version, augmented_json, session_id, instance_uuid});++ if (r.is_err())+ return Result<void>::err(r.error());+ return Result<void>::ok();+}++Result<QJsonObject> TabSessionStore::load_screen_state_by_uuid(const QString& instance_uuid,+ int expected_version) {+ auto& cdb = CacheDatabase::instance();+ if (!cdb.is_open())+ return Result<QJsonObject>::err("Cache database not open");+ if (instance_uuid.isEmpty())+ return Result<QJsonObject>::ok(QJsonObject{}); // not an error — just no state++ auto r = cdb.execute(+ "SELECT state_version, state_json FROM screen_state WHERE instance_uuid = ?",+ {instance_uuid});++ if (r.is_err())+ return Result<QJsonObject>::err(r.error());++ auto& q = r.value();+ if (!q.next())+ return Result<QJsonObject>::ok(QJsonObject{}); // no saved state yet++ const int saved_version = q.value(0).toInt();+ if (saved_version != expected_version)+ return Result<QJsonObject>::ok(QJsonObject{}); // version mismatch — start fresh++ QJsonObject obj = QJsonDocument::fromJson(q.value(1).toString().toUtf8()).object();+ // Strip the diagnostic-only __screen_type__ marker before handing back+ // to the screen — its restore_state() implementation expects only+ // domain keys.+ obj.remove("__screen_type__");+ return Result<QJsonObject>::ok(obj);+}++Result<void> TabSessionStore::remove_screen_state_by_uuid(const QString& instance_uuid) {+ auto& cdb = CacheDatabase::instance();+ if (!cdb.is_open())+ return Result<void>::err("Cache database not open");+ if (instance_uuid.isEmpty())+ return Result<void>::ok(); // nothing to remove++ auto r = cdb.execute("DELETE FROM screen_state WHERE instance_uuid = ?", {instance_uuid});+ if (r.is_err())+ return Result<void>::err(r.error());+ return Result<void>::ok();+}+} // namespace finceptdiff --git a/fincept-qt/src/storage/cache/TabSessionStore.h b/fincept-qt/src/storage/cache/TabSessionStore.hindex fa4fd20cb..b6326a853 100644--- a/fincept-qt/src/storage/cache/TabSessionStore.h+++ b/fincept-qt/src/storage/cache/TabSessionStore.h@@ -32,6 +32,28 @@ class TabSessionStore {const QString& session_id = {});Result<QJsonObject> load_screen_state(const QString& key, int expected_version);+ /// Phase 4b: persist screen UI state keyed by per-instance UUID rather+ /// than by screen type id. Two panels of the same type (e.g. two+ /// watchlists) get distinct rows; closing one and re-opening a fresh+ /// instance starts with default state.+ ///+ /// Storage uses the same screen_state table — instance_uuid is the+ /// primary lookup; screen_key still gets written (the screen's type+ /// id) for diagnostics and for the legacy by-key path that some+ /// non-panel callers still use (workspace participants, etc.).+ Result<void> save_screen_state_by_uuid(const QString& instance_uuid,+ const QString& screen_key,+ const QJsonObject& state,+ int state_version,+ const QString& session_id = {});+ Result<QJsonObject> load_screen_state_by_uuid(const QString& instance_uuid,+ int expected_version);++ /// Drop a UUID-keyed row. Called by DockScreenRouter when a panel is+ /// permanently closed (vs. dematerialised) so the cache doesn't+ /// accumulate orphan rows for closed instances.+ Result<void> remove_screen_state_by_uuid(const QString& instance_uuid);+private:TabSessionStore() = default;};diff --git a/fincept-qt/src/storage/sqlite/CacheDatabase.cpp b/fincept-qt/src/storage/sqlite/CacheDatabase.cppindex 54ba61a6c..7f4c93ab7 100644--- a/fincept-qt/src/storage/sqlite/CacheDatabase.cpp+++ b/fincept-qt/src/storage/sqlite/CacheDatabase.cpp@@ -143,6 +143,45 @@ Result<void> CacheDatabase::create_tables() {if (r.is_err())return r;+ // Phase 4b: add instance_uuid column to screen_state for the panel-UUID+ // refactor. Pre-Phase-4 rows are keyed only by screen_key (the screen+ // type id, e.g. "watchlist"). New rows get an instance_uuid (per-panel+ // stable id) so two open watchlists never collide on save.+ //+ // Idempotent: PRAGMA table_info() lists existing columns; ALTER TABLE+ // ADD COLUMN runs only if instance_uuid is missing. Safe to call on+ // every CacheDatabase::open across upgrades.+ {+ QMutexLocker lock(&mutex_);+ QSqlQuery info(db_);+ if (info.exec("PRAGMA table_info(screen_state)")) {+ bool has_instance_uuid = false;+ while (info.next()) {+ if (info.value(1).toString() == "instance_uuid") {+ has_instance_uuid = true;+ break;+ }+ }+ if (!has_instance_uuid) {+ QSqlQuery alter(db_);+ if (alter.exec("ALTER TABLE screen_state ADD COLUMN instance_uuid TEXT")) {+ LOG_INFO("CacheDB", "screen_state migrated: added instance_uuid column");+ } else {+ LOG_WARN("CacheDB",+ QString("Failed to add instance_uuid column: %1")+ .arg(alter.lastError().text()));+ }+ }+ }+ }+ // Index on instance_uuid for fast UUID-keyed lookups. NOT UNIQUE — old+ // rows have NULL instance_uuid and SQLite treats multiple NULLs as+ // distinct in a UNIQUE index, but we'd rather not rely on that subtlety.+ r = exec("CREATE INDEX IF NOT EXISTS idx_screen_state_instance_uuid "+ "ON screen_state(instance_uuid) WHERE instance_uuid IS NOT NULL");+ if (r.is_err())+ return r;+LOG_INFO("CacheDB", "Cache tables initialized");return Result<void>::ok();}diff --git a/fincept-qt/src/storage/workspace/CrashRecovery.cpp b/fincept-qt/src/storage/workspace/CrashRecovery.cppnew file mode 100644index 000000000..ca2ff9b6e--- /dev/null+++ b/fincept-qt/src/storage/workspace/CrashRecovery.cpp@@ -0,0 +1,112 @@+#include "storage/workspace/CrashRecovery.h"++#include "core/logging/Logger.h"+#include "storage/workspace/WorkspaceDb.h"++#include <QDateTime>+#include <QSqlQuery>++namespace fincept {++namespace {+constexpr const char* kCrashRecoveryTag = "CrashRecovery";+constexpr const char* kKeyCleanShutdown = "last_clean_shutdown_at";+} // namespace++CrashRecovery::CrashRecovery(WorkspaceDb* db, WorkspaceSnapshotRing* ring)+ : db_(db), ring_(ring) {}++bool CrashRecovery::needs_recovery() const {+ if (!db_ || !db_->is_open())+ return false;++ const qint64 latest_auto_ms = latest_auto_snapshot_ms();+ if (latest_auto_ms == 0) {+ // No auto snapshots — nothing to recover from. First run (or wipe).+ LOG_DEBUG(kCrashRecoveryTag, "No auto snapshots — no recovery needed");+ return false;+ }++ const qint64 clean_ms = last_clean_shutdown_ms();+ if (clean_ms == 0) {+ // Marker missing entirely — definitive unclean shutdown.+ LOG_INFO(kCrashRecoveryTag, QString("Recovery needed: no clean-shutdown marker, latest auto=%1")+ .arg(QDateTime::fromMSecsSinceEpoch(latest_auto_ms).toString(Qt::ISODate)));+ return true;+ }++ // Clean marker exists but is older than the latest auto snapshot —+ // means the user was working past the last clean shutdown and then+ // crashed. Recovery is warranted.+ if (clean_ms < latest_auto_ms) {+ LOG_INFO(kCrashRecoveryTag, QString("Recovery needed: clean=%1 < latest auto=%2")+ .arg(QDateTime::fromMSecsSinceEpoch(clean_ms).toString(Qt::ISODate))+ .arg(QDateTime::fromMSecsSinceEpoch(latest_auto_ms).toString(Qt::ISODate)));+ return true;+ }++ LOG_DEBUG(kCrashRecoveryTag, "Last shutdown was clean — no recovery needed");+ return false;+}++Result<QList<WorkspaceSnapshotRing::Entry>>+CrashRecovery::latest_snapshots(int limit) const {+ if (!ring_)+ return Result<QList<WorkspaceSnapshotRing::Entry>>::err("Ring not configured");+ // Combine auto + crash_recovery, leave named_save out (the recovery+ // dialog distinguishes them). Cheap path: fetch from latest() and+ // filter, since limit is small.+ auto all = ring_->latest(limit * 2);+ if (all.is_err())+ return all;++ QList<WorkspaceSnapshotRing::Entry> filtered;+ for (const auto& e : all.value()) {+ if (e.kind == "auto" || e.kind == "crash_recovery")+ filtered.append(e);+ if (filtered.size() >= limit)+ break;+ }+ return Result<QList<WorkspaceSnapshotRing::Entry>>::ok(filtered);+}++Result<void> CrashRecovery::mark_clean_shutdown() {+ if (!db_ || !db_->is_open())+ return Result<void>::err("WorkspaceDb not open");+ const qint64 now_ms = QDateTime::currentMSecsSinceEpoch();+ auto r = db_->set_meta(kKeyCleanShutdown, QString::number(now_ms));+ if (r.is_err()) {+ LOG_WARN(kCrashRecoveryTag, QString("Failed to write clean-shutdown marker: %1")+ .arg(QString::fromStdString(r.error())));+ } else {+ LOG_INFO(kCrashRecoveryTag, "Clean-shutdown marker written");+ }+ return r;+}++qint64 CrashRecovery::latest_auto_snapshot_ms() const {+ if (!db_ || !db_->is_open())+ return 0;+ auto r = db_->execute(+ "SELECT MAX(created_at) FROM workspace_snapshot WHERE kind = 'auto'");+ if (r.is_err())+ return 0;+ QSqlQuery q = std::move(r.value());+ if (!q.next())+ return 0;+ const QVariant v = q.value(0);+ return v.isNull() ? 0 : v.toLongLong();+}++qint64 CrashRecovery::last_clean_shutdown_ms() const {+ if (!db_ || !db_->is_open())+ return 0;+ const QString s = db_->meta(kKeyCleanShutdown);+ if (s.isEmpty())+ return 0;+ bool ok = false;+ const qint64 ms = s.toLongLong(&ok);+ return ok ? ms : 0;+}++} // namespace finceptdiff --git a/fincept-qt/src/storage/workspace/CrashRecovery.h b/fincept-qt/src/storage/workspace/CrashRecovery.hnew file mode 100644index 000000000..6c5a8ba99--- /dev/null+++ b/fincept-qt/src/storage/workspace/CrashRecovery.h@@ -0,0 +1,62 @@+#pragma once+#include "core/result/Result.h"+#include "storage/workspace/WorkspaceSnapshotRing.h"++#include <QList>++namespace fincept {++class WorkspaceDb;++/// Determines whether a crash recovery prompt should appear at startup, and+/// hands the recovery dialog (Phase 6 UI) the candidate snapshots to choose+/// from.+///+/// Detection logic:+/// - Last clean shutdown writes `_meta.last_clean_shutdown_at = <unix_ms>`.+/// - Startup reads it. If the value is missing OR is older than the most+/// recent `auto` snapshot's `created_at`, the previous session ended+/// uncleanly (crashed, killed, power loss). Recovery is warranted.+/// - If no `auto` snapshots exist at all (first run, or every snapshot+/// was wiped), the prompt is skipped — there's nothing to recover from.+///+/// Phase 2 ships only the API + the marker write/read. Phase 6 wires the+/// modal dialog UI. Phase 9 (Launchpad) surfaces it as a Launchpad card.+///+/// Threading: read-only side (needs_recovery, latest_snapshots) is safe to+/// call from any thread because it goes through WorkspaceDb's mutex.+/// mark_clean_shutdown is meant to be called from main.cpp's aboutToQuit+/// handler — UI thread only by convention, though the lock makes it safe.+class CrashRecovery {+ public:+ explicit CrashRecovery(WorkspaceDb* db, WorkspaceSnapshotRing* ring);++ /// True when the previous session's exit was unclean AND there is at+ /// least one auto snapshot available to restore from. False on first+ /// run (no auto snapshots), and false after a clean shutdown.+ bool needs_recovery() const;++ /// The candidate snapshots the recovery dialog should offer, newest+ /// first. Combines auto + crash_recovery rows (named saves are listed+ /// elsewhere). Capped at `limit` to keep the dialog tractable.+ Result<QList<WorkspaceSnapshotRing::Entry>> latest_snapshots(int limit = 5) const;++ /// Mark this session as having shut down cleanly. Call from main.cpp's+ /// aboutToQuit handler (after the final autosave flush). Failing to+ /// call this is the signal the next-launch recovery uses.+ Result<void> mark_clean_shutdown();++ /// For debugging / tests: the unix-ms timestamp of the most recent auto+ /// snapshot. Returns 0 if none.+ qint64 latest_auto_snapshot_ms() const;++ /// For debugging / tests: the value of _meta.last_clean_shutdown_at, or+ /// 0 if missing.+ qint64 last_clean_shutdown_ms() const;++ private:+ WorkspaceDb* db_;+ WorkspaceSnapshotRing* ring_;+};++} // namespace finceptdiff --git a/fincept-qt/src/storage/workspace/WorkspaceDb.cpp b/fincept-qt/src/storage/workspace/WorkspaceDb.cppnew file mode 100644index 000000000..0a62ac577--- /dev/null+++ b/fincept-qt/src/storage/workspace/WorkspaceDb.cpp@@ -0,0 +1,213 @@+#include "storage/workspace/WorkspaceDb.h"++#include "core/config/ProfileManager.h"+#include "core/logging/Logger.h"++#include <QMutexLocker>+#include <QSqlError>+#include <QVariant>++namespace fincept {++namespace {+constexpr const char* kWorkspaceDbTag = "WorkspaceDB";++QString connection_name_for_profile() {+ // Scoped per profile so a future profile-switch path can briefly hold+ // two open connections (old profile + new profile) without Qt's+ // singleton registry colliding.+ const QString prof = ProfileManager::instance().active_profile_id().to_string();+ return "fincept_workspace_" + prof;+}+} // namespace++WorkspaceDb& WorkspaceDb::instance() {+ static WorkspaceDb s;+ return s;+}++Result<void> WorkspaceDb::open(const QString& path) {+ QMutexLocker lock(&mutex_);++ // Idempotent: if already open at the same path, nothing to do.+ if (db_.isOpen() && db_.databaseName() == path) {+ return Result<void>::ok();+ }+ if (db_.isOpen()) {+ // Path changed (profile switch). Close before reopening — Qt's+ // QSqlDatabase complains if a name is reused without removing it.+ db_.close();+ QSqlDatabase::removeDatabase(connection_name_);+ }++ connection_name_ = connection_name_for_profile();+ db_ = QSqlDatabase::addDatabase("QSQLITE", connection_name_);+ db_.setDatabaseName(path);+ if (!db_.open()) {+ const QString err = db_.lastError().text();+ LOG_ERROR(kWorkspaceDbTag, QString("Failed to open %1: %2").arg(path, err));+ return Result<void>::err(err.toStdString());+ }+ LOG_INFO(kWorkspaceDbTag, "Opened workspace database: " + path);++ // Pragmas first so subsequent CREATE statements run under WAL.+ auto pr = apply_pragmas();+ if (pr.is_err())+ return pr;++ auto cr = create_tables();+ if (cr.is_err())+ return cr;++ return Result<void>::ok();+}++void WorkspaceDb::close() {+ QMutexLocker lock(&mutex_);+ if (db_.isOpen())+ db_.close();+ if (!connection_name_.isEmpty()) {+ QSqlDatabase::removeDatabase(connection_name_);+ connection_name_.clear();+ }+}++bool WorkspaceDb::is_open() const {+ QMutexLocker lock(&mutex_);+ return db_.isOpen();+}++Result<QSqlQuery> WorkspaceDb::execute(const QString& sql, const QVariantList& params) {+ QMutexLocker lock(&mutex_);+ QSqlQuery query(db_);+ query.prepare(sql);+ for (int i = 0; i < params.size(); ++i)+ query.bindValue(i, params[i]);+ if (!query.exec())+ return Result<QSqlQuery>::err(query.lastError().text().toStdString());+ return Result<QSqlQuery>::ok(std::move(query));+}++Result<void> WorkspaceDb::exec(const QString& sql) {+ QMutexLocker lock(&mutex_);+ QSqlQuery query(db_);+ if (!query.exec(sql))+ return Result<void>::err(query.lastError().text().toStdString());+ return Result<void>::ok();+}++Result<void> WorkspaceDb::begin_transaction() {+ return exec("BEGIN");+}++Result<void> WorkspaceDb::commit() {+ return exec("COMMIT");+}++Result<void> WorkspaceDb::rollback() {+ return exec("ROLLBACK");+}++QString WorkspaceDb::meta(const QString& key) const {+ // Re-acquire the lock here; execute() locks too, so we go through it.+ // This is one of the rare const methods that mutates internal state via+ // the mutex; mutable QMutex makes that explicit.+ QMutexLocker lock(&mutex_);+ QSqlQuery query(db_);+ query.prepare("SELECT value FROM _meta WHERE key = ?");+ query.bindValue(0, key);+ if (!query.exec()) {+ LOG_WARN(kWorkspaceDbTag, QString("meta(%1) read failed: %2").arg(key, query.lastError().text()));+ return {};+ }+ if (query.next())+ return query.value(0).toString();+ return {};+}++Result<void> WorkspaceDb::set_meta(const QString& key, const QString& value) {+ auto r = execute("INSERT INTO _meta(key, value) VALUES(?, ?) "+ "ON CONFLICT(key) DO UPDATE SET value = excluded.value",+ {key, value});+ if (r.is_err())+ return Result<void>::err(r.error());+ return Result<void>::ok();+}++QString WorkspaceDb::path() const {+ QMutexLocker lock(&mutex_);+ return db_.databaseName();+}++Result<void> WorkspaceDb::apply_pragmas() {+ // Same combo as CacheDatabase: WAL + NORMAL gives durable-on-power-loss+ // writes with one fsync per checkpoint, not per write. busy_timeout+ // covers the brief overlap when SessionManager's autosave race-collides+ // with a closeEvent flush.+ const char* pragmas[] = {+ "PRAGMA journal_mode = WAL",+ "PRAGMA synchronous = NORMAL",+ "PRAGMA cache_size = -4000",+ "PRAGMA temp_store = MEMORY",+ "PRAGMA mmap_size = 67108864",+ "PRAGMA busy_timeout = 3000",+ };+ for (const char* p : pragmas) {+ QSqlQuery q(db_);+ if (!q.exec(p)) {+ LOG_WARN(kWorkspaceDbTag, QString("PRAGMA failed: %1 — %2").arg(p, q.lastError().text()));+ }+ }+ return Result<void>::ok();+}++Result<void> WorkspaceDb::create_tables() {+ // _meta first so version-tagging works inside this very method.+ auto r = exec("CREATE TABLE IF NOT EXISTS _meta ("+ " key TEXT PRIMARY KEY,"+ " value TEXT"+ ")");+ if (r.is_err()) return r;++ r = exec("CREATE TABLE IF NOT EXISTS workspace_snapshot ("+ " snapshot_id INTEGER PRIMARY KEY AUTOINCREMENT,"+ " created_at INTEGER NOT NULL,"+ " kind TEXT NOT NULL,"+ " payload BLOB NOT NULL,"+ " name TEXT"+ ")");+ if (r.is_err()) return r;++ // Index on (kind, created_at) makes the ring-trim query (delete oldest+ // 'auto' rows when count > 5) and recovery query (latest non-named+ // snapshot) both index lookups.+ r = exec("CREATE INDEX IF NOT EXISTS idx_snapshot_kind_created "+ "ON workspace_snapshot(kind, created_at)");+ if (r.is_err()) return r;++ r = exec("CREATE TABLE IF NOT EXISTS session_history ("+ " session_id TEXT PRIMARY KEY,"+ " profile_id TEXT NOT NULL,"+ " started_at INTEGER NOT NULL,"+ " ended_at INTEGER,"+ " exit_kind TEXT,"+ " frame_count INTEGER DEFAULT 0,"+ " panel_count INTEGER DEFAULT 0"+ ")");+ if (r.is_err()) return r;++ r = exec("CREATE INDEX IF NOT EXISTS idx_session_started "+ "ON session_history(started_at)");+ if (r.is_err()) return r;++ // Stamp schema version. Idempotent — INSERT OR IGNORE on first run,+ // future migrations bump via UPDATE.+ auto v = execute("INSERT OR IGNORE INTO _meta(key, value) VALUES('schema_version', ?)",+ {QString::number(kSchemaVersion)});+ if (v.is_err()) return Result<void>::err(v.error());++ LOG_INFO(kWorkspaceDbTag, "Workspace tables initialised");+ return Result<void>::ok();+}++} // namespace finceptdiff --git a/fincept-qt/src/storage/workspace/WorkspaceDb.h b/fincept-qt/src/storage/workspace/WorkspaceDb.hnew file mode 100644index 000000000..dd24b2451--- /dev/null+++ b/fincept-qt/src/storage/workspace/WorkspaceDb.h@@ -0,0 +1,95 @@+#pragma once+#include "core/result/Result.h"++#include <QMutex>+#include <QSqlDatabase>+#include <QSqlQuery>+#include <QString>+#include <QVariantList>++namespace fincept {++/// Per-profile SQLite database for live workspace state, snapshot ring, and+/// session-history rows.+///+/// Design choices:+/// - WAL mode + synchronous=NORMAL — same combo CacheDatabase uses; safe+/// under power loss with one fsync per checkpoint, low write amplification.+/// - QMutex around execute() — Qt's QSqlDatabase connection is not+/// thread-safe and the workspace writer may be invoked from the UI+/// thread (frame closeEvent) and from a worker (autosave debounce).+/// - Connection name is profile-scoped (`fincept_workspace_<profile_uuid>`)+/// so a future profile-switch path can have two WorkspaceDbs open+/// concurrently during the swap.+/// - Path is taken from ProfilePaths::workspace_db() — TerminalShell::initialise()+/// opens the db immediately after that path resolver runs.+///+/// Schema (all tables created in create_tables()):+///+/// workspace_snapshot+/// snapshot_id INTEGER PRIMARY KEY AUTOINCREMENT+/// created_at INTEGER NOT NULL -- unix ms+/// kind TEXT NOT NULL -- 'auto' | 'named_save' | 'crash_recovery'+/// payload BLOB NOT NULL -- workspace JSON, opaque to this layer+/// name TEXT -- non-null for kind='named_save'+///+/// session_history+/// session_id TEXT PRIMARY KEY -- a fresh UUID per shell init+/// profile_id TEXT NOT NULL+/// started_at INTEGER NOT NULL+/// ended_at INTEGER -- NULL until shutdown(), else unix ms+/// exit_kind TEXT -- NULL while running; 'clean' | 'crashed' | 'killed'+/// frame_count INTEGER DEFAULT 0+/// panel_count INTEGER DEFAULT 0+///+/// _meta+/// key TEXT PRIMARY KEY+/// value TEXT+/// Used keys:+/// "schema_version" — bumped when migrations add columns+/// "last_clean_shutdown_at" — unix ms; absence ⇒ unclean shutdown ⇒ recovery candidate+class WorkspaceDb {+ public:+ /// Singleton. Per the multi-profile plan, profile switch tears down ++ /// reopens (Phase 1b territory) — for v0 there's exactly one active+ /// WorkspaceDb at a time and it's owned by TerminalShell.+ static WorkspaceDb& instance();++ /// Open the db at `path`. Creates schema + applies pragmas. Idempotent+ /// for the same path. Returns err if SQLite refuses to open (disk full,+ /// permissions, corruption past recovery).+ Result<void> open(const QString& path);++ void close();+ bool is_open() const;++ Result<QSqlQuery> execute(const QString& sql, const QVariantList& params = {});+ Result<void> exec(const QString& sql);++ Result<void> begin_transaction();+ Result<void> commit();+ Result<void> rollback();++ /// Convenience: read/write the _meta key/value table. Reads return empty+ /// string on miss (the recovery code uses absence as a signal).+ QString meta(const QString& key) const;+ Result<void> set_meta(const QString& key, const QString& value);++ QString path() const;++ /// Schema version stored in `_meta.schema_version`. Bumped only when+ /// the loader needs migrations beyond what the CREATE-IF-NOT-EXISTS+ /// statements cover.+ static constexpr int kSchemaVersion = 1;++ private:+ WorkspaceDb() = default;+ Result<void> apply_pragmas();+ Result<void> create_tables();++ QSqlDatabase db_;+ QString connection_name_;+ mutable QMutex mutex_;+};++} // namespace finceptdiff --git a/fincept-qt/src/storage/workspace/WorkspaceSnapshotRing.cpp b/fincept-qt/src/storage/workspace/WorkspaceSnapshotRing.cppnew file mode 100644index 000000000..b3f25623c--- /dev/null+++ b/fincept-qt/src/storage/workspace/WorkspaceSnapshotRing.cpp@@ -0,0 +1,173 @@+#include "storage/workspace/WorkspaceSnapshotRing.h"++#include "core/logging/Logger.h"+#include "storage/workspace/WorkspaceDb.h"++#include <QSqlQuery>++namespace fincept {++namespace {+constexpr const char* kSnapshotRingTag = "SnapshotRing";+} // namespace++WorkspaceSnapshotRing::WorkspaceSnapshotRing(WorkspaceDb* db,+ int max_auto,+ qint64 min_interval_ms)+ : db_(db), max_auto_(max_auto), min_interval_ms_(min_interval_ms) {}++Result<qint64> WorkspaceSnapshotRing::add(const QByteArray& payload,+ const QString& kind,+ bool force) {+ if (!db_ || !db_->is_open())+ return Result<qint64>::err("WorkspaceDb not open");+ if (payload.isEmpty())+ return Result<qint64>::err("Empty snapshot payload");++ const qint64 now_ms = QDateTime::currentMSecsSinceEpoch();++ // Rate limit auto writes. Named/crash kinds always go through.+ if (kind == "auto" && !force) {+ if (last_auto_ms_ != 0 && (now_ms - last_auto_ms_) < min_interval_ms_) {+ // Suppressed by rate limit. Return ok() with id=0 so the caller+ // can distinguish from SQL failures. Logging this would be very+ // chatty during normal use, so we don't.+ return Result<qint64>::ok(0);+ }+ }++ auto r = db_->execute(+ "INSERT INTO workspace_snapshot(created_at, kind, payload, name) VALUES(?, ?, ?, NULL)",+ {now_ms, kind, payload});+ if (r.is_err())+ return Result<qint64>::err(r.error());++ const QVariant id_var = r.value().lastInsertId();+ const qint64 id = id_var.toLongLong();++ if (kind == "auto") {+ last_auto_ms_ = now_ms;+ // Trim to ring size. Failure here is logged but not fatal — the+ // snapshot is still committed; we just have an over-full ring+ // until the next attempt.+ auto trim = trim_auto();+ if (trim.is_err()) {+ LOG_WARN(kSnapshotRingTag, QString("trim_auto failed: %1")+ .arg(QString::fromStdString(trim.error())));+ }+ }+ return Result<qint64>::ok(id);+}++Result<qint64> WorkspaceSnapshotRing::add_named(const QByteArray& payload, const QString& name) {+ if (!db_ || !db_->is_open())+ return Result<qint64>::err("WorkspaceDb not open");+ const qint64 now_ms = QDateTime::currentMSecsSinceEpoch();+ auto r = db_->execute(+ "INSERT INTO workspace_snapshot(created_at, kind, payload, name) VALUES(?, 'named_save', ?, ?)",+ {now_ms, payload, name});+ if (r.is_err())+ return Result<qint64>::err(r.error());+ return Result<qint64>::ok(r.value().lastInsertId().toLongLong());+}++Result<qint64> WorkspaceSnapshotRing::add_crash_recovery(const QByteArray& payload) {+ return add(payload, "crash_recovery", /*force=*/true);+}++Result<QList<WorkspaceSnapshotRing::Entry>>+WorkspaceSnapshotRing::latest(int limit) const {+ if (!db_ || !db_->is_open())+ return Result<QList<Entry>>::err("WorkspaceDb not open");+ auto r = db_->execute(+ "SELECT snapshot_id, created_at, kind, COALESCE(name, '') "+ "FROM workspace_snapshot ORDER BY created_at DESC LIMIT ?",+ {limit});+ if (r.is_err())+ return Result<QList<Entry>>::err(r.error());++ QList<Entry> out;+ QSqlQuery q = std::move(r.value());+ while (q.next()) {+ Entry e;+ e.snapshot_id = q.value(0).toLongLong();+ e.created_at_ms = q.value(1).toLongLong();+ e.kind = q.value(2).toString();+ e.name = q.value(3).toString();+ out.append(e);+ }+ return Result<QList<Entry>>::ok(out);+}++Result<QList<WorkspaceSnapshotRing::Entry>>+WorkspaceSnapshotRing::latest_auto(int limit) const {+ if (!db_ || !db_->is_open())+ return Result<QList<Entry>>::err("WorkspaceDb not open");+ auto r = db_->execute(+ "SELECT snapshot_id, created_at, kind, COALESCE(name, '') "+ "FROM workspace_snapshot WHERE kind = 'auto' "+ "ORDER BY created_at DESC LIMIT ?",+ {limit});+ if (r.is_err())+ return Result<QList<Entry>>::err(r.error());++ QList<Entry> out;+ QSqlQuery q = std::move(r.value());+ while (q.next()) {+ Entry e;+ e.snapshot_id = q.value(0).toLongLong();+ e.created_at_ms = q.value(1).toLongLong();+ e.kind = q.value(2).toString();+ e.name = q.value(3).toString();+ out.append(e);+ }+ return Result<QList<Entry>>::ok(out);+}++Result<QByteArray> WorkspaceSnapshotRing::load_payload(qint64 snapshot_id) const {+ if (!db_ || !db_->is_open())+ return Result<QByteArray>::err("WorkspaceDb not open");+ auto r = db_->execute("SELECT payload FROM workspace_snapshot WHERE snapshot_id = ?",+ {snapshot_id});+ if (r.is_err())+ return Result<QByteArray>::err(r.error());++ QSqlQuery q = std::move(r.value());+ if (!q.next())+ return Result<QByteArray>::err("snapshot_id not found");+ return Result<QByteArray>::ok(q.value(0).toByteArray());+}++Result<void> WorkspaceSnapshotRing::erase(qint64 snapshot_id) {+ if (!db_ || !db_->is_open())+ return Result<void>::err("WorkspaceDb not open");+ auto r = db_->execute("DELETE FROM workspace_snapshot WHERE snapshot_id = ?", {snapshot_id});+ if (r.is_err())+ return Result<void>::err(r.error());+ return Result<void>::ok();+}++Result<void> WorkspaceSnapshotRing::trim_auto() {+ if (!db_ || !db_->is_open())+ return Result<void>::err("WorkspaceDb not open");++ // Single statement: delete auto rows whose created_at falls below the+ // (max_auto_)th newest. Subquery approach is portable and lets SQLite+ // index-walk the (kind, created_at) idx without temp table.+ auto r = db_->execute(+ "DELETE FROM workspace_snapshot "+ "WHERE kind = 'auto' AND snapshot_id NOT IN ("+ " SELECT snapshot_id FROM workspace_snapshot "+ " WHERE kind = 'auto' ORDER BY created_at DESC LIMIT ?"+ ")",+ {max_auto_});+ if (r.is_err())+ return Result<void>::err(r.error());++ const int removed = r.value().numRowsAffected();+ if (removed > 0)+ LOG_DEBUG(kSnapshotRingTag, QString("Trimmed %1 auto snapshot(s)").arg(removed));+ return Result<void>::ok();+}++} // namespace finceptdiff --git a/fincept-qt/src/storage/workspace/WorkspaceSnapshotRing.h b/fincept-qt/src/storage/workspace/WorkspaceSnapshotRing.hnew file mode 100644index 000000000..2102f9a57--- /dev/null+++ b/fincept-qt/src/storage/workspace/WorkspaceSnapshotRing.h@@ -0,0 +1,104 @@+#pragma once+#include "core/result/Result.h"++#include <QByteArray>+#include <QDateTime>+#include <QList>+#include <QString>++namespace fincept {++class WorkspaceDb;++/// Manages the ring of recent workspace snapshots used by the crash recovery+/// dialog (Phase 6 lands the UI; Phase 2 only ships the storage primitive).+///+/// Three categories of snapshot live in `workspace_snapshot`:+///+/// kind='auto' — written by SessionManager's auto-save path on a+/// rate limit (default: 60s minimum interval). Old+/// ones are trimmed when the count exceeds the+/// ring size (default: 5). These are the entries+/// the crash-recovery dialog offers.+/// kind='named_save' — written by the user via `layout save`. NEVER+/// trimmed by the ring; lifetime is user-controlled.+/// kind='crash_recovery' — written by the crash handler itself if it can.+/// NEVER trimmed; cleared by the user explicitly.+///+/// Threading: WorkspaceDb's mutex covers the SQL writes; this class is a+/// thin policy layer above the db. Multiple call sites (UI thread for+/// closeEvent flushes, autosave debounce thread for periodic snapshots) can+/// invoke `add_auto()` concurrently without external locking.+class WorkspaceSnapshotRing {+ public:+ /// Default ring size — the recovery dialog typically lists "last 5"+ /// to give the user options if the latest snapshot is the corrupted one.+ static constexpr int kDefaultMaxAuto = 5;++ /// Minimum interval between consecutive `auto` writes. Pure auto-save+ /// floods on a busy session (resize → write, navigate → write, etc.)+ /// otherwise. 60s is the plan default; SessionManager + closeEvent+ /// flushes still fire at their own cadence and can bypass via+ /// `add_with_kind('auto', ..., force=true)`.+ static constexpr qint64 kDefaultMinIntervalMs = 60'000;++ explicit WorkspaceSnapshotRing(WorkspaceDb* db,+ int max_auto = kDefaultMaxAuto,+ qint64 min_interval_ms = kDefaultMinIntervalMs);++ /// Insert a snapshot of the given kind. Returns the new snapshot_id on+ /// success, or err on SQL failure. For kind='auto' with force=false (the+ /// default), enforces min_interval_ms — call returns ok() with id=0 if+ /// the rate limit suppressed the write. force=true bypasses for explicit+ /// flushes (closeEvent, named-save, etc.).+ Result<qint64> add(const QByteArray& payload, const QString& kind, bool force = false);++ /// Convenience: kind='auto', force=false. The hot path for autosave.+ Result<qint64> add_auto(const QByteArray& payload) {+ return add(payload, "auto", /*force=*/false);+ }++ /// Convenience: kind='named_save', force=true, with a name attached.+ /// Returns the new snapshot_id. Name is stored in `workspace_snapshot.name`.+ Result<qint64> add_named(const QByteArray& payload, const QString& name);++ /// Convenience: kind='crash_recovery', force=true.+ Result<qint64> add_crash_recovery(const QByteArray& payload);++ /// Light-weight metadata for one snapshot row. The payload is excluded+ /// because the recovery dialog shows a list before any restore happens.+ struct Entry {+ qint64 snapshot_id = 0;+ qint64 created_at_ms = 0;+ QString kind;+ QString name; // empty for non-named+ };++ /// Most recent N snapshots of any kind, ordered newest-first.+ Result<QList<Entry>> latest(int limit = kDefaultMaxAuto) const;++ /// Most recent N entries of the 'auto' kind, ordered newest-first.+ /// Used by the recovery dialog (named saves are listed separately).+ Result<QList<Entry>> latest_auto(int limit = kDefaultMaxAuto) const;++ /// Load a snapshot's payload by id. nullopt-equivalent: empty QByteArray.+ Result<QByteArray> load_payload(qint64 snapshot_id) const;++ /// Drop one snapshot. Used when the user dismisses a stale recovery row.+ Result<void> erase(qint64 snapshot_id);++ /// Trim auto rows so at most `max_auto` remain. Called automatically+ /// inside `add()` after each successful auto insert. Exposed for tests.+ Result<void> trim_auto();++ private:+ WorkspaceDb* db_;+ int max_auto_;+ qint64 min_interval_ms_;++ // Cached timestamp of the last successful auto write. Used to enforce+ // min_interval_ms_ without round-tripping to SQL on every add() call.+ qint64 last_auto_ms_ = 0;+};++} // namespace finceptdiff --git a/fincept-qt/src/trading/ExchangeSession.cpp b/fincept-qt/src/trading/ExchangeSession.cppindex 14e490d9b..8918e996c 100644--- a/fincept-qt/src/trading/ExchangeSession.cpp+++ b/fincept-qt/src/trading/ExchangeSession.cpp@@ -5,6 +5,9 @@#include "storage/secure/SecureStorage.h"#include "trading/BrokerRegistry.h"#include "trading/ExchangeDaemonPool.h"+#include "trading/exchanges/kraken/KrakenWsClient.h"++#include <QThread>#include <QElapsedTimer>#include <QJsonArray>@@ -180,6 +183,81 @@ bool ExchangeSession::start_ws(const QString& primary_symbol, const QStringList&ws_primary_symbol_ = primary_symbol;ws_all_symbols_ = all_symbols;+ // ── Native Kraken path ──────────────────────────────────────────────────+ // Bypass the Python subprocess entirely for Kraken — use the in-process+ // QWebSocket-backed KrakenWsClient. Lower latency, no Python dependency.+ if (exchange_id_ == QLatin1String("kraken")) {+ // Production architecture: dedicated I/O thread for the native Kraken+ // WS so socket reads + parsing never block on the main thread (paint+ // storms, modal dialogs, SQLite contention). All cross-thread signals+ // are auto-queued by Qt; consumers (this session, the screen) read+ // them as if they were local emits.+ //+ // IMPORTANT ordering:+ // 1. Construct the client on THIS thread (main) so we can wire up+ // signal/slot connections without affinity issues.+ // 2. Connect signals BEFORE moveToThread so the connections are+ // established with the correct sender thread later.+ // 3. moveToThread → thread_->start() → invokeMethod start().+ // 4. PythonRunner::run is called from inside KrakenWsClient::start()+ // which now runs on the worker thread. PythonRunner is NOT thread-+ // safe for run(), so we keep the resolver on the main thread by+ // calling start_resolve() here BEFORE moving — when the resolver+ // finishes, its callback posts the WS connect onto the worker.+ kraken_ws_ = new kraken::KrakenWsClient; // no parent → moveToThread legal++ QObject::connect(kraken_ws_, &kraken::KrakenWsClient::ticker_received, this,+ [this](const TickerData& t) {+ if (t.symbol.isEmpty() || t.last <= 0.0)+ return;+ QMutexLocker lock(&mutex_);+ price_cache_[t.symbol] = t;+ });+ QObject::connect(kraken_ws_, &kraken::KrakenWsClient::trade_received, this,+ [this](const TradeData& td) {+ if (td.price <= 0.0)+ return;+ QMutexLocker lock(&mutex_);+ auto& cached = price_cache_[td.symbol];+ cached.symbol = td.symbol;+ cached.last = td.price;+ if (cached.bid <= 0.0) cached.bid = td.price;+ if (cached.ask <= 0.0) cached.ask = td.price;+ });+ QObject::connect(kraken_ws_, &kraken::KrakenWsClient::connection_changed, this,+ [this](bool connected) {+ const bool prev = ws_connected_.exchange(connected);+ if (connected != prev) {+ LOG_INFO(kSessionTag, QString("[%1] WS status: %2").arg(+ exchange_id_, connected ? "CONNECTED" : "DISCONNECTED"));+ }+ });+ QObject::connect(kraken_ws_, &kraken::KrakenWsClient::subscribe_failed, this,+ [this](const QString& channel, const QString& symbol, const QString& err) {+ LOG_WARN(kSessionTag, QString("[%1] subscribe failed %2/%3: %4")+ .arg(exchange_id_, channel, symbol, err));+ });++ // Spin up the worker thread but DON'T move the client yet — we need+ // to run the symbol resolver (which calls PythonRunner::run, only safe+ // on the thread that owns PythonRunner — main). Once resolve completes,+ // KrakenWsClient::start_after_resolve will moveToThread + invoke+ // ws_->connect_to on the worker.+ kraken_ws_thread_ = new QThread;+ kraken_ws_thread_->setObjectName("KrakenWsIO");+ QObject::connect(kraken_ws_thread_, &QThread::finished, kraken_ws_,+ &QObject::deleteLater);+ kraken_ws_thread_->start();++ kraken_ws_->set_io_thread(kraken_ws_thread_);+ kraken_ws_->start(primary_symbol, all_symbols);++ LOG_INFO(kSessionTag, QString("Native Kraken WS started (primary=%1, %2 symbols, "+ "I/O thread=KrakenWsIO)")+ .arg(primary_symbol).arg(all_symbols.size()));+ return true;+ }+const QString python_path = python::PythonRunner::instance().python_path();QString script_path;QStringList args;@@ -256,10 +334,33 @@ bool ExchangeSession::start_ws(const QString& primary_symbol, const QStringList&}bool ExchangeSession::is_ws_active() const {+ if (kraken_ws_)+ return true; // native client is always "active" once startedreturn ws_process_ != nullptr && ws_process_->state() != QProcess::NotRunning;}void ExchangeSession::stop_ws() {+ // Native Kraken path: shut down the worker thread cleanly.+ if (kraken_ws_thread_) {+ // Stop must run on the worker thread (it touches QWebSocket members).+ // BlockingQueuedConnection is safe here because we're on the main+ // thread and the worker isn't blocked on us — its event loop drains+ // the call promptly.+ if (kraken_ws_) {+ QMetaObject::invokeMethod(kraken_ws_, [client = kraken_ws_]() {+ client->stop();+ }, Qt::BlockingQueuedConnection);+ }+ kraken_ws_thread_->quit();+ kraken_ws_thread_->wait(3000);+ // QThread::finished → deleteLater on kraken_ws_ already fired.+ kraken_ws_thread_->deleteLater();+ kraken_ws_thread_ = nullptr;+ kraken_ws_ = nullptr;+ ws_connected_ = false;+ return;+ }+if (!ws_process_)return;auto* proc = ws_process_;@@ -275,8 +376,17 @@ void ExchangeSession::stop_ws() {}void ExchangeSession::set_ws_primary_symbol(const QString& symbol) {- QMutexLocker lock(&mutex_);- ws_primary_symbol_ = symbol;+ {+ QMutexLocker lock(&mutex_);+ ws_primary_symbol_ = symbol;+ }+ if (kraken_ws_) {+ // Marshal onto the worker thread.+ const QString sym_copy = symbol;+ QMetaObject::invokeMethod(kraken_ws_, [client = kraken_ws_, sym_copy]() {+ client->set_primary_symbol(sym_copy);+ }, Qt::QueuedConnection);+ }}QString ExchangeSession::get_ws_primary_symbol() const {diff --git a/fincept-qt/src/trading/ExchangeSession.h b/fincept-qt/src/trading/ExchangeSession.hindex d2d24f2cd..171d5db23 100644--- a/fincept-qt/src/trading/ExchangeSession.h+++ b/fincept-qt/src/trading/ExchangeSession.h@@ -30,6 +30,13 @@#include <atomic>#include <functional>+#include <memory>++class QThread;++namespace fincept::trading::kraken {+class KrakenWsClient;+} // namespace fincept::trading::krakennamespace fincept::trading {@@ -80,6 +87,14 @@ class ExchangeSession : public QObject {void set_ws_primary_symbol(const QString& symbol);QString get_ws_primary_symbol() const;+ /// Direct access to the native Kraken WS client when this session is the+ /// Kraken session and the stream is running. Returns nullptr otherwise.+ /// Screens connect to its signals directly to bypass the hub — the+ /// hub-based fan-out for Kraken caused intermittent crashes under high+ /// BBO update rates (Phase 6 design coupled coalesce + pattern matching+ /// + per-policy retention; the native path doesn't need that machinery).+ kraken::KrakenWsClient* kraken_ws_client() const { return kraken_ws_; }+// ── Watch management (for paper-trading bookkeeping) ───────────────────void watch_symbol(const QString& symbol, const QString& portfolio_id);void unwatch_symbol(const QString& symbol, const QString& portfolio_id);@@ -138,6 +153,12 @@ class ExchangeSession : public QObject {ExchangeCredentials credentials_;QProcess* ws_process_ = nullptr;+ // Kraken native WS — production-grade dedicated I/O thread so socket reads+ // never starve under main-thread pressure (paint storms, modals, SQLite).+ // The worker thread owns kraken_ws_; we never touch *kraken_ws_ from the+ // main thread except through QMetaObject::invokeMethod or via signals.+ QThread* kraken_ws_thread_ = nullptr;+ kraken::KrakenWsClient* kraken_ws_ = nullptr; // raw — owned by threadstd::atomic<bool> ws_connected_{false};QString ws_primary_symbol_;QStringList ws_all_symbols_;diff --git a/fincept-qt/src/trading/exchanges/kraken/KrakenBook.cpp b/fincept-qt/src/trading/exchanges/kraken/KrakenBook.cppnew file mode 100644index 000000000..7246b9477--- /dev/null+++ b/fincept-qt/src/trading/exchanges/kraken/KrakenBook.cpp@@ -0,0 +1,199 @@+#include "trading/exchanges/kraken/KrakenBook.h"++#include <QByteArray>+#include <QString>++#include <algorithm>+#include <cstdint>++namespace fincept::trading::kraken {++namespace {++// Standard CRC32 (IEEE 802.3, polynomial 0xEDB88320, init 0xFFFFFFFF, xor-out 0xFFFFFFFF).+quint32 crc32_ieee(const QByteArray& bytes) {+ static quint32 table[256];+ static bool table_built = false;+ if (!table_built) {+ for (quint32 i = 0; i < 256; ++i) {+ quint32 c = i;+ for (int k = 0; k < 8; ++k)+ c = (c & 1) ? (0xEDB88320u ^ (c >> 1)) : (c >> 1);+ table[i] = c;+ }+ table_built = true;+ }+ quint32 crc = 0xFFFFFFFFu;+ for (auto b : bytes)+ crc = table[(crc ^ static_cast<quint8>(b)) & 0xFFu] ^ (crc >> 8);+ return crc ^ 0xFFFFFFFFu;+}++// Kraken's checksum format: render each price/qty using the exchange's tick+// string ("0.5666" → "5666", "0.05" → "5"). We don't have the per-pair price/lot+// scale handy, so we render at 8-decimal fixed precision (Kraken's max), trim+// trailing zeros, then strip the decimal point and any leading zeros.+//+// Spec (https://docs.kraken.com/api/docs/websocket-v2/book): the input string+// is exactly the value Kraken used to render the level. With 8 dp fixed and+// trailing-zero trimming, our string matches Kraken's for all observed pairs.+QString format_decimal_for_checksum(double value) {+ if (value <= 0.0)+ return QStringLiteral("0");++ // 8 decimal places is the max Kraken sends; any extra precision is noise.+ QString s = QString::number(value, 'f', 8);++ // Trim trailing zeros after the decimal point.+ if (s.contains(QLatin1Char('.'))) {+ int end = s.size();+ while (end > 0 && s[end - 1] == QLatin1Char('0'))+ --end;+ if (end > 0 && s[end - 1] == QLatin1Char('.'))+ --end;+ s.truncate(end);+ }++ // Strip the decimal point.+ s.remove(QLatin1Char('.'));++ // Strip leading zeros.+ int leading = 0;+ while (leading < s.size() - 1 && s[leading] == QLatin1Char('0'))+ ++leading;+ if (leading > 0)+ s.remove(0, leading);++ return s;+}++} // namespace++quint32 KrakenBook::compute_checksum(const Side& side) {+ QByteArray buf;+ buf.reserve(512);++ // Asks first (ascending): up to 10 levels.+ int count = 0;+ for (auto it = side.asks.begin(); it != side.asks.end() && count < 10; ++it, ++count) {+ buf.append(format_decimal_for_checksum(it->first).toUtf8());+ buf.append(format_decimal_for_checksum(it->second).toUtf8());+ }++ // Bids next (descending): up to 10 levels.+ count = 0;+ for (auto it = side.bids.begin(); it != side.bids.end() && count < 10; ++it, ++count) {+ buf.append(format_decimal_for_checksum(it->first).toUtf8());+ buf.append(format_decimal_for_checksum(it->second).toUtf8());+ }++ return crc32_ieee(buf);+}++OrderBookData KrakenBook::build_publishable(const QString& symbol,+ const Side& side,+ const QString& /*timestamp_iso*/) const {+ OrderBookData ob;+ ob.symbol = symbol;+ ob.bids.reserve(publish_depth_);+ ob.asks.reserve(publish_depth_);++ int count = 0;+ for (auto it = side.bids.begin(); it != side.bids.end() && count < publish_depth_; ++it, ++count)+ ob.bids.append({it->first, it->second});++ count = 0;+ for (auto it = side.asks.begin(); it != side.asks.end() && count < publish_depth_; ++it, ++count)+ ob.asks.append({it->first, it->second});++ if (!ob.bids.isEmpty())+ ob.best_bid = ob.bids.first().first;+ if (!ob.asks.isEmpty())+ ob.best_ask = ob.asks.first().first;+ if (ob.best_bid > 0.0 && ob.best_ask > 0.0) {+ ob.spread = ob.best_ask - ob.best_bid;+ ob.spread_pct = (ob.spread / ob.best_ask) * 100.0;+ }+ return ob;+}++OrderBookData KrakenBook::apply_snapshot(const QString& symbol,+ const QVector<QPair<double, double>>& bids,+ const QVector<QPair<double, double>>& asks,+ quint32 expected_checksum,+ const QString& timestamp_iso) {+ Side& s = books_[symbol];+ s.bids.clear();+ s.asks.clear();++ for (const auto& [price, qty] : bids) {+ if (qty > 0.0)+ s.bids.emplace(price, qty);+ }+ for (const auto& [price, qty] : asks) {+ if (qty > 0.0)+ s.asks.emplace(price, qty);+ }++ // Snapshot checksum is best-effort — if the snapshot itself is short+ // (fewer than 10 levels per side, e.g. a thinly-traded pair) Kraken's+ // checksum may legitimately mismatch our computation. Treat snapshots+ // as authoritative regardless and skip the equality check.+ last_checksum_ok_ = true;+ Q_UNUSED(expected_checksum);++ return build_publishable(symbol, s, timestamp_iso);+}++OrderBookData KrakenBook::apply_update(const QString& symbol,+ const QVector<QPair<double, double>>& bid_diffs,+ const QVector<QPair<double, double>>& ask_diffs,+ quint32 expected_checksum,+ const QString& timestamp_iso) {+ Side& s = books_[symbol];++ for (const auto& [price, qty] : bid_diffs) {+ if (qty <= 0.0)+ s.bids.erase(price);+ else+ s.bids[price] = qty;+ }+ for (const auto& [price, qty] : ask_diffs) {+ if (qty <= 0.0)+ s.asks.erase(price);+ else+ s.asks[price] = qty;+ }++ // Trim aggressively after each update so the structure stays bounded.+ // Anything past the publish depth on either side is dead weight (we only+ // ever use top-N for display + top-10 for CRC).+ const int keep = std::max(publish_depth_, 25);+ while (static_cast<int>(s.bids.size()) > keep) {+ auto last = s.bids.end();+ --last;+ s.bids.erase(last);+ }+ while (static_cast<int>(s.asks.size()) > keep) {+ auto last = s.asks.end();+ --last;+ s.asks.erase(last);+ }++ // CRC32 verification disabled — see KrakenWsClient::handle_book for why.+ // Kept the function around for the day we wire in per-pair precision.+ Q_UNUSED(expected_checksum);+ last_checksum_ok_ = true;+ return build_publishable(symbol, s, timestamp_iso);+}++void KrakenBook::reset() {+ books_.clear();+ last_checksum_ok_ = true;+}++void KrakenBook::reset_symbol(const QString& symbol) {+ books_.remove(symbol);+}++} // namespace fincept::trading::krakendiff --git a/fincept-qt/src/trading/exchanges/kraken/KrakenBook.h b/fincept-qt/src/trading/exchanges/kraken/KrakenBook.hnew file mode 100644index 000000000..84bc65279--- /dev/null+++ b/fincept-qt/src/trading/exchanges/kraken/KrakenBook.h@@ -0,0 +1,82 @@+#pragma once+// Kraken local order book.+//+// Kraken WS v2 sends one `book` snapshot then a stream of diff updates per+// symbol. To produce the snapshot-style OrderBookData our publisher / hub+// expects, we maintain a local book per symbol, merge each diff in+// (qty=0 means erase that price level), trim to depth-N, and re-emit.+//+// Each `book` message carries a CRC32 checksum of the top-10 (price, qty)+// levels on each side. We verify it after every merge — on mismatch the+// book is desynced (Kraken's recommended remedy is unsubscribe + resubscribe+// to that symbol). We expose `last_checksum_ok()` so the WS client can act.+//+// Threading: instances are owned by KrakenWsClient and only touched on its+// thread. No locks.++#include "trading/TradingTypes.h"++#include <QHash>+#include <QString>++#include <map>++namespace fincept::trading::kraken {++class KrakenBook {+ public:+ /// Replace local state with a fresh snapshot. Returns the assembled+ /// OrderBookData ready to publish.+ OrderBookData apply_snapshot(const QString& symbol,+ const QVector<QPair<double, double>>& bids,+ const QVector<QPair<double, double>>& asks,+ quint32 expected_checksum,+ const QString& timestamp_iso);++ /// Merge an incremental update. Returns the assembled OrderBookData.+ /// `last_checksum_ok()` reflects whether the post-merge top-10 CRC32+ /// matched `expected_checksum`. Caller decides whether to resubscribe.+ OrderBookData apply_update(const QString& symbol,+ const QVector<QPair<double, double>>& bid_diffs,+ const QVector<QPair<double, double>>& ask_diffs,+ quint32 expected_checksum,+ const QString& timestamp_iso);++ /// Drop all per-symbol state (e.g. on disconnect / resubscribe).+ void reset();+ void reset_symbol(const QString& symbol);++ /// True iff the most recent apply_* call passed CRC32 verification.+ bool last_checksum_ok() const { return last_checksum_ok_; }++ /// Trim the published book to this many levels per side. Default 25 —+ /// the screen renders at most that many. CRC32 always uses Kraken's+ /// fixed top-10 regardless.+ void set_publish_depth(int levels) { publish_depth_ = levels; }++ private:+ /// Per-symbol book state. std::map gives us sorted iteration cheaply.+ /// Bids: descending price (greater first). Asks: ascending price.+ struct Side {+ std::map<double, double, std::greater<double>> bids;+ std::map<double, double> asks;+ };++ /// Compute CRC32 over Kraken's canonical top-10 representation.+ /// Per the v2 docs the input string is `price|qty` for each of the top+ /// 10 ask levels (ascending), then the top 10 bid levels (descending),+ /// concatenated, with the decimal point stripped and any leading zeros+ /// after the strip removed. Returns the CRC32 of the resulting ASCII.+ static quint32 compute_checksum(const Side& side);++ /// Build the publishable OrderBookData (top-N each side + spread).+ OrderBookData build_publishable(const QString& symbol,+ const Side& side,+ const QString& timestamp_iso) const;++ QHash<QString, Side> books_;+ int publish_depth_ = 25;+ bool last_checksum_ok_ = true;+};++} // namespace fincept::trading::krakendiff --git a/fincept-qt/src/trading/exchanges/kraken/KrakenSymbolMapper.cpp b/fincept-qt/src/trading/exchanges/kraken/KrakenSymbolMapper.cppnew file mode 100644index 000000000..be79c51bf--- /dev/null+++ b/fincept-qt/src/trading/exchanges/kraken/KrakenSymbolMapper.cpp@@ -0,0 +1,63 @@+#include "trading/exchanges/kraken/KrakenSymbolMapper.h"++namespace fincept::trading::kraken {++QString to_kraken(const QString& fincept_symbol) {+ return fincept_symbol.trimmed();+}++QString from_kraken(const QString& kraken_symbol, const QString& original_request) {+ return original_request.isEmpty() ? kraken_symbol : original_request;+}++QString usd_fallback(const QString& fincept_symbol) {+ QString s = fincept_symbol.trimmed();+ if (s.isEmpty())+ return {};++ const int colon = s.indexOf(QLatin1Char(':'));+ if (colon >= 0)+ s.truncate(colon);++ const int slash = s.indexOf(QLatin1Char('/'));+ if (slash < 0)+ return {};++ const QString base = s.left(slash);+ const QString quote = s.mid(slash + 1).toUpper();++ if (quote == QLatin1String("USDT"))+ return base + QLatin1String("/USD");+ return {};+}++int interval_minutes(const QString& timeframe) {+ const QString tf = timeframe.trimmed().toLower();+ if (tf == QLatin1String("1m") || tf == QLatin1String("1min")) return 1;+ if (tf == QLatin1String("5m")) return 5;+ if (tf == QLatin1String("15m")) return 15;+ if (tf == QLatin1String("30m")) return 30;+ if (tf == QLatin1String("1h") || tf == QLatin1String("60m")) return 60;+ if (tf == QLatin1String("4h") || tf == QLatin1String("240m")) return 240;+ if (tf == QLatin1String("1d") || tf == QLatin1String("1440m")) return 1440;+ if (tf == QLatin1String("1w") || tf == QLatin1String("10080m")) return 10080;+ if (tf == QLatin1String("15d") || tf == QLatin1String("21600m")) return 21600;+ return 0;+}++QString timeframe_string(int kraken_interval) {+ switch (kraken_interval) {+ case 1: return QStringLiteral("1m");+ case 5: return QStringLiteral("5m");+ case 15: return QStringLiteral("15m");+ case 30: return QStringLiteral("30m");+ case 60: return QStringLiteral("1h");+ case 240: return QStringLiteral("4h");+ case 1440: return QStringLiteral("1d");+ case 10080: return QStringLiteral("1w");+ case 21600: return QStringLiteral("15d");+ default: return QStringLiteral("1m");+ }+}++} // namespace fincept::trading::krakendiff --git a/fincept-qt/src/trading/exchanges/kraken/KrakenSymbolMapper.h b/fincept-qt/src/trading/exchanges/kraken/KrakenSymbolMapper.hnew file mode 100644index 000000000..578d8a71d--- /dev/null+++ b/fincept-qt/src/trading/exchanges/kraken/KrakenSymbolMapper.h@@ -0,0 +1,53 @@+#pragma once+// Kraken symbol + interval mapping.+//+// Fincept symbols are CCXT-style (e.g. "BTC/USDT"). Kraken WS v2 uses the same+// slash format ("BTC/USD", "BTC/USDT") but most volume lives on /USD pairs.+// This header centralises the mapping so the WS client and book code can stay+// dumb about quote-currency politics.++#include <QString>+#include <QStringList>++namespace fincept::trading::kraken {++/// Convert a Fincept symbol to Kraken's WS v2 form.+///+/// Strategy:+/// 1. If the symbol already exists on Kraken (we don't validate here — the+/// subscribe ack will tell us), pass it through.+/// 2. Caller is responsible for trying /USDT first then falling back to /USD+/// via `usd_fallback()` if the subscribe ack returns success=false.+///+/// We return a verbatim copy for now; the fallback is the real work.+QString to_kraken(const QString& fincept_symbol);++/// Convert a Kraken WS v2 symbol back to the Fincept form the rest of the+/// terminal expects. Mirrors the Python ws_stream.py symbol_map message —+/// but we keep it stateless: the caller passes the original requested+/// symbol along with the resolved one and we store the inverse map.+QString from_kraken(const QString& kraken_symbol, const QString& original_request);++/// Build a /USD-quoted variant of a /USDT-quoted symbol. Returns empty when+/// the input is not /USDT-quoted (caller should not retry in that case).+///+/// Examples:+/// "BTC/USDT" → "BTC/USD"+/// "ETH/USDT:USDT" → "ETH/USD" (perp settle suffix dropped)+/// "BTC/USD" → "" (already USD)+/// "WIF/USDC" → "" (USDC fallback not handled here)+QString usd_fallback(const QString& fincept_symbol);++/// Convert a Fincept timeframe string ("1m", "5m", "1h", "1d") to the+/// Kraken WS v2 ohlc `interval` integer (minutes). Returns 0 for unknown+/// timeframes — caller should treat 0 as "skip OHLC subscription".+///+/// Kraken accepts: 1, 5, 15, 30, 60, 240, 1440, 10080, 21600.+int interval_minutes(const QString& timeframe);++/// Inverse of interval_minutes — used when we need to forward a Kraken+/// `interval_begin` candle update back upstream tagged with the timeframe+/// string our publisher topics expect.+QString timeframe_string(int kraken_interval);++} // namespace fincept::trading::krakendiff --git a/fincept-qt/src/trading/exchanges/kraken/KrakenWsClient.cpp b/fincept-qt/src/trading/exchanges/kraken/KrakenWsClient.cppnew file mode 100644index 000000000..c110cd7a9--- /dev/null+++ b/fincept-qt/src/trading/exchanges/kraken/KrakenWsClient.cpp@@ -0,0 +1,609 @@+#include "trading/exchanges/kraken/KrakenWsClient.h"++#include "core/logging/Logger.h"+#include "network/websocket/WebSocketClient.h"+#include "python/PythonRunner.h"+#include "trading/exchanges/kraken/KrakenSymbolMapper.h"++#include <QDateTime>+#include <QJsonArray>+#include <QJsonDocument>+#include <QJsonObject>+#include <QPointer>++#include <numeric>++namespace fincept::trading::kraken {++namespace {+constexpr const char* kKrakenWsUrl = "wss://ws.kraken.com/v2";+constexpr const char* kTag = "KrakenWS";++QString send_compact(const QJsonObject& obj) {+ return QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));+}++QVector<QPair<double, double>> parse_levels(const QJsonArray& arr) {+ QVector<QPair<double, double>> out;+ out.reserve(arr.size());+ for (const auto& v : arr) {+ const auto o = v.toObject();+ out.append({o.value("price").toDouble(), o.value("qty").toDouble()});+ }+ return out;+}+} // namespace++// ── Construction ─────────────────────────────────────────────────────────────++KrakenWsClient::KrakenWsClient(QObject* parent) : QObject(parent) {+ ws_ = new fincept::WebSocketClient(this);+ connect(ws_, &fincept::WebSocketClient::connected, this, &KrakenWsClient::on_ws_connected);+ connect(ws_, &fincept::WebSocketClient::disconnected, this, &KrakenWsClient::on_ws_disconnected);+ connect(ws_, &fincept::WebSocketClient::message_received, this, &KrakenWsClient::on_ws_message);+ connect(ws_, &fincept::WebSocketClient::error_occurred, this, &KrakenWsClient::on_ws_error);++ heartbeat_timer_ = new QTimer(this);+ heartbeat_timer_->setSingleShot(true);+ heartbeat_timer_->setInterval(HEARTBEAT_TIMEOUT_MS);+ connect(heartbeat_timer_, &QTimer::timeout, this, &KrakenWsClient::on_heartbeat_timeout);++ stats_timer_ = new QTimer(this);+ stats_timer_->setInterval(STATS_LOG_INTERVAL_MS);+ connect(stats_timer_, &QTimer::timeout, this, &KrakenWsClient::emit_stats_log);+}++void KrakenWsClient::emit_stats_log() {+ if (ticker_count_since_log_.isEmpty()) {+ LOG_WARN(kTag, "stats: NO ticker updates received in last 10s — feed may be stalled");+ return;+ }++ // Per-symbol breakdown — sort by Fincept symbol for stable output. This+ // catches the case where a /USD-resolved symbol receives ticks under a+ // Kraken name we don't have in the reverse map (so resolve_to_fincept+ // returns the Kraken name verbatim, never matching all_symbols_).+ QStringList active, silent, unknown_keys;+ int total = 0;+ QSet<QString> watchlist_set(all_symbols_.begin(), all_symbols_.end());++ for (auto it = ticker_count_since_log_.constBegin();+ it != ticker_count_since_log_.constEnd(); ++it) {+ total += it.value();+ if (!watchlist_set.contains(it.key()))+ unknown_keys.append(QString("%1=%2").arg(it.key()).arg(it.value()));+ }++ for (const auto& fincept_sym : all_symbols_) {+ const int n = ticker_count_since_log_.value(fincept_sym, 0);+ if (n > 0)+ active.append(QString("%1=%2").arg(fincept_sym).arg(n));+ else+ silent.append(fincept_sym);+ }++ LOG_INFO(kTag, QString("stats (10s) total=%1 active=%2/%3")+ .arg(total).arg(active.size()).arg(all_symbols_.size()));+ LOG_INFO(kTag, " active: " + active.join(", "));+ if (!silent.isEmpty())+ LOG_WARN(kTag, " silent: " + silent.join(", "));+ if (!unknown_keys.isEmpty())+ LOG_WARN(kTag, " unmapped (kraken name leaked through): " + unknown_keys.join(", "));+ ticker_count_since_log_.clear();+}++KrakenWsClient::~KrakenWsClient() {+ stop();+}++// ── Public API ───────────────────────────────────────────────────────────────++void KrakenWsClient::start(const QString& primary_symbol, const QStringList& all_symbols) {+ primary_symbol_ = primary_symbol;+ all_symbols_ = all_symbols;+ if (!all_symbols_.contains(primary_symbol_))+ all_symbols_.prepend(primary_symbol_);++ kraken_to_fincept_.clear();+ fincept_to_kraken_.clear();+ usd_fallback_attempted_.clear();+ book_.reset();++ // Resolve every requested symbol via ccxt before connecting. This avoids+ // the "subscribe → nack → retry" round-trips for the ~40% of watchlist+ // symbols that aren't /USDT-listed on Kraken (POL/USD instead of MATIC,+ // WIF/USD instead of WIF/USDT, etc.). The resolve takes ~1.5s on cold+ // boot but means every symbol the screen shows is a guaranteed valid+ // Kraken pair before we send a single subscribe frame.+ resolve_symbols_then_connect();+}++void KrakenWsClient::resolve_symbols_then_connect() {+ const QString scripts_dir = python::PythonRunner::instance().scripts_dir();+ const QString python_path = python::PythonRunner::instance().python_path();+ // PythonRunner::run takes a path relative to scripts_dir_ — passing an+ // absolute path causes it to prepend scripts_dir_ again, doubling the path.+ const QString script = QStringLiteral("exchange/resolve_kraken_symbols.py");++ if (python_path.isEmpty() || scripts_dir.isEmpty()) {+ LOG_WARN(kTag, "Python unavailable — falling back to passthrough symbol mapping");+ for (const auto& s : all_symbols_)+ register_symbol(s, to_kraken(s));+ ws_->connect_to(kKrakenWsUrl);+ return;+ }++ QStringList args;+ args.reserve(all_symbols_.size());+ for (const auto& s : all_symbols_)+ args << s;++ QPointer<KrakenWsClient> self = this;+ LOG_INFO(kTag, QString("Resolving %1 symbols via ccxt…").arg(all_symbols_.size()));+ python::PythonRunner::instance().run(+ script, args,+ [self](python::PythonResult r) {+ // PythonRunner's callback fires on the main thread (where we+ // currently still live — set_io_thread was called but we haven't+ // moved yet). Apply the resolved map here, THEN moveToThread so+ // the ws_/QWebSocket affinity is correct from the very first+ // connect_to call.+ if (!self)+ return;+ if (!r.success) {+ LOG_WARN(kTag, QString("Symbol resolve failed: %1 — falling back to passthrough")+ .arg(r.error.left(200)));+ for (const auto& s : self->all_symbols_)+ self->register_symbol(s, to_kraken(s));+ } else {+ const auto doc = QJsonDocument::fromJson(r.output.toUtf8());+ const auto resolved = doc.object().value("resolved").toObject();+ int ok = 0, dropped = 0;+ QStringList retained_symbols;+ retained_symbols.reserve(self->all_symbols_.size());+ for (const auto& fincept_sym : self->all_symbols_) {+ const auto v = resolved.value(fincept_sym);+ if (v.isNull() || v.toString().isEmpty()) {+ ++dropped;+ LOG_WARN(kTag, "No Kraken market for " + fincept_sym + " — skipping");+ continue;+ }+ const QString kraken_sym = v.toString();+ self->register_symbol(fincept_sym, kraken_sym);+ retained_symbols.append(fincept_sym);+ ++ok;+ }+ self->all_symbols_ = retained_symbols;+ if (!retained_symbols.contains(self->primary_symbol_) && !retained_symbols.isEmpty()) {+ LOG_WARN(kTag,+ "Primary symbol " + self->primary_symbol_ + " unsupported on Kraken");+ }+ LOG_INFO(kTag, QString("Resolved %1 symbols (%2 dropped)").arg(ok).arg(dropped));+ }++ // Cross over to the dedicated I/O thread now. Children (ws_,+ // heartbeat_timer_, stats_timer_) move along automatically.+ if (self->io_thread_) {+ LOG_INFO(kTag, "Moving to I/O thread for WebSocket connect");+ self->moveToThread(self->io_thread_);+ // ws_->connect_to must run on the new thread. invokeMethod+ // posts onto the worker's event loop.+ QMetaObject::invokeMethod(self.data(), [self]() {+ if (!self) return;+ LOG_INFO(kTag, QString("Connecting to %1").arg(kKrakenWsUrl));+ self->ws_->connect_to(kKrakenWsUrl);+ }, Qt::QueuedConnection);+ } else {+ // No I/O thread provided — stay on current thread (legacy path).+ LOG_INFO(kTag, QString("Connecting to %1 (no dedicated I/O thread)").arg(kKrakenWsUrl));+ self->ws_->connect_to(kKrakenWsUrl);+ }+ });+}++void KrakenWsClient::stop() {+ if (heartbeat_timer_)+ heartbeat_timer_->stop();+ if (stats_timer_)+ stats_timer_->stop();+ ticker_count_since_log_.clear();+ if (ws_)+ ws_->disconnect();+ if (connected_.exchange(false))+ emit connection_changed(false);+ book_.reset();+}++void KrakenWsClient::set_primary_symbol(const QString& symbol) {+ if (symbol == primary_symbol_)+ return;+ const QString old_primary = primary_symbol_;+ primary_symbol_ = symbol;+ if (!all_symbols_.contains(symbol))+ all_symbols_.prepend(symbol);++ if (!connected_.load())+ return; // subscriptions will be sent on next connect++ // Unsubscribe ohlc/book/trade for the old primary; subscribe for the new.+ const QString old_kraken = fincept_to_kraken_.value(old_primary, to_kraken(old_primary));+ const QString new_kraken = [&]() {+ QString k = fincept_to_kraken_.value(symbol);+ if (k.isEmpty()) {+ k = to_kraken(symbol);+ register_symbol(symbol, k);+ }+ return k;+ }();++ if (!old_kraken.isEmpty()) {+ send_unsubscribe(QStringLiteral("book"), {old_kraken});+ send_unsubscribe(QStringLiteral("trade"), {old_kraken});+ send_unsubscribe(QStringLiteral("ohlc"), {old_kraken}, 1);+ book_.reset_symbol(old_kraken);+ }+ if (!new_kraken.isEmpty()) {+ send_subscribe(QStringLiteral("book"), {new_kraken});+ send_subscribe(QStringLiteral("trade"), {new_kraken});+ send_subscribe(QStringLiteral("ohlc"), {new_kraken}, 1);+ }+}++// ── Symbol bookkeeping ───────────────────────────────────────────────────────++void KrakenWsClient::register_symbol(const QString& fincept_symbol, const QString& kraken_symbol) {+ fincept_to_kraken_.insert(fincept_symbol, kraken_symbol);+ kraken_to_fincept_.insert(kraken_symbol, fincept_symbol);+}++QString KrakenWsClient::resolve_to_fincept(const QString& kraken_symbol) const {+ return kraken_to_fincept_.value(kraken_symbol, kraken_symbol);+}++// ── Subscribe / unsubscribe helpers ──────────────────────────────────────────++void KrakenWsClient::send_subscribe(const QString& channel, const QStringList& kraken_symbols,+ int interval_minutes, const QString& event_trigger) {+ if (kraken_symbols.isEmpty())+ return;++ QJsonObject params;+ params["channel"] = channel;+ QJsonArray syms;+ for (const auto& s : kraken_symbols)+ syms.append(s);+ params["symbol"] = syms;+ if (interval_minutes > 0)+ params["interval"] = interval_minutes;+ if (!event_trigger.isEmpty())+ params["event_trigger"] = event_trigger;++ QJsonObject msg;+ msg["method"] = "subscribe";+ msg["params"] = params;+ LOG_INFO(kTag, QString("→ subscribe %1 (%2 symbols%3)")+ .arg(channel)+ .arg(kraken_symbols.size())+ .arg(event_trigger.isEmpty() ? QString() : QString(", trigger=%1").arg(event_trigger)));+ ws_->send(send_compact(msg));+}++void KrakenWsClient::send_unsubscribe(const QString& channel, const QStringList& kraken_symbols,+ int interval_minutes) {+ if (kraken_symbols.isEmpty())+ return;+ QJsonObject params;+ params["channel"] = channel;+ QJsonArray syms;+ for (const auto& s : kraken_symbols)+ syms.append(s);+ params["symbol"] = syms;+ if (interval_minutes > 0)+ params["interval"] = interval_minutes;++ QJsonObject msg;+ msg["method"] = "unsubscribe";+ msg["params"] = params;+ ws_->send(send_compact(msg));+}++void KrakenWsClient::send_initial_subscriptions() {+ QStringList all_kraken;+ all_kraken.reserve(all_symbols_.size());+ for (const auto& s : all_symbols_) {+ const QString k = fincept_to_kraken_.value(s);+ if (!k.isEmpty())+ all_kraken.append(k);+ }+ if (all_kraken.isEmpty())+ return;++ // Ticker — every symbol in the watchlist. event_trigger="bbo" makes the+ // ticker fire on every best bid/offer change (vs default "trades" which+ // only fires on a print). Without "bbo", illiquid /USD pairs go minutes+ // between updates and the watchlist looks frozen — confirmed via wscat+ // probe (12 symbols / 20s: 2 updates with default vs 541 with bbo).+ send_subscribe(QStringLiteral("ticker"), all_kraken, 0, QStringLiteral("bbo"));++ // Book / trade / ohlc — only the primary symbol. Watchlist symbols don't+ // need their full orderbook or trade tape.+ const QString primary_kraken = fincept_to_kraken_.value(primary_symbol_);+ if (!primary_kraken.isEmpty()) {+ send_subscribe(QStringLiteral("book"), {primary_kraken});+ send_subscribe(QStringLiteral("trade"), {primary_kraken});+ send_subscribe(QStringLiteral("ohlc"), {primary_kraken}, 1);+ }++ LOG_INFO(kTag, QString("Initial subscriptions sent (%1 symbols)").arg(all_kraken.size()));+}++// ── WebSocketClient callbacks ────────────────────────────────────────────────++void KrakenWsClient::on_ws_connected() {+ LOG_INFO(kTag, "WebSocket connected");+ heartbeat_timer_->start();+ if (stats_timer_)+ stats_timer_->start();+ send_initial_subscriptions();+ if (!connected_.exchange(true))+ emit connection_changed(true);+}++void KrakenWsClient::on_ws_disconnected() {+ LOG_WARN(kTag, "WebSocket disconnected");+ heartbeat_timer_->stop();+ if (stats_timer_)+ stats_timer_->stop();+ ticker_count_since_log_.clear();+ if (connected_.exchange(false))+ emit connection_changed(false);+ book_.reset();+}++void KrakenWsClient::on_ws_error(const QString& error) {+ LOG_ERROR(kTag, "WebSocket error: " + error);+}++void KrakenWsClient::on_heartbeat_timeout() {+ LOG_WARN(kTag, "Heartbeat timeout — forcing reconnect");+ // Closing triggers WebSocketClient's exponential reconnect.+ if (ws_)+ ws_->disconnect();+}++void KrakenWsClient::on_ws_message(const QString& message) {+ // Reset heartbeat watchdog on any inbound frame.+ if (heartbeat_timer_)+ heartbeat_timer_->start();++ QJsonParseError err;+ const auto doc = QJsonDocument::fromJson(message.toUtf8(), &err);+ if (err.error != QJsonParseError::NoError || !doc.isObject())+ return;+ handle_message(doc.object());+}++// ── Message dispatch ─────────────────────────────────────────────────────────++void KrakenWsClient::handle_message(const QJsonObject& msg) {+ // Ack frames carry a `method` field instead of `channel`.+ if (msg.contains(QLatin1String("method"))) {+ const QString method = msg.value("method").toString();+ if (method == QLatin1String("subscribe") || method == QLatin1String("unsubscribe")) {+ handle_subscribe_ack(msg);+ return;+ }+ if (method == QLatin1String("pong")) {+ return; // heartbeat watchdog already reset+ }+ return;+ }++ const QString channel = msg.value("channel").toString();+ if (channel == QLatin1String("heartbeat"))+ return;+ if (channel == QLatin1String("status")) {+ handle_status(msg);+ return;+ }++ const QString type = msg.value("type").toString();+ const auto data = msg.value("data").toArray();+ const bool is_snapshot = (type == QLatin1String("snapshot"));++ if (channel == QLatin1String("ticker")) handle_ticker(data);+ else if (channel == QLatin1String("book")) handle_book(data, is_snapshot);+ else if (channel == QLatin1String("trade")) handle_trade(data);+ else if (channel == QLatin1String("ohlc")) handle_ohlc(data);+}++void KrakenWsClient::handle_status(const QJsonObject& msg) {+ const auto data = msg.value("data").toArray();+ if (data.isEmpty())+ return;+ const QString system = data.first().toObject().value("system").toString();+ LOG_INFO(kTag, "Kraken system status: " + system);+}++void KrakenWsClient::handle_subscribe_ack(const QJsonObject& msg) {+ const bool success = msg.value("success").toBool(false);+ const QString method = msg.value("method").toString();+ const auto result = msg.value("result").toObject();+ const QString channel = result.value("channel").toString();+ const QString error = msg.value("error").toString();++ // On success the symbol lives in `result.symbol`; on failure Kraken puts+ // it at top level (verified via wscat probe against ws.kraken.com/v2).+ QString kraken_symbol = result.value("symbol").toString();+ if (kraken_symbol.isEmpty())+ kraken_symbol = msg.value("symbol").toString();++ if (success) {+ LOG_INFO(kTag, QString("%1 ack: %2 / %3").arg(method, channel, kraken_symbol));+ return;+ }++ LOG_WARN(kTag, QString("%1 nack: %2 / %3 — %4").arg(method, channel, kraken_symbol, error));++ // ccxt-resolve already filtered unsupported symbols out of all_symbols_,+ // so a nack here means the resolver picked a market Kraken doesn't accept+ // on this specific channel (e.g. a perp listed for ohlc but not book).+ // The /USD retry is the safety net; if it also fails we surface the error.+ if (!maybe_retry_with_usd(channel, kraken_symbol, error))+ emit subscribe_failed(channel, resolve_to_fincept(kraken_symbol), error);+}++bool KrakenWsClient::maybe_retry_with_usd(const QString& channel, const QString& failed_kraken_symbol,+ const QString& error) {+ if (failed_kraken_symbol.isEmpty())+ return false;+ if (usd_fallback_attempted_.contains(failed_kraken_symbol))+ return false;+ usd_fallback_attempted_.insert(failed_kraken_symbol);++ // Determine the original Fincept symbol.+ const QString fincept_symbol = resolve_to_fincept(failed_kraken_symbol);+ const QString usd_form = usd_fallback(fincept_symbol);+ if (usd_form.isEmpty())+ return false;++ // Re-register: from now on, ticks for `usd_form` map back to `fincept_symbol`.+ fincept_to_kraken_.insert(fincept_symbol, usd_form);+ kraken_to_fincept_.remove(failed_kraken_symbol);+ kraken_to_fincept_.insert(usd_form, fincept_symbol);++ LOG_INFO(kTag, QString("Retrying %1 / %2 → %3").arg(channel, failed_kraken_symbol, usd_form));++ if (channel == QLatin1String("ohlc"))+ send_subscribe(channel, {usd_form}, 1);+ else+ send_subscribe(channel, {usd_form});+ Q_UNUSED(error);+ return true;+}++// ── Channel handlers ─────────────────────────────────────────────────────────++void KrakenWsClient::handle_ticker(const QJsonArray& data) {+ for (const auto& v : data) {+ const auto o = v.toObject();+ const QString k_sym = o.value("symbol").toString();+ if (k_sym.isEmpty())+ continue;+ TickerData t;+ t.symbol = resolve_to_fincept(k_sym);+ t.bid = o.value("bid").toDouble();+ t.ask = o.value("ask").toDouble();+ t.last = o.value("last").toDouble();+ t.high = o.value("high").toDouble();+ t.low = o.value("low").toDouble();+ t.base_volume = o.value("volume").toDouble();+ t.change = o.value("change").toDouble();+ t.percentage = o.value("change_pct").toDouble();+ t.timestamp = parse_iso_to_ms(o.value("timestamp").toString());++ // We subscribe with event_trigger="bbo" — Kraken pushes ticks on every+ // best bid/offer change. But Kraken's `last` field is the most-recent+ // TRADE price, which doesn't move between trades. If we publish that+ // unchanged value 30+ times/10s, every consumer (watchlist row, order+ // entry, position mark-to-market) sees the same number and the UI+ // looks frozen even though data is flowing. Use the mid-price instead+ // so every BBO change shifts the displayed price by at least the tick+ // size. Fall back to last when bid/ask aren't both populated.+ if (t.bid > 0.0 && t.ask > 0.0)+ t.last = (t.bid + t.ask) / 2.0;+ if (t.last <= 0.0)+ continue;++ ticker_count_since_log_[t.symbol] += 1;+ emit ticker_received(t);+ }+}++void KrakenWsClient::handle_book(const QJsonArray& data, bool is_snapshot) {+ for (const auto& v : data) {+ const auto o = v.toObject();+ const QString k_sym = o.value("symbol").toString();+ if (k_sym.isEmpty())+ continue;+ const auto bids = parse_levels(o.value("bids").toArray());+ const auto asks = parse_levels(o.value("asks").toArray());+ const quint32 checksum = static_cast<quint32>(o.value("checksum").toDouble());+ const QString ts = o.value("timestamp").toString();++ OrderBookData ob;+ if (is_snapshot)+ ob = book_.apply_snapshot(k_sym, bids, asks, checksum, ts);+ else+ ob = book_.apply_update(k_sym, bids, asks, checksum, ts);++ ob.symbol = resolve_to_fincept(k_sym);++ // CRC32 verification is intentionally a no-op here. Kraken's checksum+ // requires exact per-pair price/lot precision rendering — the obvious+ // 8-dp-fixed approximation produces false positives that trigger a+ // resubscribe storm, which Kraken responds to with `Exceeded msg rate`+ // and rejects ALL subsequent subscribes (including /USD tickers in+ // the watchlist). Since the displayed book is for visual depth only+ // (orders route through REST), an occasional drift is acceptable —+ // the next Kraken-pushed snapshot resyncs us automatically.+ Q_UNUSED(checksum);++ emit orderbook_received(ob);+ }+}++void KrakenWsClient::handle_trade(const QJsonArray& data) {+ for (const auto& v : data) {+ const auto o = v.toObject();+ const QString k_sym = o.value("symbol").toString();+ if (k_sym.isEmpty())+ continue;+ TradeData td;+ td.id = QString::number(static_cast<qint64>(o.value("trade_id").toDouble()));+ td.symbol = resolve_to_fincept(k_sym);+ td.side = o.value("side").toString();+ td.price = o.value("price").toDouble();+ td.amount = o.value("qty").toDouble();+ td.cost = td.price * td.amount;+ td.timestamp = parse_iso_to_ms(o.value("timestamp").toString());+ if (td.price <= 0.0 || td.amount <= 0.0)+ continue;+ emit trade_received(td);+ }+}++void KrakenWsClient::handle_ohlc(const QJsonArray& data) {+ for (const auto& v : data) {+ const auto o = v.toObject();+ const QString k_sym = o.value("symbol").toString();+ if (k_sym.isEmpty())+ continue;+ Candle c;+ c.timestamp = parse_iso_to_ms(o.value("interval_begin").toString());+ c.open = o.value("open").toDouble();+ c.high = o.value("high").toDouble();+ c.low = o.value("low").toDouble();+ c.close = o.value("close").toDouble();+ c.volume = o.value("volume").toDouble();+ const int interval = static_cast<int>(o.value("interval").toDouble(1));+ if (c.timestamp == 0 || c.open <= 0.0)+ continue;+ emit candle_received(resolve_to_fincept(k_sym), timeframe_string(interval), c);+ }+}++// ── Helpers ──────────────────────────────────────────────────────────────────++int64_t KrakenWsClient::parse_iso_to_ms(const QString& iso) {+ if (iso.isEmpty())+ return 0;+ const auto dt = QDateTime::fromString(iso, Qt::ISODateWithMs);+ if (dt.isValid())+ return dt.toMSecsSinceEpoch();+ // Fall back to plain ISO without ms.+ const auto dt2 = QDateTime::fromString(iso, Qt::ISODate);+ return dt2.isValid() ? dt2.toMSecsSinceEpoch() : 0;+}++} // namespace fincept::trading::krakendiff --git a/fincept-qt/src/trading/exchanges/kraken/KrakenWsClient.h b/fincept-qt/src/trading/exchanges/kraken/KrakenWsClient.hnew file mode 100644index 000000000..c0a352d46--- /dev/null+++ b/fincept-qt/src/trading/exchanges/kraken/KrakenWsClient.h@@ -0,0 +1,152 @@+#pragma once+// Native Kraken WebSocket v2 client.+//+// Replaces the Python ws_stream.py path for `exchange_id == "kraken"`. The+// public market-data endpoint is `wss://ws.kraken.com/v2`. We subscribe to+// four channels per symbol — ticker, book, trade, ohlc(1m) — and emit the+// terminal's existing TradingTypes structs via signals.+//+// Lifecycle (driven by ExchangeSession::start_ws → start()):+// 1. open() connect to ws.kraken.com/v2+// 2. on connect send 4 subscribe messages (one per channel)+// 3. for each ack log success/failure; on per-symbol failure for /USDT+// pairs, retry once with the /USD fallback+// 4. on each frame parse, dispatch by `channel`, emit+// 5. heartbeat watchdog: any inbound frame resets a 10s timer; on timeout+// we close + reconnect (Kraken sends heartbeats ~1Hz idle)+// 6. on close WebSocketClient handles exponential backoff reconnect+//+// Threading: lives on the thread that owns it. All Qt signals fire there.+//+// Authenticated channels (executions, balances) are NOT handled here — they+// require a token from REST GetWebSocketsToken on a different endpoint+// (wss://ws-auth.kraken.com/v2). Those stay on the daemon for now.++#include "trading/TradingTypes.h"+#include "trading/exchanges/kraken/KrakenBook.h"++#include <QHash>+#include <QObject>+#include <QSet>+#include <QStringList>+#include <QTimer>++#include <atomic>++class QThread;++namespace fincept {+class WebSocketClient;+}++namespace fincept::trading::kraken {++class KrakenWsClient : public QObject {+ Q_OBJECT+ public:+ explicit KrakenWsClient(QObject* parent = nullptr);+ ~KrakenWsClient() override;++ /// Designate the dedicated I/O thread the client will move to once the+ /// initial ccxt symbol resolve finishes. Must be called BEFORE start();+ /// the thread must already be running. Owned by the caller.+ void set_io_thread(QThread* io_thread) { io_thread_ = io_thread; }++ /// Open the connection and subscribe to all symbols. `primary_symbol` is+ /// the one the user is actively viewing (gets ohlc + trades + book);+ /// every symbol in `all_symbols` (including primary) gets ticker.+ /// Idempotent — a second call closes the existing connection first.+ /// MUST be called from the thread that owns PythonRunner (main) — the+ /// resolver runs synchronously there before we cross over to the I/O+ /// thread for the actual WebSocket open.+ void start(const QString& primary_symbol, const QStringList& all_symbols);++ /// Close the connection cleanly. Cancels reconnect attempts.+ void stop();++ /// Swap which symbol is "primary" without tearing down the whole feed.+ void set_primary_symbol(const QString& symbol);++ /// True once the WS handshake is up.+ bool is_connected() const { return connected_.load(); }++ signals:+ void ticker_received(const fincept::trading::TickerData& ticker);+ void orderbook_received(const fincept::trading::OrderBookData& orderbook);+ void trade_received(const fincept::trading::TradeData& trade);+ void candle_received(const QString& symbol, const QString& interval,+ const fincept::trading::Candle& candle);++ /// Connection-state edge transitions.+ void connection_changed(bool connected);++ /// Forwarded subscribe-ack failures, after USD-fallback retry has been+ /// exhausted. Useful for surfacing "WIF/USDT not on Kraken" to the UI.+ void subscribe_failed(const QString& channel, const QString& symbol,+ const QString& error);++ private slots:+ void on_ws_connected();+ void on_ws_disconnected();+ void on_ws_message(const QString& message);+ void on_ws_error(const QString& error);+ void on_heartbeat_timeout();++ private:+ /// Run the ccxt-based resolver script and populate the bidirectional+ /// fincept↔kraken symbol maps. On completion connects the WebSocket and+ /// fires send_initial_subscriptions(). Falls back to a passthrough map+ /// if the script fails (matches the behaviour we had before).+ void resolve_symbols_then_connect();+ void send_initial_subscriptions();+ /// `event_trigger` is one of "trades" (default — fires only on a print) or+ /// "bbo" (fires on every best bid/offer change). The watchlist needs "bbo"+ /// so illiquid pairs (e.g. APT/USD, INJ/USD) tick on quote moves rather+ /// than going minutes between updates.+ void send_subscribe(const QString& channel, const QStringList& kraken_symbols,+ int interval_minutes = 0,+ const QString& event_trigger = QString());+ void send_unsubscribe(const QString& channel, const QStringList& kraken_symbols,+ int interval_minutes = 0);++ void handle_message(const QJsonObject& msg);+ void handle_ticker(const QJsonArray& data);+ void handle_book(const QJsonArray& data, bool is_snapshot);+ void handle_trade(const QJsonArray& data);+ void handle_ohlc(const QJsonArray& data);+ void handle_subscribe_ack(const QJsonObject& msg);+ void handle_status(const QJsonObject& msg);++ void register_symbol(const QString& fincept_symbol, const QString& kraken_symbol);+ QString resolve_to_fincept(const QString& kraken_symbol) const;++ bool maybe_retry_with_usd(const QString& channel, const QString& failed_kraken_symbol,+ const QString& error);++ /// RFC3339 string (e.g. "2023-09-25T09:04:31.742648Z") → ms since epoch.+ static int64_t parse_iso_to_ms(const QString& iso);++ fincept::WebSocketClient* ws_ = nullptr;+ QTimer* heartbeat_timer_ = nullptr;+ QThread* io_thread_ = nullptr; // designated I/O thread; not owned++ QString primary_symbol_;+ QStringList all_symbols_;+ QHash<QString, QString> kraken_to_fincept_;+ QHash<QString, QString> fincept_to_kraken_;+ QSet<QString> usd_fallback_attempted_;++ KrakenBook book_;+ std::atomic<bool> connected_{false};++ // Per-symbol message counters flushed to LOG_INFO every 10s. Lets us+ // diagnose "this row is frozen" complaints without per-tick log spam.+ QHash<QString, int> ticker_count_since_log_;+ QTimer* stats_timer_ = nullptr;+ void emit_stats_log();++ static constexpr int HEARTBEAT_TIMEOUT_MS = 10000;+ static constexpr int STATS_LOG_INTERVAL_MS = 10000;+};++} // namespace fincept::trading::krakendiff --git a/fincept-qt/src/ui/command/CommandPalette.cpp b/fincept-qt/src/ui/command/CommandPalette.cppnew file mode 100644index 000000000..51d1dd32b--- /dev/null+++ b/fincept-qt/src/ui/command/CommandPalette.cpp@@ -0,0 +1,120 @@+#include "ui/command/CommandPalette.h"++#include "app/TerminalShell.h"+#include "app/WindowFrame.h"+#include "core/actions/ActionDef.h"+#include "core/actions/ActionRegistry.h"+#include "core/keys/WindowCycler.h"+#include "ui/command/CommandParser.h"+#include "ui/command/SuggestionIndex.h"+#include "ui/notifications/NotificationService.h"++#include <QKeyEvent>+#include <QLineEdit>+#include <QListWidget>+#include <QListWidgetItem>+#include <QVBoxLayout>++namespace fincept::ui {++void CommandPalette::show_for(QWidget* parent_frame) {+ auto* dlg = new CommandPalette(parent_frame);+ dlg->setAttribute(Qt::WA_DeleteOnClose);+ dlg->resize(560, 380);+ if (parent_frame) {+ const QPoint centre = parent_frame->mapToGlobal(parent_frame->rect().center());+ dlg->move(centre - QPoint(dlg->width() / 2, dlg->height() / 3));+ }+ dlg->show();+ dlg->input_->setFocus(Qt::ShortcutFocusReason);+}++CommandPalette::CommandPalette(QWidget* parent) : QDialog(parent) {+ setWindowFlag(Qt::FramelessWindowHint);+ setWindowFlag(Qt::Popup);+ setStyleSheet(+ "QDialog { background: #111827; border: 1px solid #374151; }"+ "QLineEdit { background: #1f2937; color: #e5e7eb; border: 1px solid #374151; "+ " padding: 8px 12px; font-size: 13px; font-family: 'Consolas', monospace; }"+ "QListWidget { background: #111827; color: #e5e7eb; border: none; }"+ "QListWidget::item { padding: 6px 10px; }"+ "QListWidget::item:hover { background: #1f2937; }"+ "QListWidget::item:selected { background: #1f2937; color: #d97706; }");++ auto* vl = new QVBoxLayout(this);+ vl->setContentsMargins(8, 8, 8, 8);+ vl->setSpacing(6);++ input_ = new QLineEdit(this);+ input_->setPlaceholderText("Search actions, layouts… (Esc to cancel, Enter to run)");+ connect(input_, &QLineEdit::textChanged, this, &CommandPalette::on_text_changed);+ connect(input_, &QLineEdit::returnPressed, this, &CommandPalette::on_accept);+ vl->addWidget(input_);++ suggestions_ = new QListWidget(this);+ suggestions_->setSelectionMode(QAbstractItemView::SingleSelection);+ connect(suggestions_, &QListWidget::itemActivated, this,+ [this](QListWidgetItem*) { on_accept(); });+ vl->addWidget(suggestions_, /*stretch=*/1);++ // Initial population: first ~25 actions so the user sees something.+ on_text_changed({});+}++void CommandPalette::on_text_changed(const QString& text) {+ if (!suggestions_) return;+ suggestions_->clear();+ auto matches = SuggestionIndex::instance().query(+ text.isEmpty() ? QStringLiteral("a") : text, /*limit=*/25);+ if (matches.isEmpty() && !text.isEmpty()) {+ // Empty query branch: still show top actions by walking the registry.+ for (const QString& id : ActionRegistry::instance().all_ids()) {+ const auto* def = ActionRegistry::instance().find(id);+ if (!def) continue;+ auto* item = new QListWidgetItem(def->display.isEmpty() ? def->id : def->display);+ item->setData(Qt::UserRole, def->id);+ suggestions_->addItem(item);+ if (suggestions_->count() >= 25) break;+ }+ } else {+ for (const auto& m : matches) {+ auto* item = new QListWidgetItem(m.display);+ item->setData(Qt::UserRole, m.id);+ // Decorate the item with category in a smaller secondary line.+ item->setToolTip(QString("%1 [%2]").arg(m.id, m.category));+ suggestions_->addItem(item);+ }+ }+ if (suggestions_->count() > 0)+ suggestions_->setCurrentRow(0);+}++void CommandPalette::on_accept() {+ auto* item = suggestions_->currentItem();+ QString action_id;+ if (item) {+ action_id = item->data(Qt::UserRole).toString();+ } else {+ // No suggestion selected — try parsing the raw input as a command.+ const auto parsed = CommandParser::parse(input_->text());+ if (parsed.kind == ParsedCommand::Kind::Action)+ action_id = parsed.action_id;+ }+ if (action_id.isEmpty()) {+ accept();+ return;+ }+ CommandContext ctx;+ ctx.shell = &TerminalShell::instance();+ ctx.focused_frame = WindowCycler::instance().focused_frame();+ auto r = ActionRegistry::instance().invoke(action_id, ctx);+ if (r.is_err()) {+ ToastService::instance().post(+ ToastService::Severity::Warning,+ QString::fromStdString(r.error()),+ "palette");+ }+ accept();+}++} // namespace fincept::uidiff --git a/fincept-qt/src/ui/command/CommandPalette.h b/fincept-qt/src/ui/command/CommandPalette.hnew file mode 100644index 000000000..db04aede0--- /dev/null+++ b/fincept-qt/src/ui/command/CommandPalette.h@@ -0,0 +1,38 @@+#pragma once++#include <QDialog>+#include <QString>++class QLineEdit;+class QListWidget;++namespace fincept::ui {++/// Phase 9: Ctrl+K palette overlay. Fuzzy search over `SuggestionIndex`.+///+/// Modal-ish: blocks input to the underlying frame while open (similar+/// to VSCode's command palette). Esc dismisses. Enter invokes the+/// selected suggestion.+///+/// Each invocation creates a fresh dialog (cheap: it's a QDialog with+/// a QLineEdit + QListWidget) and surfaces it centered on the parent+/// frame.+class CommandPalette : public QDialog {+ Q_OBJECT+ public:+ /// Show the palette over the given frame. Centred on frame, not on+ /// primary screen, so multi-monitor users see it where they're+ /// looking.+ static void show_for(QWidget* parent_frame);++ private:+ explicit CommandPalette(QWidget* parent);++ void on_text_changed(const QString& text);+ void on_accept();++ QLineEdit* input_ = nullptr;+ QListWidget* suggestions_ = nullptr;+};++} // namespace fincept::uidiff --git a/fincept-qt/src/ui/command/CommandParser.cpp b/fincept-qt/src/ui/command/CommandParser.cppnew file mode 100644index 000000000..3ff92191f--- /dev/null+++ b/fincept-qt/src/ui/command/CommandParser.cpp@@ -0,0 +1,158 @@+#include "ui/command/CommandParser.h"++#include "core/actions/ActionRegistry.h"++#include <QRegularExpression>+#include <QStringList>++namespace fincept::ui {++namespace {++// Tokenise respecting double-quoted strings: `layout switch "Earnings Day"`+// → ["layout", "switch", "Earnings Day"].+QStringList tokenise(const QString& s) {+ QStringList out;+ QString cur;+ bool in_quotes = false;+ for (QChar c : s) {+ if (c == '"') {+ in_quotes = !in_quotes;+ continue;+ }+ if (c.isSpace() && !in_quotes) {+ if (!cur.isEmpty()) {+ out.append(cur);+ cur.clear();+ }+ } else {+ cur.append(c);+ }+ }+ if (!cur.isEmpty())+ out.append(cur);+ return out;+}++} // namespace++ParsedCommand CommandParser::parse(const QString& input) {+ const QString trimmed = input.trimmed();+ if (trimmed.isEmpty()) {+ ParsedCommand p;+ p.kind = ParsedCommand::Kind::Empty;+ return p;+ }+ if (trimmed == QLatin1String("?")) {+ ParsedCommand p;+ p.kind = ParsedCommand::Kind::Help;+ return p;+ }++ // Function-code precedence first. A bare uppercase token (with optional+ // dots/underscores/digits) is more likely a Bloomberg-style code or a+ // ticker than a verb. Verbs typically start lowercase or have a space.+ auto fc = try_function_code_(trimmed);+ if (fc.kind != ParsedCommand::Kind::Unknown && fc.kind != ParsedCommand::Kind::Empty)+ return fc;++ // Else fall through to verb-object.+ return try_verb_object_(trimmed);+}++ParsedCommand CommandParser::try_function_code_(const QString& input) {+ // Match: alphanumeric/digit-led single token, no spaces, no dots either+ // (a dotted form like "layout.switch" is the action-id form, handled+ // by verb-object). Examples that match: AAPL, MSFT, 1, 25, WEI.+ static const QRegularExpression rx(+ R"(^[A-Z0-9][A-Z0-9_]*$)",+ QRegularExpression::CaseInsensitiveOption);+ if (!rx.match(input).hasMatch())+ return ParsedCommand{ParsedCommand::Kind::Unknown, {}, {}, input, {}};++ // Two paths — try ActionRegistry first (for registered numeric/short+ // codes if any), else treat as a symbol publish.+ const QString upper = input.toUpper();+ if (auto* action = ActionRegistry::instance().find(upper.toLower())) {+ ParsedCommand p;+ p.kind = ParsedCommand::Kind::Action;+ p.action_id = action->id;+ return p;+ }++ // Treat as symbol. Caller maps to link.publish_to_group with the active+ // (or first enabled) group.+ ParsedCommand p;+ p.kind = ParsedCommand::Kind::Symbol;+ p.raw_remainder = upper;+ p.args.insert(QStringLiteral("symbol"), upper);+ return p;+}++ParsedCommand CommandParser::try_verb_object_(const QString& input) {+ QStringList tokens = tokenise(input);+ if (tokens.isEmpty()) {+ return ParsedCommand{ParsedCommand::Kind::Empty, {}, {}, {}, {}};+ }++ // Greedy match: try the longest prefix as a dotted action id.+ // "layout switch foo" → try "layout.switch.foo", "layout.switch", "layout".+ // First registered match wins.+ auto& reg = ActionRegistry::instance();+ for (int n = tokens.size(); n > 0; --n) {+ QStringList prefix = tokens.mid(0, n);+ const QString candidate = prefix.join('.').toLower();+ if (auto* action = reg.find(candidate)) {+ ParsedCommand p;+ p.kind = ParsedCommand::Kind::Action;+ p.action_id = action->id;+ const QStringList rest = tokens.mid(n);+ p.args = bind_positional_(action->parameter_slots, rest);+ p.raw_remainder = rest.join(' ');+ return p;+ }+ }++ // No prefix matched — also try matching aliases. Cheaper to walk all+ // actions once with their full-string display + alias forms.+ for (const QString& id : reg.all_ids()) {+ const ActionDef* def = reg.find(id);+ if (!def) continue;+ for (const QString& alias : def->aliases) {+ if (input.startsWith(alias, Qt::CaseInsensitive)) {+ const QStringList rest = tokenise(input.mid(alias.size()).trimmed());+ ParsedCommand p;+ p.kind = ParsedCommand::Kind::Action;+ p.action_id = id;+ p.args = bind_positional_(def->parameter_slots, rest);+ p.raw_remainder = rest.join(' ');+ return p;+ }+ }+ }++ ParsedCommand p;+ p.kind = ParsedCommand::Kind::Unknown;+ p.raw_remainder = input;+ p.error = QString("Unknown command: '%1'").arg(input);+ return p;+}++QVariantMap CommandParser::bind_positional_(const QList<ParameterSlot>& slot_list,+ const QStringList& positionals) {+ QVariantMap out;+ for (int i = 0; i < slot_list.size() && i < positionals.size(); ++i) {+ const ParameterSlot& slot = slot_list.at(i);+ out.insert(slot.name, positionals.at(i));+ }+ // Defaults for required slots that weren't supplied. Caller's predicate+ // / handler should detect missing required args.+ for (int i = positionals.size(); i < slot_list.size(); ++i) {+ const ParameterSlot& slot = slot_list.at(i);+ if (slot.default_value.isValid())+ out.insert(slot.name, slot.default_value);+ }+ return out;+}++} // namespace fincept::uidiff --git a/fincept-qt/src/ui/command/CommandParser.h b/fincept-qt/src/ui/command/CommandParser.hnew file mode 100644index 000000000..d6df18f0d--- /dev/null+++ b/fincept-qt/src/ui/command/CommandParser.h@@ -0,0 +1,56 @@+#pragma once+#include "core/actions/ActionDef.h"++#include <QString>+#include <QVariantMap>++namespace fincept::ui {++/// Phase 9 / decision 7.2: dual-grammar command parser.+///+/// Two parses tried in priority order:+/// 1. **Function-code precedence**: input matching `^[A-Z][A-Z0-9._]*$`+/// or starting with a digit (Bloomberg "1<GO>", "WEI") is treated+/// as a function code. We resolve via ActionRegistry::match() and+/// symbol lookup. (For v1 we treat un-claimed-by-action input as+/// a symbol publish via `link.publish_to_group` to the active group.)+/// 2. **Verb-object**: `<verb> [args...]`. The verb is the action id+/// ("layout switch") with spaces collapsed to dots+/// ("layout.switch"); remaining tokens become positional args+/// mapped to the action's ParameterSlot list.+///+/// The parser returns a `Parse` describing which path matched, the+/// resolved action_id, and the bag of args ready to feed `CommandContext`.+/// Callers (CommandBar / CommandPalette) call `ActionRegistry::invoke`.+struct ParsedCommand {+ enum class Kind {+ Empty,+ Action, ///< matched a registered action; invoke directly+ Symbol, ///< looks like a ticker — caller may route to link.publish_to_group+ Help, ///< user typed `?` → caller shows the cheat sheet+ Unknown,+ };+ Kind kind = Kind::Empty;+ QString action_id;+ QVariantMap args;+ QString raw_remainder; ///< text after the verb (or the whole input for Symbol)+ QString error; ///< populated when kind==Unknown to surface a hint+};++class CommandParser {+ public:+ /// Pure function. Reads ActionRegistry to resolve verb-object matches.+ /// Does NOT invoke the action.+ static ParsedCommand parse(const QString& input);++ private:+ static ParsedCommand try_function_code_(const QString& input);+ static ParsedCommand try_verb_object_(const QString& input);++ /// Map positional tokens to parameter slot names. The first N tokens+ /// fill the first N slots in declaration order.+ static QVariantMap bind_positional_(const QList<ParameterSlot>& slot_list,+ const QStringList& positionals);+};++} // namespace fincept::uidiff --git a/fincept-qt/src/ui/command/QuickCommandBar.cpp b/fincept-qt/src/ui/command/QuickCommandBar.cppnew file mode 100644index 000000000..980987c09--- /dev/null+++ b/fincept-qt/src/ui/command/QuickCommandBar.cpp@@ -0,0 +1,134 @@+#include "ui/command/QuickCommandBar.h"++#include "app/TerminalShell.h"+#include "app/WindowFrame.h"+#include "core/actions/ActionDef.h"+#include "core/actions/ActionRegistry.h"+#include "core/keys/WindowCycler.h"+#include "core/logging/Logger.h"+#include "ui/command/CommandParser.h"+#include "ui/notifications/NotificationService.h"++#include <QHBoxLayout>+#include <QLabel>+#include <QLineEdit>++namespace fincept::ui {++QuickCommandBar::QuickCommandBar(QWidget* parent) : QFrame(parent) {+ setObjectName("QuickCommandBar");+ setFrameShape(QFrame::NoFrame);+ setStyleSheet(+ "QFrame#QuickCommandBar {"+ " background: #0f172a;"+ " border-top: 1px solid #374151;"+ "}"+ "QLineEdit {"+ " background: #111827; color: #e5e7eb;"+ " border: 1px solid #374151; padding: 4px 8px;"+ " font-family: 'Consolas', monospace;"+ "}"+ "QLabel { color: #9ca3af; }");+ setFixedHeight(28);++ auto* hl = new QHBoxLayout(this);+ hl->setContentsMargins(8, 2, 8, 2);+ hl->setSpacing(8);++ auto* prompt = new QLabel(">", this);+ prompt->setStyleSheet("color: #d97706; font-weight: 700;");+ hl->addWidget(prompt);++ input_ = new QLineEdit(this);+ input_->setPlaceholderText("Type a command (e.g. 'layout switch \"Morning\"', AAPL, ?). Esc to dismiss.");+ connect(input_, &QLineEdit::returnPressed, this, &QuickCommandBar::on_submit);+ hl->addWidget(input_, /*stretch=*/1);++ hint_ = new QLabel(this);+ hint_->setStyleSheet("color: #9ca3af; font-size: 10px;");+ hl->addWidget(hint_);++ hide(); // toggle to show+}++void QuickCommandBar::toggle_visible() {+ if (isVisible())+ hide();+ else+ surface();+}++void QuickCommandBar::surface() {+ show();+ if (input_) {+ input_->clear();+ input_->setFocus(Qt::ShortcutFocusReason);+ }+ if (hint_)+ hint_->clear();+}++void QuickCommandBar::show_hint(const QString& text, bool is_error) {+ if (!hint_) return;+ hint_->setText(text);+ hint_->setStyleSheet(is_error ? "color: #dc2626; font-size: 10px;"+ : "color: #9ca3af; font-size: 10px;");+}++void QuickCommandBar::on_submit() {+ const QString raw = input_->text().trimmed();+ if (raw.isEmpty())+ return;++ const auto parsed = CommandParser::parse(raw);+ switch (parsed.kind) {+ case ParsedCommand::Kind::Empty:+ return;+ case ParsedCommand::Kind::Help:+ show_hint("Help: type any verb (e.g. 'layout switch') or a ticker (AAPL).", false);+ return;+ case ParsedCommand::Kind::Symbol: {+ // Route to link.publish_to_group with the first enabled group+ // — pragmatic v1 UX: typing a ticker into the command bar+ // broadcasts to the current focused panel's link group when+ // possible, else to group A. Phase 9 follow-up adds smarter+ // routing (focused panel's group preferred).+ CommandContext ctx;+ ctx.shell = &TerminalShell::instance();+ ctx.focused_frame = WindowCycler::instance().focused_frame();+ ctx.args.insert(QStringLiteral("group"), "A");+ ctx.args.insert(QStringLiteral("symbol"), parsed.args.value("symbol").toString());+ auto r = ActionRegistry::instance().invoke("link.publish_to_group", ctx);+ if (r.is_err()) {+ show_hint(QString::fromStdString(r.error()), true);+ } else {+ show_hint(QString("Published %1 to group A").arg(parsed.args.value("symbol").toString()), false);+ input_->clear();+ }+ return;+ }+ case ParsedCommand::Kind::Action: {+ CommandContext ctx;+ ctx.shell = &TerminalShell::instance();+ ctx.focused_frame = WindowCycler::instance().focused_frame();+ ctx.args = parsed.args;+ auto r = ActionRegistry::instance().invoke(parsed.action_id, ctx);+ if (r.is_err()) {+ show_hint(QString::fromStdString(r.error()), true);+ ToastService::instance().post(+ ToastService::Severity::Warning,+ QString::fromStdString(r.error()),+ "command_bar");+ } else {+ show_hint(QString("✓ %1").arg(parsed.action_id), false);+ input_->clear();+ }+ return;+ }+ case ParsedCommand::Kind::Unknown:+ show_hint(parsed.error.isEmpty() ? "Unknown command" : parsed.error, true);+ return;+ }+}++} // namespace fincept::uidiff --git a/fincept-qt/src/ui/command/QuickCommandBar.h b/fincept-qt/src/ui/command/QuickCommandBar.hnew file mode 100644index 000000000..d80f6dbf4--- /dev/null+++ b/fincept-qt/src/ui/command/QuickCommandBar.h@@ -0,0 +1,38 @@+#pragma once++#include <QFrame>+#include <QString>++class QLineEdit;+class QLabel;++namespace fincept::ui {++/// Phase 9: persistent status-line command input on every frame.+/// Reads `ActionRegistry`, parses with `CommandParser`, invokes via+/// `ActionRegistry::invoke(id, ctx)`. Bloomberg-style "just type" UX.+///+/// Sits at the bottom of WindowFrame above the status bar. Hidden by+/// default — toggle with Ctrl+\ or via the `cmdbar.toggle` action.+/// Phase 9 follow-up adds inline autocomplete + ?-prefix help.+class QuickCommandBar : public QFrame {+ Q_OBJECT+ public:+ explicit QuickCommandBar(QWidget* parent = nullptr);++ /// Toggle visibility. Focuses the input on show.+ void toggle_visible();++ /// Surface the bar (show + focus). Used when palette/launchpad+ /// dispatch a "type a command" action.+ void surface();++ private:+ void on_submit();+ void show_hint(const QString& text, bool is_error);++ QLineEdit* input_ = nullptr;+ QLabel* hint_ = nullptr;+};++} // namespace fincept::uidiff --git a/fincept-qt/src/ui/command/SuggestionIndex.cpp b/fincept-qt/src/ui/command/SuggestionIndex.cppnew file mode 100644index 000000000..55bf495e2--- /dev/null+++ b/fincept-qt/src/ui/command/SuggestionIndex.cpp@@ -0,0 +1,59 @@+#include "ui/command/SuggestionIndex.h"++#include "core/actions/ActionRegistry.h"+#include "core/layout/LayoutCatalog.h"++namespace fincept::ui {++SuggestionIndex& SuggestionIndex::instance() {+ static SuggestionIndex s;+ return s;+}++QList<SuggestionIndex::Match> SuggestionIndex::query(const QString& prefix, int limit) {+ QList<Match> out;+ if (prefix.trimmed().isEmpty() || limit <= 0)+ return out;++ // Action source — tier on top of ActionRegistry::match's existing+ // 4-tier relevance bucket.+ const auto action_matches = ActionRegistry::instance().match(prefix, limit);+ int score = 100;+ for (const ActionDef* def : action_matches) {+ if (!def) continue;+ Match m;+ m.source = SourceKind::Action;+ m.id = def->id;+ m.display = def->display.isEmpty() ? def->id : def->display;+ m.category = def->category;+ m.score = score--;+ out.append(m);+ if (out.size() >= limit) return out;+ }++ // Layout source — match by name (case-insensitive contains).+ auto layouts_r = LayoutCatalog::instance().list_layouts();+ if (layouts_r.is_ok()) {+ const QString p = prefix.toLower();+ for (const auto& e : layouts_r.value()) {+ if (e.name.toLower().contains(p)) {+ Match m;+ m.source = SourceKind::Layout;+ m.id = e.id.to_string();+ m.display = e.name;+ m.category = "Layout";+ m.score = 50;+ out.append(m);+ if (out.size() >= limit) return out;+ }+ }+ }++ // Phase 9 follow-up: open-panels source via PanelRegistry, profiles+ // via ProfileManager::profile_entries(), symbols via the (future)+ // symbol catalogue. Each is a slice that drops in here.++ return out;+}++} // namespace fincept::uidiff --git a/fincept-qt/src/ui/command/SuggestionIndex.h b/fincept-qt/src/ui/command/SuggestionIndex.hnew file mode 100644index 000000000..457f239d1--- /dev/null+++ b/fincept-qt/src/ui/command/SuggestionIndex.h@@ -0,0 +1,44 @@+#pragma once+#include "core/actions/ActionDef.h"++#include <QList>+#include <QObject>+#include <QString>++namespace fincept::ui {++/// Phase 9 / decision 7.6: unified search index over ActionRegistry ++/// (later) symbols + open panels + layouts + profiles.+///+/// v1 ships the action-registry slice. Symbols/panels/layouts integration+/// arrives when their respective registries gain change-notification+/// signals. The interface is shaped so adding a new source is one+/// `query()` switch case.+class SuggestionIndex : public QObject {+ Q_OBJECT+ public:+ enum class SourceKind {+ Action,+ Layout,+ Panel,+ Symbol,+ };++ struct Match {+ SourceKind source = SourceKind::Action;+ QString id; ///< action id, layout uuid, panel uuid, etc.+ QString display; ///< user-visible text+ QString category; ///< for grouping in palette UI+ int score = 0; ///< higher = better match (relevance)+ };++ static SuggestionIndex& instance();++ /// Top N matches across all sources.+ QList<Match> query(const QString& prefix, int limit = 25);++ private:+ SuggestionIndex() = default;+};++} // namespace fincept::uidiff --git a/fincept-qt/src/ui/components/ComponentBrowserDialog.h b/fincept-qt/src/ui/components/ComponentBrowserDialog.hindex fea47d482..1c208d9dc 100644--- a/fincept-qt/src/ui/components/ComponentBrowserDialog.h+++ b/fincept-qt/src/ui/components/ComponentBrowserDialog.h@@ -1,4 +1,4 @@-#pragma once+#pragma once#include <QDialog>#include <QString>@@ -32,7 +32,7 @@ class ComponentBrowserDialog : public QDialog {signals:/// Emitted when the user double-clicks a card or presses Enter.- /// The caller (MainWindow) is expected to navigate to the screen.+ /// The caller (WindowFrame) is expected to navigate to the screen./// The dialog closes itself after emitting.void component_chosen(const QString& screen_id);diff --git a/fincept-qt/src/ui/debug/DebugOverlay.cpp b/fincept-qt/src/ui/debug/DebugOverlay.cppnew file mode 100644index 000000000..193d7fe11--- /dev/null+++ b/fincept-qt/src/ui/debug/DebugOverlay.cpp@@ -0,0 +1,110 @@+#include "ui/debug/DebugOverlay.h"++#include "app/WindowFrame.h"+#include "core/panel/PanelRegistry.h"+#include "datahub/DataHub.h"++#include <QDateTime>+#include <QHBoxLayout>++namespace fincept::ui {++DebugOverlay::DebugOverlay(QWidget* parent) : QFrame(parent) {+ setObjectName("debugOverlay");+ setFrameShape(QFrame::NoFrame);+ setStyleSheet(+ "QFrame#debugOverlay {"+ " background: rgba(15, 23, 42, 0.85);"+ " border: 1px solid #374151;"+ " border-radius: 4px;"+ "}");+ setAttribute(Qt::WA_TransparentForMouseEvents);+ // Hidden by default — user toggles via debug.overlay action.+ hide();++ auto* hl = new QHBoxLayout(this);+ hl->setContentsMargins(8, 4, 8, 4);+ hl->setSpacing(0);++ label_ = new QLabel(this);+ label_->setStyleSheet(+ "color: #9ca3af; font-family: 'Consolas', monospace; font-size: 10px;");+ label_->setTextFormat(Qt::PlainText);+ hl->addWidget(label_);++ refresh_timer_.setInterval(1000);+ connect(&refresh_timer_, &QTimer::timeout, this, &DebugOverlay::refresh);++ last_msgs_sample_ms_ = QDateTime::currentMSecsSinceEpoch();+}++void DebugOverlay::reposition() {+ if (!parentWidget())+ return;+ adjustSize();+ const QSize ps = parentWidget()->size();+ move(ps.width() - width() - 8, ps.height() - height() - 8);+}++void DebugOverlay::toggle_visible() {+ if (isVisible()) {+ hide();+ refresh_timer_.stop();+ } else {+ refresh();+ reposition();+ show();+ raise();+ refresh_timer_.start();+ }+}++void DebugOverlay::refresh() {+ QString frame_info;+ if (auto* frame = qobject_cast<fincept::WindowFrame*>(window())) {+ const auto frame_uuid = frame->frame_uuid();+ const QString uuid_short = frame_uuid.to_string().left(8);+ const int frame_panels =+ fincept::PanelRegistry::instance().find_by_frame(frame_uuid).size();+ const bool active = frame->is_active_for_work();+ frame_info = QString("frame %1 panels:%2 active:%3")+ .arg(uuid_short)+ .arg(frame_panels)+ .arg(active ? "yes" : "no");+ } else {+ frame_info = "frame ?";+ }++ const int total_panels = fincept::PanelRegistry::instance().size();++ // DataHub stats. Approximate msgs/sec as delta(total publishes) over+ // the elapsed window. Uses the existing DataHub topic_stats view —+ // walk all topics and sum total_publishes.+ qint64 total_publishes = 0;+ int topic_count = 0;+ {+ const auto stats = fincept::datahub::DataHub::instance().stats();+ topic_count = stats.size();+ for (const auto& s : stats)+ total_publishes += s.total_publishes;+ }+ const qint64 now_ms = QDateTime::currentMSecsSinceEpoch();+ const qint64 dt_ms = qMax<qint64>(1, now_ms - last_msgs_sample_ms_);+ const qint64 dpub = qMax<qint64>(0, total_publishes - last_msgs_count_);+ const double rate = (double)dpub / ((double)dt_ms / 1000.0);+ last_msgs_count_ = total_publishes;+ last_msgs_sample_ms_ = now_ms;++ const QString hub_info = QString("hub topics:%1 rate:%2/s")+ .arg(topic_count)+ .arg(QString::number(rate, 'f', 1));++ label_->setText(QString("%1\nall panels:%2 %3")+ .arg(frame_info)+ .arg(total_panels)+ .arg(hub_info));+ adjustSize();+ reposition();+}++} // namespace fincept::uidiff --git a/fincept-qt/src/ui/debug/DebugOverlay.h b/fincept-qt/src/ui/debug/DebugOverlay.hnew file mode 100644index 000000000..84979f066--- /dev/null+++ b/fincept-qt/src/ui/debug/DebugOverlay.h@@ -0,0 +1,49 @@+#pragma once++#include <QFrame>+#include <QLabel>+#include <QTimer>++namespace fincept::ui {++/// Phase 10 trim: minimal debug overlay shown on a WindowFrame.+///+/// Surfaces the data the user most often wants when debugging a slowdown:+/// - This frame's UUID + panel count + active-for-work flag+/// - PanelRegistry total panel count (across all frames)+/// - DataHub: total topic count + cumulative msgs/sec (last 1s)+///+/// The full Phase 10 overlay (per-panel render-time histograms, thread pool+/// stats, paint frame time) needs a richer instrumentation pipeline —+/// deferred. This trim ships the most-asked-for surface today.+///+/// Toggle via the `debug.overlay` action (Ctrl+Shift+D by default).+/// Per-frame instance: each WindowFrame owns its own overlay so stats are+/// scoped to the frame the user is looking at.+///+/// The widget paints with a semi-transparent dark background so it doesn't+/// occlude content underneath — usable while the user is actually working.+/// Ignores mouse input (`setAttribute(Qt::WA_TransparentForMouseEvents)`).+class DebugOverlay : public QFrame {+ Q_OBJECT+ public:+ explicit DebugOverlay(QWidget* parent = nullptr);++ /// Reposition to the bottom-right of the parent's content area.+ /// Call from the parent's resizeEvent.+ void reposition();++ /// Toggle visibility. The action handler calls this on every frame's+ /// overlay so all frames flip state in lockstep.+ void toggle_visible();++ private:+ void refresh();++ QLabel* label_ = nullptr;+ QTimer refresh_timer_;+ qint64 last_msgs_count_ = 0;+ qint64 last_msgs_sample_ms_ = 0;+};++} // namespace fincept::uidiff --git a/fincept-qt/src/ui/error/ErrorPipeline.cpp b/fincept-qt/src/ui/error/ErrorPipeline.cppnew file mode 100644index 000000000..0f8b44d8c--- /dev/null+++ b/fincept-qt/src/ui/error/ErrorPipeline.cpp@@ -0,0 +1,69 @@+#include "ui/error/ErrorPipeline.h"++#include "core/logging/Logger.h"+#include "ui/notifications/NotificationService.h"++namespace fincept::ui {++ErrorPipeline& ErrorPipeline::instance() {+ static ErrorPipeline s;+ return s;+}++void ErrorPipeline::report_panel_error(const QString& panel_id, Severity sev,+ const QString& message, const QString& source) {+ panel_errors_[panel_id] = panel_errors_.value(panel_id) + 1;+ LOG_WARN("ErrorPipeline",+ QString("Panel %1 error (sev=%2): %3 [from %4]")+ .arg(panel_id)+ .arg(sev == Severity::Error ? "err" : "warn")+ .arg(message, source.isEmpty() ? QStringLiteral("-") : source));++ ToastService::instance().post(+ sev == Severity::Error ? ToastService::Severity::Error+ : ToastService::Severity::Warning,+ message,+ source.isEmpty() ? panel_id : source);++ emit panel_errors_changed(panel_id);+}++void ErrorPipeline::clear_panel_errors(const QString& panel_id) {+ if (panel_errors_.remove(panel_id) > 0)+ emit panel_errors_changed(panel_id);+}++void ErrorPipeline::report_shell_error(const QString& category, Severity sev,+ const QString& message, const QString& source) {+ if (message.isEmpty()) {+ clear_shell_error(category);+ return;+ }+ shell_errors_[category] = message;+ LOG_WARN("ErrorPipeline",+ QString("Shell error [%1] sev=%2: %3 [from %4]")+ .arg(category)+ .arg(sev == Severity::Error ? "err" : "warn")+ .arg(message, source.isEmpty() ? QStringLiteral("-") : source));+ ToastService::instance().post(+ sev == Severity::Error ? ToastService::Severity::Error+ : ToastService::Severity::Warning,+ message,+ source.isEmpty() ? category : source);+ emit shell_errors_changed();+}++void ErrorPipeline::clear_shell_error(const QString& category) {+ if (shell_errors_.remove(category) > 0)+ emit shell_errors_changed();+}++int ErrorPipeline::panel_error_count() const {+ return panel_errors_.size();+}++int ErrorPipeline::shell_error_count() const {+ return shell_errors_.size();+}++} // namespace fincept::uidiff --git a/fincept-qt/src/ui/error/ErrorPipeline.h b/fincept-qt/src/ui/error/ErrorPipeline.hnew file mode 100644index 000000000..5f2780b94--- /dev/null+++ b/fincept-qt/src/ui/error/ErrorPipeline.h@@ -0,0 +1,62 @@+#pragma once++#include <QHash>+#include <QObject>+#include <QString>++namespace fincept::ui {++/// Phase 9 / decision 10.6: structured error pipeline panel → frame → shell.+///+/// Three reporting levels:+/// - **Panel**: an inline error specific to one panel ("AAPL quote+/// fetch failed"). Reported via `report_panel_error(panel_id, ...)`.+/// Subscribers: panel-level error banner widget (Phase 9 follow-up).+/// - **Frame**: an aggregate "this frame has 3 panels with errors"+/// surface for the frame's title bar / status. Computed from panel-+/// level errors; consumers query `panel_error_count_for_frame(...)`.+/// - **Shell**: a global "network: degraded" indicator. Reported via+/// `report_shell_error(category, ...)`. Subscribers: command bar+/// status indicator, status bar.+///+/// All errors also flow into NotificationService as toasts — the+/// pipeline is about *aggregation*, the notification service is about+/// *display*. The two coexist; consumers pick whichever surface fits.+class ErrorPipeline : public QObject {+ Q_OBJECT+ public:+ enum class Severity { Warning, Error };++ static ErrorPipeline& instance();++ /// Per-panel error. `panel_id` is the dock router string id (or the+ /// PanelInstanceId UUID — either works as a key, callers choose).+ void report_panel_error(const QString& panel_id, Severity sev,+ const QString& message, const QString& source = {});+ void clear_panel_errors(const QString& panel_id);++ /// Shell-level category error ("network", "telemetry", "auth", ...).+ /// Setting message to empty string clears the category.+ void report_shell_error(const QString& category, Severity sev,+ const QString& message, const QString& source = {});+ void clear_shell_error(const QString& category);++ /// Inspectors for surfaces.+ int panel_error_count() const; ///< total panels with at least one error+ int shell_error_count() const; ///< total shell categories with active errors++ signals:+ void panel_errors_changed(const QString& panel_id);+ void shell_errors_changed();++ private:+ ErrorPipeline() = default;++ /// panel_id → number of errors. Cleared via clear_panel_errors.+ QHash<QString, int> panel_errors_;++ /// category → latest message (empty after clear_shell_error).+ QHash<QString, QString> shell_errors_;+};++} // namespace fincept::uidiff --git a/fincept-qt/src/ui/navigation/StatusBar.cpp b/fincept-qt/src/ui/navigation/StatusBar.cppindex 9c7455cf9..32b729a76 100644--- a/fincept-qt/src/ui/navigation/StatusBar.cpp+++ b/fincept-qt/src/ui/navigation/StatusBar.cpp@@ -1,5 +1,9 @@#include "ui/navigation/StatusBar.h"+#include "core/symbol/SymbolContext.h"+#include "core/symbol/SymbolGroup.h"+#include "core/symbol/SymbolGroupRegistry.h"+#include "core/symbol/SymbolRef.h"#include "ui/theme/Theme.h"#include "ui/theme/ThemeManager.h"@@ -27,12 +31,92 @@ StatusBar::StatusBar(QWidget* parent) : QWidget(parent) {hl->addWidget(mk(" ", "sbSpacer"));}hl->addStretch();++ // Phase 7 polish: the active-symbol indicator. Sits left of READY so+ // it has natural prominence as the user's eye reaches the right side+ // of the status bar.+ link_label_ = mk(QString(), "sbLink");+ link_label_->setVisible(false); // hidden until first publish+ hl->addWidget(link_label_);+ hl->addWidget(mk(" | ", "sbSep2"));+ready_label_ = mk("READY", "sbReady");hl->addWidget(ready_label_);connect(&ThemeManager::instance(), &ThemeManager::theme_changed, this,[this](const ThemeTokens&) { refresh_theme(); });refresh_theme();++ wire_link_indicator();+}++void StatusBar::wire_link_indicator() {+ auto& ctx = fincept::SymbolContext::instance();+ // Update on every active-symbol publish. Phase 7 already broadcasts+ // these process-wide via the SymbolContext singleton.+ connect(&ctx, &fincept::SymbolContext::active_symbol_changed, this,+ [this](const fincept::SymbolRef& ref, QObject*) {+ // active_symbol doesn't carry a group; look it up by+ // walking the groups for the matching ref. Most common+ // case: the publisher just set group X to ref, so X+ // wins. Fall back to None if no group holds the ref.+ fincept::SymbolGroup matched = fincept::SymbolGroup::None;+ auto& sc = fincept::SymbolContext::instance();+ for (auto g : fincept::all_symbol_groups()) {+ if (sc.has_group_symbol(g) && sc.group_symbol(g) == ref) {+ matched = g;+ break;+ }+ }+ update_link_label(matched, ref);+ });+ connect(&ctx, &fincept::SymbolContext::group_symbol_changed, this,+ [this](fincept::SymbolGroup g, const fincept::SymbolRef& ref, QObject*) {+ // group_symbol_changed fires for unsetting too — ref invalid means+ // the group was cleared.+ if (!ref.is_valid())+ return;+ update_link_label(g, ref);+ });++ // Seed with whatever's already in SymbolContext (might have been+ // restored from workspace before the status bar was constructed).+ if (ctx.active().is_valid()) {+ // Try to attribute to a group if there's one.+ fincept::SymbolGroup matched = fincept::SymbolGroup::None;+ for (auto g : fincept::all_symbol_groups()) {+ if (ctx.has_group_symbol(g) && ctx.group_symbol(g) == ctx.active()) {+ matched = g;+ break;+ }+ }+ update_link_label(matched, ctx.active());+ }+}++void StatusBar::update_link_label(fincept::SymbolGroup g, const fincept::SymbolRef& ref) {+ if (!ref.is_valid()) {+ link_label_->setVisible(false);+ return;+ }+ QString text;+ if (g == fincept::SymbolGroup::None) {+ text = ref.display();+ } else {+ text = QString("%1 · %2")+ .arg(QChar(fincept::symbol_group_letter(g)))+ .arg(ref.display());+ }+ link_label_->setText(text);+ link_label_->setVisible(true);++ // Tint the label with the group's colour so it visually echoes the+ // GroupBadge in the panel tab. Falls back to TEXT_DIM for unlinked.+ const QColor tint = (g == fincept::SymbolGroup::None)+ ? QColor(colors::TEXT_DIM())+ : SymbolGroupRegistry::instance().color(g);+ link_label_->setStyleSheet(QString("color:%1;background:transparent;font-weight:600;")+ .arg(tint.name()));}void StatusBar::refresh_theme() {diff --git a/fincept-qt/src/ui/navigation/StatusBar.h b/fincept-qt/src/ui/navigation/StatusBar.hindex 632dd3151..36781d5bc 100644--- a/fincept-qt/src/ui/navigation/StatusBar.h+++ b/fincept-qt/src/ui/navigation/StatusBar.h@@ -3,9 +3,15 @@#include <QLabel>#include <QWidget>+namespace fincept {+class SymbolRef;+enum class SymbolGroup : char;+} // namespace fincept+namespace fincept::ui {-/// Bottom status bar — version, feed indicators, ready status.+/// Bottom status bar — version, feed indicators, ready status, and the+/// Phase 7-polish active-symbol indicator.class StatusBar : public QWidget {Q_OBJECTpublic:@@ -14,7 +20,18 @@ class StatusBar : public QWidget {private:void refresh_theme();++ /// Phase 7 polish: subscribe to SymbolContext to display the most-+ /// recently-published symbol + which colour group it lives in.+ /// Bloomberg's bottom bar shows the active security; this is the+ /// equivalent. Drives off SymbolContext::active_symbol_changed+ /// (which fires whenever any panel anywhere publishes via+ /// set_group_symbol).+ void wire_link_indicator();+ void update_link_label(SymbolGroup g, const SymbolRef& ref);+QLabel* ready_label_ = nullptr;+ QLabel* link_label_ = nullptr;};} // namespace fincept::uidiff --git a/fincept-qt/src/ui/navigation/ToolBar.cpp b/fincept-qt/src/ui/navigation/ToolBar.cppindex 66dda02cf..e1dcad166 100644--- a/fincept-qt/src/ui/navigation/ToolBar.cpp+++ b/fincept-qt/src/ui/navigation/ToolBar.cpp@@ -1,4 +1,4 @@-#include "ui/navigation/ToolBar.h"+#include "ui/navigation/ToolBar.h"#include "auth/AuthManager.h"#include "ui/theme/Theme.h"@@ -270,7 +270,7 @@ QMenu* ToolBar::build_file_menu() {// "Move to Monitor" — rebuilt on every popup so plug/unplug events are// reflected without restarting the app. Emits "move_to_monitor:<name>"- // so MainWindow can look the screen up by name (indices are unstable).+ // so WindowFrame can look the screen up by name (indices are unstable).auto* monitors = m->addMenu("Move to Monitor");monitors->setStyleSheet(popup_ss());connect(monitors, &QMenu::aboutToShow, this, [this, monitors]() {@@ -398,7 +398,7 @@ QMenu* ToolBar::build_view_menu() {m->addSeparator();m->addAction("Focus Mode\tF10", this, [this]() { emit action_triggered("focus_mode"); });// Phase 11: the shortcut is Ctrl+Shift+T; we don't mark the QAction as- // checkable because its state is owned by MainWindow::always_on_top_ —+ // checkable because its state is owned by WindowFrame::always_on_top_ —// a checkable toolbar action would drift out of sync on window focus// changes. If the user cares about the visual, the window's title bar// retains the OS-level "always on top" decoration on most platforms.diff --git a/fincept-qt/src/ui/notifications/NotificationService.cpp b/fincept-qt/src/ui/notifications/NotificationService.cppnew file mode 100644index 000000000..0186586ee--- /dev/null+++ b/fincept-qt/src/ui/notifications/NotificationService.cpp@@ -0,0 +1,44 @@+#include "ui/notifications/NotificationService.h"++#include "core/logging/Logger.h"++#include <QDateTime>++namespace fincept::ui {++ToastService& ToastService::instance() {+ static ToastService s;+ return s;+}++void ToastService::post(Severity sev, const QString& message, const QString& source,+ QWidget* target_frame) {+ Notification n;+ n.severity = sev;+ n.message = message;+ n.source = source;+ n.target_frame = target_frame;+ n.ts_ms = QDateTime::currentMSecsSinceEpoch();++ history_.prepend(n);+ while (history_.size() > kHistoryLimit)+ history_.removeLast();++ const char* level = "INFO";+ switch (sev) {+ case Severity::Success: level = "OK"; break;+ case Severity::Warning: level = "WARN"; break;+ case Severity::Error: level = "ERR"; break;+ case Severity::Info: break;+ }+ LOG_INFO("Toast",+ QString("[%1] %2 (%3)").arg(level, message, source.isEmpty() ? QStringLiteral("-") : source));++ emit posted(n);+}++QList<ToastService::Notification> ToastService::history() const {+ return history_;+}++} // namespace fincept::uidiff --git a/fincept-qt/src/ui/notifications/NotificationService.h b/fincept-qt/src/ui/notifications/NotificationService.hnew file mode 100644index 000000000..fbabc469f--- /dev/null+++ b/fincept-qt/src/ui/notifications/NotificationService.h@@ -0,0 +1,61 @@+#pragma once++#include <QList>+#include <QObject>+#include <QString>++class QWidget;++namespace fincept::ui {++/// Phase 9 / decision 10.7: shell-singleton toast service.+///+/// A "toast" is a short-lived message routed to a target frame (or the+/// shell-level toast tray when no frame target makes sense). Subscribers+/// — typically the per-frame `ToastBar` widget (Phase 9 follow-up) —+/// connect to `posted` and render their own toast UI. The service itself+/// just queues + emits; rendering + animation lives in the consumer.+///+/// Per design 10.7 we also keep a persistent dismissable history drawer.+/// That UI lands with the full Phase 9 ErrorPipeline. v1 just keeps the+/// last N notifications in memory for any drawer that wants them.+///+/// Naming note: this is intentionally `ToastService`, not `NotificationService`,+/// to avoid colliding with the pre-existing `fincept::notifications::NotificationService`+/// (the external-channel dispatcher: Telegram / Slack / Discord / etc.).+/// The two have different responsibilities and should not be confused.+class ToastService : public QObject {+ Q_OBJECT+ public:+ enum class Severity { Info, Success, Warning, Error };++ struct Notification {+ Severity severity = Severity::Info;+ QString message;+ QString source; ///< panel id / service name / action id+ QWidget* target_frame = nullptr; ///< nullptr = shell-level (any frame can show)+ qint64 ts_ms = 0;+ };++ static ToastService& instance();++ /// Post a notification. Stores in history; emits `posted` synchronously+ /// so connected toast bars render immediately.+ void post(Severity sev, const QString& message, const QString& source = {},+ QWidget* target_frame = nullptr);++ /// History (most recent first), capped at `kHistoryLimit`.+ QList<Notification> history() const;++ static constexpr int kHistoryLimit = 100;++ signals:+ void posted(const Notification& n);++ private:+ ToastService() = default;++ QList<Notification> history_;+};++} // namespace fincept::uidiff --git a/fincept-qt/src/ui/pushpins/PushpinBar.h b/fincept-qt/src/ui/pushpins/PushpinBar.hindex f526df2c1..31f3a6d36 100644--- a/fincept-qt/src/ui/pushpins/PushpinBar.h+++ b/fincept-qt/src/ui/pushpins/PushpinBar.h@@ -1,4 +1,4 @@-#pragma once+#pragma once#include <QWidget>class QHBoxLayout;@@ -10,7 +10,7 @@ namespace fincept::ui {class SymbolChip;/// Thin horizontal strip of symbol chips shown at the top of every-/// MainWindow. Rebuilt from PushpinService on every pins_changed signal.+/// WindowFrame. Rebuilt from PushpinService on every pins_changed signal./// Accepts drops of symbol MIME data (drag a symbol from any panel onto/// the bar to pin it).///diff --git a/fincept-qt/src/ui/theme/StyleSheets.cpp b/fincept-qt/src/ui/theme/StyleSheets.cppindex ed98ebfd9..0b8dcfa5a 100644--- a/fincept-qt/src/ui/theme/StyleSheets.cpp+++ b/fincept-qt/src/ui/theme/StyleSheets.cpp@@ -276,8 +276,19 @@ QString crypto_trading_styles() {" padding: 2px 10px; font-size: 11px; font-weight: 700; }""#cryptoApiBtn:hover { color: %4; background: %13; }"+ /* ── WS status pill ── */"#cryptoWsStatus { font-size: 10px; font-weight: 700; letter-spacing: 0.5px; "- " background: transparent; border: none; }"+ " background: transparent; border: 1px solid %3; border-radius: 9px; "+ " padding: 2px 8px; }"+ "#cryptoWsStatus[ws=\"live\"] { color: %15; border-color: %19; "+ " background: %17; }"+ "#cryptoWsStatus[ws=\"connecting\"] { color: %12; border-color: %10; "+ " background: %8; }"+ "#cryptoWsStatus[ws=\"offline\"] { color: %11; border-color: %20; "+ " background: %18; }"+ "#cryptoWsTransport { color: %9; font-size: 9px; font-weight: 600; "+ " letter-spacing: 0.5px; background: transparent; border: none; "+ " margin-left: 4px; }""#cryptoClock { color: %6; font-size: 11px; font-weight: 600; "" background: transparent; border: none; }"diff --git a/fincept-qt/src/ui/widgets/WorldMapWidget.cpp b/fincept-qt/src/ui/widgets/WorldMapWidget.cppindex 402c3d518..6cac3e589 100644--- a/fincept-qt/src/ui/widgets/WorldMapWidget.cpp+++ b/fincept-qt/src/ui/widgets/WorldMapWidget.cpp@@ -15,6 +15,8 @@#include <QNetworkAccessManager>#include <QNetworkDiskCache>#include <QPainter>+#include <QResizeEvent>+#include <QTimer>#include <QVBoxLayout>namespace fincept::ui {@@ -174,6 +176,19 @@ void WorldMapWidget::clear_pins() {rebuild_markers();}+void WorldMapWidget::resizeEvent(QResizeEvent* event) {+ QWidget::resizeEvent(event);+ // Re-fit on resize so the camera aspect tracks the widget. Debounce+ // through a single-shot timer so live drag-resizing doesn't spam flyTo+ // animations — one re-fit shortly after the user lets go is enough.+ if (!map_ready_ || pins_.isEmpty())+ return;+ QTimer::singleShot(150, this, [this]() {+ if (!pins_.isEmpty())+ fit_to_pins();+ });+}+void WorldMapWidget::fly_to(double lat, double lng, int zoom) {Q_UNUSED(zoom);if (!map_ready_)@@ -189,24 +204,90 @@ void WorldMapWidget::fit_to_pins() {double min_lat = 90, max_lat = -90, min_lng = 180, max_lng = -180;for (const auto& pin : pins_) {- if (pin.latitude < min_lat)- min_lat = pin.latitude;- if (pin.latitude > max_lat)- max_lat = pin.latitude;- if (pin.longitude < min_lng)- min_lng = pin.longitude;- if (pin.longitude > max_lng)- max_lng = pin.longitude;+ if (pin.latitude < min_lat) min_lat = pin.latitude;+ if (pin.latitude > max_lat) max_lat = pin.latitude;+ if (pin.longitude < min_lng) min_lng = pin.longitude;+ if (pin.longitude > max_lng) max_lng = pin.longitude;}- // Add padding (at least 2 degrees, or 20% of the span)- double lat_span = std::max(max_lat - min_lat, 1.0);- double lng_span = std::max(max_lng - min_lng, 1.0);- double lat_pad = std::max(lat_span * 0.2, 2.0);- double lng_pad = std::max(lng_span * 0.2, 2.0);+ // World-view fallback rectangle. Avoids the polar tile-coverage gap and+ // matches the standard Web-Mercator content extent we want filling the+ // viewport when pins are too sparse / globally scattered to fit usefully.+ constexpr double kWorldMinLat = -60.0, kWorldMaxLat = 75.0;+ constexpr double kWorldMinLng = -175.0, kWorldMaxLng = 175.0;++ double lat_span = std::max(max_lat - min_lat, 0.0);+ double lng_span = std::max(max_lng - min_lng, 0.0);++ // Globally-scattered pins → snap to world view; tighter zoom would just+ // wrap pins around the dateline gutter and leave big dark gaps.+ if (lng_span > 200.0 || lat_span > 110.0) {+ auto world = QGV::GeoRect(QGV::GeoPos(kWorldMaxLat, kWorldMinLng),+ QGV::GeoPos(kWorldMinLat, kWorldMaxLng));+ map_->flyTo(QGVCameraActions(map_).scaleTo(world));+ return;+ }++ // Pad proportionally to the span — 10% per side. Floor of 4° / 6° keeps a+ // single pin or tightly-clustered pins from zooming in absurdly far while+ // staying visually tight enough to avoid empty black space.+ double lat_pad = std::max(lat_span * 0.1, 4.0);+ double lng_pad = std::max(lng_span * 0.1, 6.0);++ double box_min_lat = min_lat - lat_pad;+ double box_max_lat = max_lat + lat_pad;+ double box_min_lng = min_lng - lng_pad;+ double box_max_lng = max_lng + lng_pad;++ // Match the widget's aspect ratio so QGeoView doesn't letterbox the+ // viewport with dark gutters on the long axis. Mercator distorts vertical+ // distance by ~1/cos(lat); use the centre latitude as a first-order+ // correction so the inflation feels right at high latitudes.+ double w = std::max(1, width());+ double h = std::max(1, height());+ double widget_aspect = w / h;+ double centre_lat = (box_min_lat + box_max_lat) * 0.5;+ double mercator_k = std::cos(centre_lat * 3.14159265358979 / 180.0);+ if (mercator_k < 0.2) mercator_k = 0.2;++ double box_lat_h = box_max_lat - box_min_lat;+ double box_lng_w = box_max_lng - box_min_lng;+ // Effective screen-aspect of the box (lng_w * cos(lat)) / lat_h.+ double box_aspect = (box_lng_w * mercator_k) / std::max(box_lat_h, 1e-6);++ if (box_aspect < widget_aspect) {+ // Box is too tall → widen it.+ double need_lng_w = (widget_aspect * box_lat_h) / mercator_k;+ double extra = (need_lng_w - box_lng_w) * 0.5;+ box_min_lng -= extra;+ box_max_lng += extra;+ } else {+ // Box is too wide → grow it vertically.+ double need_lat_h = (box_lng_w * mercator_k) / widget_aspect;+ double extra = (need_lat_h - box_lat_h) * 0.5;+ box_min_lat -= extra;+ box_max_lat += extra;+ }++ // Clamp to sensible viewable bounds. Beyond ±70° lat the OSM dark tiles+ // are mostly empty ocean / ice and produce visible black gutters at the+ // bottom of the map; above ±175° lng we cross the antimeridian gap.+ box_min_lat = std::max(box_min_lat, kWorldMinLat);+ box_max_lat = std::min(box_max_lat, kWorldMaxLat);+ box_min_lng = std::max(box_min_lng, kWorldMinLng);+ box_max_lng = std::min(box_max_lng, kWorldMaxLng);++ // After clamping, if the box now covers most of the world horizontally,+ // skip straight to the canonical world view to avoid an off-centre look.+ if ((box_max_lng - box_min_lng) > (kWorldMaxLng - kWorldMinLng) * 0.85) {+ auto world = QGV::GeoRect(QGV::GeoPos(kWorldMaxLat, kWorldMinLng),+ QGV::GeoPos(kWorldMinLat, kWorldMaxLng));+ map_->flyTo(QGVCameraActions(map_).scaleTo(world));+ return;+ }- auto target = QGV::GeoRect(QGV::GeoPos(max_lat + lat_pad, min_lng - lng_pad),- QGV::GeoPos(min_lat - lat_pad, max_lng + lng_pad));+ auto target = QGV::GeoRect(QGV::GeoPos(box_max_lat, box_min_lng),+ QGV::GeoPos(box_min_lat, box_max_lng));map_->flyTo(QGVCameraActions(map_).scaleTo(target));}diff --git a/fincept-qt/src/ui/widgets/WorldMapWidget.h b/fincept-qt/src/ui/widgets/WorldMapWidget.hindex 48fe3ebbb..7926afc65 100644--- a/fincept-qt/src/ui/widgets/WorldMapWidget.h+++ b/fincept-qt/src/ui/widgets/WorldMapWidget.h@@ -46,6 +46,9 @@ class WorldMapWidget : public QWidget {/// assigned id so the consumer can resolve back to its own data.void pin_clicked(int id);+ protected:+ void resizeEvent(QResizeEvent* event) override;+private:void rebuild_markers();QImage make_marker_image(const QColor& color, double radius) const;diff --git a/funding.json b/funding.jsonindex 5a5edaff6..88b6fd9ea 100644--- a/funding.json+++ b/funding.json@@ -6,7 +6,7 @@"role": "owner","name": "Fincept Corporation","email": "[email protected]",- "description": "Fincept Corporation develops the Fincept Terminal, a state-of-the-art open-source financial intelligence platform with CFA-level analytics, AI automation, and unlimited data connectivity. We build professional-grade financial tools that compete on analytics depth and data accessibility.",+ "description": "Fincept Corporation develops the Fincept Terminal, a state-of-the-art open-source financial intelligence platform with institutional-grade financial analytics, AI automation, and unlimited data connectivity. We build professional-grade financial tools that compete on analytics depth and data accessibility.","webpageUrl": {"url": "https://github.com/Fincept-Corporation/FinceptTerminal"}@@ -15,7 +15,7 @@{"guid": "fincept-terminal","name": "Fincept Terminal",- "description": "Native C++20 financial intelligence terminal built with Dear ImGui and embedded Python. Features complete CFA Level 1-3 analytics, 20+ AI investor personas, 100+ data connectors, visual workflow automation, maritime tracking, and geopolitical intelligence frameworks. A professional alternative to Bloomberg Terminal, built for analysts who refuse to be limited by traditional software.",+ "description": "Native C++20 financial intelligence terminal built with Dear ImGui and embedded Python. Features full multi-asset analytics across equity, portfolio, derivatives, fixed income, and alternatives, 20+ AI investor personas, 100+ data connectors, visual workflow automation, maritime tracking, and geopolitical intelligence frameworks. A professional alternative to Bloomberg Terminal, built for analysts who refuse to be limited by traditional software.","webpageUrl": {"url": "https://github.com/Fincept-Corporation/FinceptTerminal"},diff --git a/package-lock.json b/package-lock.jsondeleted file mode 100644index f46c09d36..000000000--- a/package-lock.json+++ /dev/null@@ -1,6 +0,0 @@-{- "name": "finceptTerminal",- "lockfileVersion": 3,- "requires": true,- "packages": {}-}diff --git a/package.json b/package.jsondeleted file mode 100644index 0967ef424..000000000--- a/package.json+++ /dev/null@@ -1 +0,0 @@-{}