-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
chore: integrate current open pull requests #8310
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
EterUltimate
wants to merge
2,211
commits into
AstrBotDevs:master
from
EterUltimate:codex/integrate-all-open-prs-master-20260523
Closed
Changes from all commits
Commits
Show all changes
2211 commits
Select commit
Hold shift + click to select a range
859cd78
Merge remote-tracking branch 'origin/pr/4813' into codex/integrate-al…
EterUltimate f614aef
Merge remote-tracking branch 'origin/pr/4842' into codex/integrate-al…
EterUltimate 7ec96be
Merge remote-tracking branch 'origin/pr/4850' into codex/integrate-al…
EterUltimate f79bf06
Merge remote-tracking branch 'origin/pr/4854' into codex/integrate-al…
EterUltimate f7a3e72
Merge remote-tracking branch 'origin/pr/4861' into codex/integrate-al…
EterUltimate bc7c3cd
Merge remote-tracking branch 'origin/pr/4886' into codex/integrate-al…
EterUltimate cabeb2c
Merge remote-tracking branch 'origin/pr/4894' into codex/integrate-al…
EterUltimate 446a3f6
Merge remote-tracking branch 'origin/pr/5051' into codex/integrate-al…
EterUltimate dd1ec09
Merge remote-tracking branch 'origin/pr/5087' into codex/integrate-al…
EterUltimate a715575
Merge remote-tracking branch 'origin/pr/5090' into codex/integrate-al…
EterUltimate 6bd9c07
Merge remote-tracking branch 'origin/pr/5093' into codex/integrate-al…
EterUltimate 960c402
Merge remote-tracking branch 'origin/pr/5245' into codex/integrate-al…
EterUltimate 86e0688
Merge remote-tracking branch 'origin/pr/5291' into codex/integrate-al…
EterUltimate 52d23c2
Merge remote-tracking branch 'origin/pr/5398' into codex/integrate-al…
EterUltimate d2ac020
Merge remote-tracking branch 'origin/pr/5487' into codex/integrate-al…
EterUltimate 2e4c852
Merge remote-tracking branch 'origin/pr/5512' into codex/integrate-al…
EterUltimate 77af6ae
Merge remote-tracking branch 'origin/pr/5597' into codex/integrate-al…
EterUltimate 0de282f
Merge remote-tracking branch 'origin/pr/5690' into codex/integrate-al…
EterUltimate 9c7b1e8
Merge remote-tracking branch 'origin/pr/5701' into codex/integrate-al…
EterUltimate a13051c
Merge remote-tracking branch 'origin/pr/5739' into codex/integrate-al…
EterUltimate 66d7f89
Merge remote-tracking branch 'origin/pr/5749' into codex/integrate-al…
EterUltimate e0286b3
Merge remote-tracking branch 'origin/pr/5759' into codex/integrate-al…
EterUltimate b0d794b
Merge remote-tracking branch 'origin/pr/5797' into codex/integrate-al…
EterUltimate d6961d1
Merge remote-tracking branch 'origin/pr/5816' into codex/integrate-al…
EterUltimate 353b786
Merge remote-tracking branch 'origin/pr/5882' into codex/integrate-al…
EterUltimate 1577ade
Merge remote-tracking branch 'origin/pr/5980' into codex/integrate-al…
EterUltimate 48a2b20
Merge remote-tracking branch 'origin/pr/6007' into codex/integrate-al…
EterUltimate 2140d96
Merge remote-tracking branch 'origin/pr/6008' into codex/integrate-al…
EterUltimate 13f9d67
Merge remote-tracking branch 'origin/pr/6040' into codex/integrate-al…
EterUltimate 0ac32ce
Merge remote-tracking branch 'origin/pr/6041' into codex/integrate-al…
EterUltimate 926e91b
Merge remote-tracking branch 'origin/pr/6042' into codex/integrate-al…
EterUltimate 18ba21c
Merge remote-tracking branch 'origin/pr/6046' into codex/integrate-al…
EterUltimate f9aafc7
Merge remote-tracking branch 'origin/pr/6050' into codex/integrate-al…
EterUltimate e079516
Merge remote-tracking branch 'origin/pr/6067' into codex/integrate-al…
EterUltimate 2717aa2
Merge remote-tracking branch 'origin/pr/6069' into codex/integrate-al…
EterUltimate 2d2524a
Merge remote-tracking branch 'origin/pr/6075' into codex/integrate-al…
EterUltimate e18a635
Merge remote-tracking branch 'origin/pr/6079' into codex/integrate-al…
EterUltimate a69408f
Merge remote-tracking branch 'origin/pr/6085' into codex/integrate-al…
EterUltimate db13a58
Merge remote-tracking branch 'origin/pr/6090' into codex/integrate-al…
EterUltimate c634f10
Merge remote-tracking branch 'origin/pr/6092' into codex/integrate-al…
EterUltimate 60af353
Merge remote-tracking branch 'origin/pr/6102' into codex/integrate-al…
EterUltimate 9ec7bce
Merge remote-tracking branch 'origin/pr/6115' into codex/integrate-al…
EterUltimate 6c3a01a
Merge remote-tracking branch 'origin/pr/6116' into codex/integrate-al…
EterUltimate 68e148a
Merge remote-tracking branch 'origin/pr/6117' into codex/integrate-al…
EterUltimate 76a3cc2
Merge remote-tracking branch 'origin/pr/6143' into codex/integrate-al…
EterUltimate d583d9f
Merge remote-tracking branch 'origin/pr/6147' into codex/integrate-al…
EterUltimate 8d7783b
Merge remote-tracking branch 'origin/pr/6168' into codex/integrate-al…
EterUltimate 765840c
Merge remote-tracking branch 'origin/pr/6186' into codex/integrate-al…
EterUltimate 8182953
Merge remote-tracking branch 'origin/pr/6224' into codex/integrate-al…
EterUltimate ab5003d
Merge remote-tracking branch 'origin/pr/6255' into codex/integrate-al…
EterUltimate df2158a
Merge remote-tracking branch 'origin/pr/6274' into codex/integrate-al…
EterUltimate 85bab8f
Merge remote-tracking branch 'origin/pr/6277' into codex/integrate-al…
EterUltimate 9cca112
Merge remote-tracking branch 'origin/pr/6322' into codex/integrate-al…
EterUltimate 46358ad
Merge remote-tracking branch 'origin/pr/6325' into codex/integrate-al…
EterUltimate c10d18c
Merge remote-tracking branch 'origin/pr/6344' into codex/integrate-al…
EterUltimate 375925c
Merge remote-tracking branch 'origin/pr/6401' into codex/integrate-al…
EterUltimate 8615afd
Merge remote-tracking branch 'origin/pr/6414' into codex/integrate-al…
EterUltimate 3497d5e
Merge remote-tracking branch 'origin/pr/6422' into codex/integrate-al…
EterUltimate b9605f3
Merge remote-tracking branch 'origin/pr/6428' into codex/integrate-al…
EterUltimate ddb5b09
Merge remote-tracking branch 'origin/pr/6430' into codex/integrate-al…
EterUltimate 1083114
Merge remote-tracking branch 'origin/pr/6465' into codex/integrate-al…
EterUltimate 791e2b0
Merge remote-tracking branch 'origin/pr/6488' into codex/integrate-al…
EterUltimate 0a3d44c
Merge remote-tracking branch 'origin/pr/6492' into codex/integrate-al…
EterUltimate 6a9d437
Merge remote-tracking branch 'origin/pr/6519' into codex/integrate-al…
EterUltimate f604213
Merge remote-tracking branch 'origin/pr/6542' into codex/integrate-al…
EterUltimate 9107606
Merge remote-tracking branch 'origin/pr/6557' into codex/integrate-al…
EterUltimate 98b8984
Merge remote-tracking branch 'origin/pr/6580' into codex/integrate-al…
EterUltimate e0876cb
Merge remote-tracking branch 'origin/pr/6595' into codex/integrate-al…
EterUltimate 027c558
Merge remote-tracking branch 'origin/pr/6603' into codex/integrate-al…
EterUltimate c26cd3d
Merge remote-tracking branch 'origin/pr/6619' into codex/integrate-al…
EterUltimate 16c2190
Merge remote-tracking branch 'origin/pr/6625' into codex/integrate-al…
EterUltimate 96998cf
Merge remote-tracking branch 'origin/pr/6642' into codex/integrate-al…
EterUltimate d82e1a4
Merge remote-tracking branch 'origin/pr/6654' into codex/integrate-al…
EterUltimate 3c44e5b
Merge remote-tracking branch 'origin/pr/6660' into codex/integrate-al…
EterUltimate 5f68b10
Merge remote-tracking branch 'origin/pr/6668' into codex/integrate-al…
EterUltimate 0584d72
Merge remote-tracking branch 'origin/pr/6673' into codex/integrate-al…
EterUltimate 690dde1
Merge remote-tracking branch 'origin/pr/6691' into codex/integrate-al…
EterUltimate e7e6fee
Merge remote-tracking branch 'origin/pr/6693' into codex/integrate-al…
EterUltimate e5611e6
Merge remote-tracking branch 'origin/pr/6695' into codex/integrate-al…
EterUltimate 632490c
Merge remote-tracking branch 'origin/pr/6705' into codex/integrate-al…
EterUltimate f7576d6
Merge remote-tracking branch 'origin/pr/6716' into codex/integrate-al…
EterUltimate 4cc2471
Merge remote-tracking branch 'origin/pr/6721' into codex/integrate-al…
EterUltimate 448230e
Merge remote-tracking branch 'origin/pr/6725' into codex/integrate-al…
EterUltimate 71fbd87
Merge remote-tracking branch 'origin/pr/6727' into codex/integrate-al…
EterUltimate 9994c53
Merge remote-tracking branch 'origin/pr/6733' into codex/integrate-al…
EterUltimate 0d6bab4
Merge remote-tracking branch 'origin/pr/6736' into codex/integrate-al…
EterUltimate b568fab
Merge remote-tracking branch 'origin/pr/6738' into codex/integrate-al…
EterUltimate f3e74bc
Merge remote-tracking branch 'origin/pr/6763' into codex/integrate-al…
EterUltimate 79a8438
Merge remote-tracking branch 'origin/pr/6787' into codex/integrate-al…
EterUltimate 95f3a33
Merge remote-tracking branch 'origin/pr/6817' into codex/integrate-al…
EterUltimate 000074e
Merge remote-tracking branch 'origin/pr/6835' into codex/integrate-al…
EterUltimate c747736
Merge remote-tracking branch 'origin/pr/6850' into codex/integrate-al…
EterUltimate 771c0ac
Merge remote-tracking branch 'origin/pr/6864' into codex/integrate-al…
EterUltimate 1c3047f
Merge remote-tracking branch 'origin/pr/6872' into codex/integrate-al…
EterUltimate 4dd4a35
Merge remote-tracking branch 'origin/pr/6873' into codex/integrate-al…
EterUltimate 86c9535
Merge remote-tracking branch 'origin/pr/6888' into codex/integrate-al…
EterUltimate 0124aab
Merge remote-tracking branch 'origin/pr/6906' into codex/integrate-al…
EterUltimate bd48220
Merge remote-tracking branch 'origin/pr/6913' into codex/integrate-al…
EterUltimate e8a636b
Merge remote-tracking branch 'origin/pr/6917' into codex/integrate-al…
EterUltimate 2732811
Merge remote-tracking branch 'origin/pr/6921' into codex/integrate-al…
EterUltimate e335e40
Merge remote-tracking branch 'origin/pr/7009' into codex/integrate-al…
EterUltimate 76a8265
Merge remote-tracking branch 'origin/pr/7095' into codex/integrate-al…
EterUltimate de549b5
Merge remote-tracking branch 'origin/pr/7112' into codex/integrate-al…
EterUltimate f2b902a
Merge remote-tracking branch 'origin/pr/7160' into codex/integrate-al…
EterUltimate bc9c09d
Merge remote-tracking branch 'origin/pr/7174' into codex/integrate-al…
EterUltimate c6a2571
Merge remote-tracking branch 'origin/pr/7176' into codex/integrate-al…
EterUltimate 9eb4ac1
Merge remote-tracking branch 'origin/pr/7228' into codex/integrate-al…
EterUltimate 341f4e2
Merge remote-tracking branch 'origin/pr/7232' into codex/integrate-al…
EterUltimate bd3f1e9
Merge remote-tracking branch 'origin/pr/7237' into codex/integrate-al…
EterUltimate 1d6f730
Merge remote-tracking branch 'origin/pr/7252' into codex/integrate-al…
EterUltimate f7a7a99
Merge remote-tracking branch 'origin/pr/7261' into codex/integrate-al…
EterUltimate 69da82e
Merge remote-tracking branch 'origin/pr/7280' into codex/integrate-al…
EterUltimate 1026fdc
Merge remote-tracking branch 'origin/pr/7289' into codex/integrate-al…
EterUltimate c303211
Merge remote-tracking branch 'origin/pr/7306' into codex/integrate-al…
EterUltimate 66cb0f7
Merge remote-tracking branch 'origin/pr/7310' into codex/integrate-al…
EterUltimate cad6498
Merge remote-tracking branch 'origin/pr/7314' into codex/integrate-al…
EterUltimate 4f7722b
Merge remote-tracking branch 'origin/pr/7359' into codex/integrate-al…
EterUltimate 323fe4f
Merge remote-tracking branch 'origin/pr/7361' into codex/integrate-al…
EterUltimate 189e37f
Merge remote-tracking branch 'origin/pr/7424' into codex/integrate-al…
EterUltimate 54dae62
Merge remote-tracking branch 'origin/pr/7436' into codex/integrate-al…
EterUltimate 6f7d380
Merge remote-tracking branch 'origin/pr/7438' into codex/integrate-al…
EterUltimate b21ccd8
Merge remote-tracking branch 'origin/pr/7508' into codex/integrate-al…
EterUltimate be00259
Merge remote-tracking branch 'origin/pr/7516' into codex/integrate-al…
EterUltimate a1a5518
Merge remote-tracking branch 'origin/pr/7573' into codex/integrate-al…
EterUltimate 7b158b7
Merge remote-tracking branch 'origin/pr/7598' into codex/integrate-al…
EterUltimate da4eff1
Merge remote-tracking branch 'origin/pr/7624' into codex/integrate-al…
EterUltimate 73ee74b
Merge remote-tracking branch 'origin/pr/7640' into codex/integrate-al…
EterUltimate dedeb07
Merge remote-tracking branch 'origin/pr/7645' into codex/integrate-al…
EterUltimate 187be39
Merge remote-tracking branch 'origin/pr/7649' into codex/integrate-al…
EterUltimate 74ebb99
Merge remote-tracking branch 'origin/pr/7671' into codex/integrate-al…
EterUltimate d449ccc
Merge remote-tracking branch 'origin/pr/7687' into codex/integrate-al…
EterUltimate a71441c
Merge remote-tracking branch 'origin/pr/7702' into codex/integrate-al…
EterUltimate ddee46e
Merge remote-tracking branch 'origin/pr/7712' into codex/integrate-al…
EterUltimate b38d5ca
Merge remote-tracking branch 'origin/pr/7719' into codex/integrate-al…
EterUltimate 62d54b7
Merge remote-tracking branch 'origin/pr/7720' into codex/integrate-al…
EterUltimate c0f932c
Merge remote-tracking branch 'origin/pr/7724' into codex/integrate-al…
EterUltimate 31c7e25
Merge remote-tracking branch 'origin/pr/7726' into codex/integrate-al…
EterUltimate 34bafe0
Merge remote-tracking branch 'origin/pr/7735' into codex/integrate-al…
EterUltimate ba8f928
Merge remote-tracking branch 'origin/pr/7736' into codex/integrate-al…
EterUltimate 6b8649f
Merge remote-tracking branch 'origin/pr/7744' into codex/integrate-al…
EterUltimate 279357b
Merge remote-tracking branch 'origin/pr/7749' into codex/integrate-al…
EterUltimate b0a3da3
Merge remote-tracking branch 'origin/pr/7760' into codex/integrate-al…
EterUltimate 81a2693
Merge remote-tracking branch 'origin/pr/7765' into codex/integrate-al…
EterUltimate ad24e15
Merge remote-tracking branch 'origin/pr/7766' into codex/integrate-al…
EterUltimate 07adbd7
Merge remote-tracking branch 'origin/pr/7768' into codex/integrate-al…
EterUltimate 7efe6c2
Merge remote-tracking branch 'origin/pr/7779' into codex/integrate-al…
EterUltimate 2268fd5
Merge remote-tracking branch 'origin/pr/7786' into codex/integrate-al…
EterUltimate be56a6d
Merge remote-tracking branch 'origin/pr/7790' into codex/integrate-al…
EterUltimate faa042e
Merge remote-tracking branch 'origin/pr/7811' into codex/integrate-al…
EterUltimate 8f4e914
Merge remote-tracking branch 'origin/pr/7813' into codex/integrate-al…
EterUltimate 63241fa
Merge remote-tracking branch 'origin/pr/7815' into codex/integrate-al…
EterUltimate 116f1ba
Merge remote-tracking branch 'origin/pr/7837' into codex/integrate-al…
EterUltimate 5cd923b
Merge remote-tracking branch 'origin/pr/7839' into codex/integrate-al…
EterUltimate 0eb6314
Merge remote-tracking branch 'origin/pr/7849' into codex/integrate-al…
EterUltimate f10c03a
Merge remote-tracking branch 'origin/pr/7858' into codex/integrate-al…
EterUltimate f0b6a90
Merge remote-tracking branch 'origin/pr/7866' into codex/integrate-al…
EterUltimate cfcc095
Merge remote-tracking branch 'origin/pr/7868' into codex/integrate-al…
EterUltimate 049d2be
Merge remote-tracking branch 'origin/pr/7873' into codex/integrate-al…
EterUltimate 3f24402
Merge remote-tracking branch 'origin/pr/7883' into codex/integrate-al…
EterUltimate 5bc40b6
Merge remote-tracking branch 'origin/pr/7893' into codex/integrate-al…
EterUltimate 927faee
Merge remote-tracking branch 'origin/pr/7895' into codex/integrate-al…
EterUltimate 5b2ca7d
Merge remote-tracking branch 'origin/pr/7902' into codex/integrate-al…
EterUltimate 0934587
Merge remote-tracking branch 'origin/pr/7913' into codex/integrate-al…
EterUltimate f341c0d
Merge remote-tracking branch 'origin/pr/7939' into codex/integrate-al…
EterUltimate 832dad8
Merge remote-tracking branch 'origin/pr/7947' into codex/integrate-al…
EterUltimate 78f0e55
Merge remote-tracking branch 'origin/pr/7955' into codex/integrate-al…
EterUltimate 2b36c32
Merge remote-tracking branch 'origin/pr/7959' into codex/integrate-al…
EterUltimate 49d7b3a
Merge remote-tracking branch 'origin/pr/7967' into codex/integrate-al…
EterUltimate 536c216
Merge remote-tracking branch 'origin/pr/7975' into codex/integrate-al…
EterUltimate 98341dd
Merge remote-tracking branch 'origin/pr/7978' into codex/integrate-al…
EterUltimate d844788
Merge remote-tracking branch 'origin/pr/7981' into codex/integrate-al…
EterUltimate c954f70
Merge remote-tracking branch 'origin/pr/7983' into codex/integrate-al…
EterUltimate a19840e
Merge remote-tracking branch 'origin/pr/8018' into codex/integrate-al…
EterUltimate 998bcfc
Merge remote-tracking branch 'origin/pr/8023' into codex/integrate-al…
EterUltimate 6b8a547
Merge remote-tracking branch 'origin/pr/8025' into codex/integrate-al…
EterUltimate fb34a4c
Merge remote-tracking branch 'origin/pr/8036' into codex/integrate-al…
EterUltimate 5dece82
Merge remote-tracking branch 'origin/pr/8050' into codex/integrate-al…
EterUltimate 334316b
Merge remote-tracking branch 'origin/pr/8058' into codex/integrate-al…
EterUltimate 287a33e
Merge remote-tracking branch 'origin/pr/8060' into codex/integrate-al…
EterUltimate a4ac40d
Merge remote-tracking branch 'origin/pr/8062' into codex/integrate-al…
EterUltimate 6179ce9
Merge remote-tracking branch 'origin/pr/8063' into codex/integrate-al…
EterUltimate b083909
Merge remote-tracking branch 'origin/pr/8064' into codex/integrate-al…
EterUltimate 4eb3c67
Merge remote-tracking branch 'origin/pr/8068' into codex/integrate-al…
EterUltimate c80e873
Merge remote-tracking branch 'origin/pr/8083' into codex/integrate-al…
EterUltimate 8b8899d
Merge remote-tracking branch 'origin/pr/8089' into codex/integrate-al…
EterUltimate 11b997a
Merge remote-tracking branch 'origin/pr/8093' into codex/integrate-al…
EterUltimate ac0cf8b
Merge remote-tracking branch 'origin/pr/8105' into codex/integrate-al…
EterUltimate e040a9e
Merge remote-tracking branch 'origin/pr/8116' into codex/integrate-al…
EterUltimate de7ccc6
Merge remote-tracking branch 'origin/pr/8121' into codex/integrate-al…
EterUltimate 67e2b22
Merge remote-tracking branch 'origin/pr/8127' into codex/integrate-al…
EterUltimate cd5008f
Merge remote-tracking branch 'origin/pr/8128' into codex/integrate-al…
EterUltimate 5a40e32
Merge remote-tracking branch 'origin/pr/8134' into codex/integrate-al…
EterUltimate 87c157c
Merge remote-tracking branch 'origin/pr/8139' into codex/integrate-al…
EterUltimate 2a7a63a
Merge remote-tracking branch 'origin/pr/8146' into codex/integrate-al…
EterUltimate 2b9b319
Merge remote-tracking branch 'origin/pr/8151' into codex/integrate-al…
EterUltimate 5eebf67
Merge remote-tracking branch 'origin/pr/8152' into codex/integrate-al…
EterUltimate 97152d6
Merge remote-tracking branch 'origin/pr/8155' into codex/integrate-al…
EterUltimate c079c22
Merge remote-tracking branch 'origin/pr/8165' into codex/integrate-al…
EterUltimate b6a2083
Merge remote-tracking branch 'origin/pr/8169' into codex/integrate-al…
EterUltimate 852bdea
Merge remote-tracking branch 'origin/pr/8177' into codex/integrate-al…
EterUltimate 630a73b
Merge remote-tracking branch 'origin/pr/8179' into codex/integrate-al…
EterUltimate b3e4c68
Merge remote-tracking branch 'origin/pr/8182' into codex/integrate-al…
EterUltimate 4f6142a
Merge remote-tracking branch 'origin/pr/8189' into codex/integrate-al…
EterUltimate 36966c8
Merge remote-tracking branch 'origin/pr/8192' into codex/integrate-al…
EterUltimate 3019ccd
Merge remote-tracking branch 'origin/pr/8197' into codex/integrate-al…
EterUltimate 6634d5d
Merge remote-tracking branch 'origin/pr/8201' into codex/integrate-al…
EterUltimate 59cff39
Merge remote-tracking branch 'origin/pr/8207' into codex/integrate-al…
EterUltimate 3f4a83a
Merge remote-tracking branch 'origin/pr/8215' into codex/integrate-al…
EterUltimate 0747062
Merge remote-tracking branch 'origin/pr/8226' into codex/integrate-al…
EterUltimate 10ffaa5
Merge remote-tracking branch 'origin/pr/8228' into codex/integrate-al…
EterUltimate 1126d74
Merge remote-tracking branch 'origin/pr/8230' into codex/integrate-al…
EterUltimate 269be59
Merge remote-tracking branch 'origin/pr/8236' into codex/integrate-al…
EterUltimate f546eca
Merge remote-tracking branch 'origin/pr/8237' into codex/integrate-al…
EterUltimate 7901266
Merge remote-tracking branch 'origin/pr/8241' into codex/integrate-al…
EterUltimate ca2a7a9
Merge remote-tracking branch 'origin/pr/8243' into codex/integrate-al…
EterUltimate 278bd08
Merge remote-tracking branch 'origin/pr/8257' into codex/integrate-al…
EterUltimate 65bbc13
Merge remote-tracking branch 'origin/pr/8259' into codex/integrate-al…
EterUltimate 4256314
Merge remote-tracking branch 'origin/pr/8270' into codex/integrate-al…
EterUltimate 3096304
Merge remote-tracking branch 'origin/pr/8276' into codex/integrate-al…
EterUltimate de6ae7b
Merge remote-tracking branch 'origin/pr/8280' into codex/integrate-al…
EterUltimate 8d2d2e2
Merge remote-tracking branch 'origin/pr/8287' into codex/integrate-al…
EterUltimate 6268076
Merge remote-tracking branch 'origin/pr/8289' into codex/integrate-al…
EterUltimate e1d057a
Merge remote-tracking branch 'origin/pr/8291' into codex/integrate-al…
EterUltimate 9782e14
Merge remote-tracking branch 'upstream/master' into fix/console-ansi-…
piexian 31b5bb2
fix: strip segment text to remove extra blank lines in segmented reply
Blueteemo 7e4b376
Merge remote-tracking branch 'origin/pr/8304' into codex/integrate-al…
EterUltimate 49dbc4e
Merge remote-tracking branch 'origin/pr/8062' into codex/integrate-al…
EterUltimate bff1530
Merge remote-tracking branch 'origin/pr/6552' into codex/integrate-al…
EterUltimate 182373f
Merge remote-tracking branch 'origin/pr/6095' into codex/integrate-al…
EterUltimate 50ab87d
Merge remote-tracking branch 'origin/pr/7753' into codex/integrate-al…
EterUltimate 06fce47
Merge remote-tracking branch 'origin/pr/6454' into codex/integrate-al…
EterUltimate 57b5497
Merge remote-tracking branch 'origin/pr/6417' into codex/integrate-al…
EterUltimate 7875dab
Merge remote-tracking branch 'origin/pr/6390' into codex/integrate-al…
EterUltimate ef53102
Merge remote-tracking branch 'origin/pr/6316' into codex/integrate-al…
EterUltimate e611c2f
fix(mcp): prevent epoll busy-wait caused by leaked SSE exit stack
lingyun14beta 1bdce3a
fix(mcp): address review feedback on owner task connection lifecycle
lingyun14beta 6591fa9
Merge remote-tracking branch 'upstream/master' into refactor-ltm
w31r4 442dca0
fix: support image_caption_prompt config and fix image_urls in agent …
Yao-lin101 409eb14
Update mcp_client.py
lingyun14beta 2dcdfa8
Merge remote-tracking branch 'origin/pr/6136' into codex/integrate-al…
EterUltimate 07047c1
Merge remote-tracking branch 'origin/pr/8307' into codex/integrate-al…
EterUltimate 977a33e
Merge remote-tracking branch 'origin/pr/8308' into codex/integrate-al…
EterUltimate 05b0c83
refactor: optimize cfg retrieval and pass it to _process_quote_message
Yao-lin101 c5435e5
Merge remote-tracking branch 'origin/pr/8226' into codex/integrate-al…
EterUltimate 0f71ae1
test: add unit tests for quoted image caption provider logic and fix …
Yao-lin101 77fc1eb
Merge remote-tracking branch 'origin/pr/5516' into codex/integrate-al…
EterUltimate 3417db5
chore: finalize open pr integration fixes
EterUltimate a8163b2
Merge remote-tracking branch 'origin/pr/8308' into codex/integrate-al…
EterUltimate 780a9a1
fix: add dashboard json viewer dependency
EterUltimate 4f58713
fix: stabilize ci smoke and platform tests
EterUltimate File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,184 @@ | ||
| # ========================================== | ||
| # AstrBot Instance Configuration: ${INSTANCE_NAME} | ||
| # AstrBot 实例配置文件:${INSTANCE_NAME} | ||
| # ========================================== | ||
| # 将此文件复制为 .env 并根据需要修改。 | ||
| # Copy this file to .env and modify as needed. | ||
| # 注意:在此处设置的变量将覆盖默认配置。 | ||
| # Note: Variables set here override application defaults. | ||
|
|
||
| # ------------------------------------------ | ||
| # 实例标识 / Instance Identity | ||
| # ------------------------------------------ | ||
|
|
||
| # 实例名称(用于日志和服务名) | ||
| # Instance name (used in logs/service names) | ||
| INSTANCE_NAME="${INSTANCE_NAME}" | ||
|
|
||
| # ------------------------------------------ | ||
| # 核心配置 / Core Configuration | ||
| # ------------------------------------------ | ||
|
|
||
| # AstrBot 根目录路径 | ||
| # AstrBot root directory path | ||
| # 默认 Default: 当前工作目录,桌面客户端为 ~/.astrbot,服务器为 /var/lib/astrbot/<instance>/ | ||
| # 示例 Example: /var/lib/astrbot/mybot | ||
| ASTRBOT_ROOT="${ASTRBOT_ROOT}" | ||
|
|
||
| # 日志等级 | ||
| # Log level | ||
| # 可选值 Values: DEBUG, INFO, WARNING, ERROR, CRITICAL | ||
| # 默认 Default: INFO | ||
| # ASTRBOT_LOG_LEVEL=INFO | ||
|
|
||
| # 启用插件热重载(开发时有用) | ||
| # Enable plugin hot reload (useful for development) | ||
| # 可选值 Values: 0 (禁用 disabled), 1 (启用 enabled) | ||
| # 默认 Default: 0 | ||
| # ASTRBOT_RELOAD=0 | ||
|
|
||
| # 禁用匿名使用统计 | ||
| # Disable anonymous usage statistics | ||
| # 可选值 Values: 0 (启用统计 enabled), 1 (禁用统计 disabled) | ||
| # 默认 Default: 0 | ||
| ASTRBOT_DISABLE_METRICS=0 | ||
|
|
||
| # 覆盖 Python 可执行文件路径(用于本地代码执行功能) | ||
| # Override Python executable path (for local code execution) | ||
| # 示例 Example: /usr/bin/python3, /home/user/.pyenv/shims/python | ||
| # PYTHON=/usr/bin/python3 | ||
|
|
||
| # 启用演示模式(可能限制部分功能) | ||
| # Enable demo mode (may restrict certain features) | ||
| # 可选值 Values: True, False | ||
| # 默认 Default: False | ||
| # DEMO_MODE=False | ||
|
|
||
| # 启用测试模式(影响日志和部分行为) | ||
| # Enable testing mode (affects logging and behavior) | ||
| # 可选值 Values: True, False | ||
| # 默认 Default: False | ||
| # TESTING=False | ||
|
|
||
| # 标记:是否通过桌面客户端执行(主要用于内部) | ||
| # Flag: running via desktop client (internal use) | ||
| # 可选值 Values: 0, 1 | ||
| # ASTRBOT_DESKTOP_CLIENT=0 | ||
|
|
||
| # 标记:是否通过 systemd 服务执行 | ||
| # Flag: running via systemd service | ||
| # 可选值 Values: 0, 1 | ||
| ASTRBOT_SYSTEMD=1 | ||
|
|
||
| # ------------------------------------------ | ||
| # 管理面板配置 / Dashboard Configuration | ||
| # ------------------------------------------ | ||
|
|
||
| # 启用或禁用 WebUI 管理面板 | ||
| # Enable or disable WebUI dashboard | ||
| # 可选值 Values: True, False | ||
| # 默认 Default: True | ||
| ASTRBOT_DASHBOARD_ENABLE=True | ||
|
|
||
| # 允许跨域请求的来源域名(多个用逗号分隔,允许所有则用 *) | ||
| # Allowed CORS origins for WebUI dashboard (comma-separated, or * for all) | ||
| # 示例 Example: https://dash.astrbot.men | ||
| # 默认 Default: * | ||
| # ASTRBOT_CORS_ALLOW_ORIGIN="*" | ||
|
|
||
| # ------------------------------------------ | ||
| # 国际化配置 / Internationalization Configuration | ||
| # ------------------------------------------ | ||
|
|
||
| # CLI 界面语言 | ||
| # CLI interface language | ||
| # 可选值 Values: zh (中文), en (英文) | ||
| # 默认 Default: zh (跟随系统 locale / follows system locale) | ||
| # ASTRBOT_CLI_LANG=zh | ||
|
|
||
| # ------------------------------------------ | ||
| # 网络配置 / Network Configuration | ||
| # ------------------------------------------ | ||
|
|
||
| # API 绑定主机 | ||
| # API bind host | ||
| # 示例 Example: 0.0.0.0 (所有接口 all interfaces), 127.0.0.1 (仅本地 localhost only) | ||
| ASTRBOT_HOST="${ASTRBOT_HOST}" | ||
|
|
||
| # API 绑定端口 | ||
| # API bind port | ||
| # 示例 Example: 3000, 6185, 8080 | ||
| ASTRBOT_PORT="${ASTRBOT_PORT}" | ||
|
|
||
| # 是否为 API 启用 SSL/TLS | ||
| # Enable SSL/TLS for API | ||
| # 可选值 Values: true, false | ||
| # 默认 Default: false | ||
| ASTRBOT_SSL_ENABLE=false | ||
|
|
||
| # SSL 证书路径(PEM 格式) | ||
| # SSL certificate path (PEM format) | ||
| # 示例 Example: /etc/astrbot/certs/myinstance/fullchain.pem | ||
| ASTRBOT_SSL_CERT="" | ||
|
|
||
| # SSL 私钥路径(PEM 格式) | ||
| # SSL private key path (PEM format) | ||
| # 示例 Example: /etc/astrbot/certs/myinstance/privkey.pem | ||
| ASTRBOT_SSL_KEY="" | ||
|
|
||
| # SSL CA 证书链路径(可选,用于客户端验证) | ||
| # SSL CA certificates bundle (optional, for client verification) | ||
| # 示例 Example: /etc/ssl/certs/ca-certificates.crt | ||
| ASTRBOT_SSL_CA_CERTS="" | ||
|
|
||
| # ------------------------------------------ | ||
| # 代理配置 / Proxy Configuration | ||
| # ------------------------------------------ | ||
|
|
||
| # HTTP 代理地址 | ||
| # HTTP proxy URL | ||
| # 示例 Example: http://127.0.0.1:7890, socks5://127.0.0.1:1080 | ||
| # http_proxy= | ||
|
|
||
| # HTTPS 代理地址 | ||
| # HTTPS proxy URL | ||
| # 示例 Example: http://127.0.0.1:7890, socks5://127.0.0.1:1080 | ||
| # https_proxy= | ||
|
|
||
| # 不走代理的主机列表(逗号分隔) | ||
| # Hosts to bypass proxy (comma-separated) | ||
| # 示例 Example: localhost,127.0.0.1,192.168.0.0/16,.local | ||
| # no_proxy=localhost,127.0.0.1 | ||
|
|
||
| # ------------------------------------------ | ||
| # 第三方集成 / Third-party Integrations | ||
| # ------------------------------------------ | ||
|
|
||
| # 阿里云 DashScope API 密钥(用于 Rerank 服务) | ||
| # Alibaba DashScope API Key (for Rerank service) | ||
| # 获取地址 Get from: https://dashscope.console.aliyun.com/ | ||
| # 示例 Example: sk-xxxxxxxxxxxx | ||
| # DASHSCOPE_API_KEY= | ||
|
|
||
| # Coze 集成 | ||
| # Coze integration | ||
| # 获取地址 Get from: https://www.coze.com/ | ||
| # COZE_API_KEY= | ||
| # COZE_BOT_ID= | ||
|
|
||
| # 计算机控制相关的数据目录(用于截图/文件存储) | ||
| # Computer control data directory (for screenshots/file storage) | ||
| # 示例 Example: /var/lib/astrbot/bay_data | ||
| # BAY_DATA_DIR= | ||
|
|
||
| # ------------------------------------------ | ||
| # 平台特定配置 / Platform-specific Configuration | ||
| # ------------------------------------------ | ||
|
|
||
| # QQ 官方机器人测试模式开关 | ||
| # QQ official bot test mode | ||
| # 可选值 Values: on, off | ||
| # 默认 Default: off | ||
| # TEST_MODE=off | ||
|
|
||
| # End of template / 模板结束 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| git pull | ||
| git status | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| name: Build dashboard | ||
| description: Build the dashboard and optionally package or copy the dist output. | ||
|
|
||
| inputs: | ||
| version: | ||
| description: Version string to write into dist/assets/version. Defaults to the checked-out commit SHA. | ||
| required: false | ||
| default: "" | ||
| archive-name: | ||
| description: Optional zip file name to create under the dashboard directory. | ||
| required: false | ||
| default: "" | ||
| copy-dist-to: | ||
| description: Optional repository-relative directory to receive dashboard/dist. | ||
| required: false | ||
| default: "" | ||
|
|
||
| runs: | ||
| using: composite | ||
| steps: | ||
| - name: Build dashboard dist | ||
| shell: bash | ||
| run: | | ||
| cd dashboard | ||
| pnpm install --frozen-lockfile | ||
| pnpm run build | ||
| mkdir -p dist/assets | ||
| version="${{ inputs.version }}" | ||
| if [ -z "$version" ]; then | ||
| version="$(git rev-parse HEAD)" | ||
| fi | ||
| echo "$version" > dist/assets/version | ||
|
|
||
| - name: Archive dashboard dist | ||
| if: ${{ inputs.archive-name != '' }} | ||
| shell: bash | ||
| run: | | ||
| cd dashboard | ||
| zip -r "${{ inputs.archive-name }}" dist | ||
|
|
||
| - name: Copy dashboard dist | ||
| if: ${{ inputs.copy-dist-to != '' }} | ||
| shell: bash | ||
| run: | | ||
| mkdir -p "${{ inputs.copy-dist-to }}" | ||
| cp -r dashboard/dist "${{ inputs.copy-dist-to }}/" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| name: Setup pnpm and Node.js | ||
| description: Install pnpm and configure Node.js with pnpm cache. | ||
|
|
||
| inputs: | ||
| pnpm-version: | ||
| description: pnpm version to install. | ||
| required: true | ||
| node-version: | ||
| description: Node.js version to install. | ||
| required: true | ||
| cache-dependency-path: | ||
| description: Optional pnpm lockfile path for setup-node cache. | ||
| required: false | ||
| default: "" | ||
|
|
||
| runs: | ||
| using: composite | ||
| steps: | ||
| - name: Setup pnpm | ||
| uses: pnpm/action-setup@v6.0.3 | ||
| with: | ||
| version: ${{ inputs.pnpm-version }} | ||
|
|
||
| - name: Setup Node.js with pnpm cache | ||
| if: ${{ inputs.cache-dependency-path != '' }} | ||
| uses: actions/setup-node@v6 | ||
| with: | ||
| node-version: ${{ inputs.node-version }} | ||
| cache: pnpm | ||
| cache-dependency-path: ${{ inputs.cache-dependency-path }} | ||
|
|
||
| - name: Setup Node.js | ||
| if: ${{ inputs.cache-dependency-path == '' }} | ||
| uses: actions/setup-node@v6 | ||
| with: | ||
| node-version: ${{ inputs.node-version }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| name: Setup Python and uv | ||
| description: Set up Python, install uv, and optionally sync dependencies. | ||
| inputs: | ||
| python-version: | ||
| description: Python version to install. | ||
| required: false | ||
| default: "3.12" | ||
| uv-version: | ||
| description: uv version to install. | ||
| required: false | ||
| default: "0.10.12" | ||
| sync-deps: | ||
| description: Whether to run dependency sync via uv. | ||
| required: false | ||
| default: "false" | ||
| sync-args: | ||
| description: Extra arguments passed to `uv sync`. | ||
| required: false | ||
| default: "" | ||
| runs: | ||
| using: composite | ||
| steps: | ||
| - name: Set up Python | ||
| uses: actions/setup-python@v6 | ||
| with: | ||
| python-version: ${{ inputs.python-version }} | ||
|
|
||
| - name: Set up uv | ||
| uses: astral-sh/setup-uv@v7.6.0 | ||
| with: | ||
| version: ${{ inputs.uv-version }} | ||
| enable-cache: "true" | ||
|
|
||
| - name: Sync dependencies | ||
| if: ${{ inputs.sync-deps == 'true' }} | ||
| shell: bash | ||
| run: | | ||
| set -euo pipefail | ||
| sync_args_raw="${{ inputs.sync-args }}" | ||
| if [[ -z "$sync_args_raw" ]]; then | ||
| uv sync | ||
| exit 0 | ||
| fi | ||
|
|
||
| # Split configured sync arguments into an array to avoid glob expansion. | ||
| read -r -a sync_args <<< "$sync_args_raw" | ||
| uv sync "${sync_args[@]}" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Automatically running
git pullin an.envrcfile is highly discouraged..envrcis typically executed by tools likedirenvwhenever a user enters the directory or opens a subshell. Performing network operations and potentially changing the repository state (including merge conflicts) without explicit user intent can lead to a poor developer experience and unexpected side effects.