Commit Graph

215 Commits

Author SHA1 Message Date
Z
f02c5df2b6 Merge branch 'tinkle-community:dev' into dev 2025-11-02 00:08:58 +08:00
ZhouYongyou
88a7055561 feat: 添加技术位优先止盈 + 追踪止损(阶段1)
解决问题:
- 固定百分比止盈经常在技术位前回撤
- 浮盈没有保护机制,从 +1.5% 回撤到止损

核心改进:
1. 技术位优先止盈:
   - 震荡策略:技术位 < 2% → 止盈设在技术位前 0.1%
   - 趋势策略:技术位 < 5% → 止盈设在技术位前 0.2%
   - 技术位识别:EMA20、最近高低点、整数关口

2. 追踪止损机制:
   - 震荡:浮盈 0.8% → 止损移到成本价,浮盈 1.2% → 止损移到 +0.5%
   - 趋势:浮盈 2% → 止损移到成本价,浮盈 5% → 止损移到 +2.5%
   - 价格接近技术位 → 主动平仓避免回撤

3. 分批止盈预留:
   - 趋势策略:技术位在 5-10% → 分两批止盈
   - 为阶段2分批止盈做准备

预期效果:
- 减少"快到止盈就回撤"的情况
- 锁定浮盈,避免全部回撤
- 提高实际盈亏比

实施方式:纯提示词改进,基于已有数据(EMA20、K线高低点)

🤖 Generated with Claude Code
2025-11-02 00:03:20 +08:00
SkywalkerJi
6c03d247e1 Docker port mapping prompts. 2025-11-02 00:03:19 +08:00
tinkle-community
775446d939 Merge pull request #201 from SkywalkerJi/dev
Mapping the prompts folder in Docker.
2025-11-01 22:33:30 +08:00
SkywalkerJi
24a9a4b2a3 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev 2025-11-01 22:31:09 +08:00
SkywalkerJi
cee927a46d Docker port mapping prompts. 2025-11-01 22:28:49 +08:00
Z
e51cbf4092 Merge branch 'tinkle-community:dev' into dev 2025-11-01 21:03:57 +08:00
ZhouYongyou
e708c99db2 feat: 添加自适应双策略系统(震荡 + 趋势)
根据 ADAPTIVE_STRATEGY_DESIGN.md 方案 A(简单版)实现:

新增功能:
1. 市场状态判断(3个指标交叉验证):
   - 多时间框架一致性(15m/1h/4h MACD 方向)
   - 价格波动率(最近 10 根 K线波动幅度)
   - 买卖压力极端值(BuySellRatio 连续性)

2. 双策略系统:
   - 策略 A(震荡交易):止盈 1-2%,止损 0.8-1%,盈亏比 1:1.5-1:2
   - 策略 B(趋势跟随):止盈 5-10%,止损 1.5-2%,盈亏比 1:3-1:5

3. 策略选择指导:AI 必须在思维链中明确说明市场状态判断和策略选择

改进效果:
- 让 AI 根据市场状态动态调整止盈止损
- 震荡市场快进快出,趋势市场让利润奔跑
- 预期提升胜率和盈亏比,降低最大回撤

实施方式:纯提示词改进(无代码变更),耗时 30 分钟

🤖 Generated with Claude Code
2025-11-01 20:40:31 +08:00
tinkle-community
17c927b04a Merge pull request #194 from Icyoung/dev
Remote auth for prompt templates
2025-11-01 20:34:32 +08:00
tinkle-community
37dff0b3f0 Merge pull request #192 from Icyoung/dev
Dev Bug fix
2025-11-01 20:28:06 +08:00
icy
2cc91d1701 Remote auth for prompt templates 2025-11-01 20:25:55 +08:00
Z
4fbb4ecea5 Merge branch 'dev' into dev 2025-11-01 20:17:20 +08:00
icy
2538d2f928 Merge branch 'dev' of https://github.com/tinkle-community/nofx 2025-11-01 20:09:17 +08:00
tinkle-community
6659625da1 Merge pull request #189 from SkywalkerJi/dev
Supports custom system prompts and custom models.
2025-11-01 19:49:26 +08:00
SkywalkerJi
798133e479 Merge branch 'tinkle-community:dev' into dev 2025-11-01 20:46:33 +09:00
SkywalkerJi
4250c11ddf Supports custom system prompts and custom models. 2025-11-01 19:45:54 +08:00
icy
01ee3d57d9 Fixed i18n lint 2025-11-01 19:39:27 +08:00
icy
996b152eba Resolve merge conflicts in AITradersPage.tsx
- Fixed import statement conflict (using 'type Language')
- Merged exchange configuration logic preserving support for multiple exchange types
- Kept comprehensive form handling for Binance, Hyperliquid, Aster, and OKX exchanges
- Updated security warning messages to use proper translation keys

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-01 19:01:44 +08:00
icy
f413f87f39 Fixed health check; Fixed dex config; Add rank trader info view; 2025-11-01 18:58:32 +08:00
SkywalkerJi
5be7106eb2 Rename the model. 2025-11-01 17:10:36 +08:00
SkywalkerJi
7bc936880c Reordering system prompts. 2025-11-01 16:25:36 +08:00
tinkle-community
c24a9e57cb Merge pull request #177 from SkywalkerJi/dev
Fixed the custom model URL. Added functionality for custom model names.
2025-11-01 16:13:37 +08:00
SkywalkerJi
ebe7882205 Merge branch 'tinkle-community:dev' into dev 2025-11-01 17:09:55 +09:00
SkywalkerJi
48d1320209 * Fixed the custom model URL.
*   Added functionality for custom model names.
2025-11-01 16:09:15 +08:00
tinkle-community
2d99dda666 Merge pull request #172 from SkywalkerJi/dev
Eliminating Model Shorting Bias.
2025-11-01 14:55:26 +08:00
SkywalkerJi
db782eb314 Eliminating Model Shorting Bias. 2025-11-01 14:44:07 +08:00
tinkle
faa6818092 merge main fix Conflict 2025-11-01 13:14:22 +08:00
tinkle-community
a090040519 Merge pull request #162 from tangmengqiu/fix/i18n-english-display
Fix/i18n english display
2025-11-01 12:20:25 +08:00
tangmengqiu
7bde647112 fix: Remove duplicate selectExchange key in translations
Fixed TypeScript compilation error TS1117 caused by duplicate
'selectExchange' key in both English and Chinese translation objects.

The key was already defined in the "AI Traders Management" section,
so removed the duplicate from "AI Traders Page - Additional" section.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-01 00:02:00 -04:00
tangmengqiu
8bc06ae619 fix: Complete i18n implementation for English language display
This commit addresses the issue where switching to English still showed Chinese text in many UI elements.

Changes made:
- Added 40+ missing translation keys to translations.ts for both English and Chinese
- Updated App.tsx to use t() function for all hardcoded text (logout button, loading message)
- Updated AITradersPage.tsx extensively:
  - Replaced all alert/confirm messages with translation keys
  - Updated status labels (inUse, enabled, configured)
  - Updated all modal components (SignalSource, ModelConfig, ExchangeConfig)
  - Added language prop to all modal components
  - Replaced all Chinese UI text with translation function calls

The implementation now properly supports language switching between English and Chinese throughout the entire application.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-31 23:58:44 -04:00
tinkle-community
0a8ed95140 Merge pull request #160 from hrzisme/update-readme-narrative-team
Simplify team intro and clarify contact channels
2025-11-01 11:31:16 +08:00
ZhouYongyou
0b9d696853 添加震荡交易策略 + 买卖压力分析
**核心功能**:
- 新增买卖压力数据解析(TakerBuyVolume, BuySellRatio)
- 重写系统提示词为震荡交易策略
- 添加连续放量检测功能(2-3根K线)

**技术细节**:
- market/data.go: 解析币安 K线 item[9] 为主动买入量
- decision/engine.go: 震荡区间识别 + 区间边界入场逻辑
- IntradayData: 新增 Volumes 和 BuySellRatios 数组
2025-11-01 11:30:50 +08:00
nobody
5adb171bc7 Simplify team intro and clarify contact channels
- Remove job descriptions, keep only names and Twitter handles
- Investment: DM Tinkle or Zack
- Partnerships: DM official Twitter @nofx_ai
2025-11-01 11:28:11 +08:00
tinkle-community
601af7ba7f Merge pull request #159 from hrzisme/update-readme-narrative-team
Update readme narrative team
2025-11-01 11:05:09 +08:00
nobody
736d455771 Add official Twitter account @nofx_ai to all READMEs 2025-11-01 10:53:58 +08:00
nobody
c5b1e98995 Update multilingual READMEs: Reposition as Agentic Trading OS with team info 2025-11-01 10:49:48 +08:00
tinkle-community
d1dde246a9 Merge pull request #156 from hrzisme/update-readme-narrative-team
Update README.md
2025-11-01 10:46:36 +08:00
nobody
df4db71306 Update README: Add Zack's Twitter handle and refine team/funding info 2025-11-01 10:41:37 +08:00
nobody
f2b04707f7 Update README.md 2025-11-01 10:30:24 +08:00
Z
1cc43cec60 Merge branch 'tinkle-community:dev' into dev 2025-11-01 02:57:18 +08:00
tinkle-community
b87fcb62bd Merge pull request #151 from Icyoung/dev
Dev 竞赛fix、交易员新增参数
2025-11-01 02:42:42 +08:00
icy
3033a1308d 删除未使用的AlertTriangle导入
🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-01 02:34:33 +08:00
icy
19bb5a3a54 手动合并冲突,保留TraderConfigModal功能并添加lucide-react图标支持
- 解决AITradersPage.tsx合并冲突,保留TraderConfigModal导入
- 添加lucide-react图标库支持
- 保留信号源配置的OI TOP URL功能
- 使用我们版本解决其他文件冲突,保持UI简洁
- 确保编译成功和依赖正确安装

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-01 02:33:37 +08:00
Luna Martinez
c35841fa43 Merge pull request #134 from tpkeeper/dev
fix(mcp/client): correct receiver name
2025-10-31 14:25:20 -04:00
icy
9fe8f1a1e7 Merge branch 'dev' of github.com:Icyoung/nofx
# Conflicts:
#	manager/trader_manager.go
#	web/src/components/AITradersPage.tsx
2025-11-01 02:23:05 +08:00
tinkle-community
9a675da33d Merge pull request #138 from zhoujunhehe/dev
UI feat: enhance UI with Lucide icons & add LOGO
2025-11-01 02:21:44 +08:00
icy
a7cc5e5ed4 竞赛fix、交易员新增参数 2025-11-01 02:17:11 +08:00
ZhouYongyou
17ad15ca4e refactor: unify to simplified Chinese in logs 2025-11-01 00:25:58 +08:00
ZhouYongyou
cf8bf6e42d Merge branch 'dev' of https://github.com/tinkle-community/nofx into dev 2025-11-01 00:01:41 +08:00
ZhouYongyou
396df86367 Cancel orphan orders when position is closed
Added logic to automatically cancel all orders for a symbol when its position disappears, ensuring orphan stop-loss/take-profit orders are cleaned up. This improves order management and prevents unintended trades after a position is closed.
2025-11-01 00:01:38 +08:00