Sync fork to upstream v2.0.5 (603 commits), preserve fork customizations - #4

Merged

LukaTheHero merged 604 commits into

mainfrom

chore/sync-upstream-v2.0.5

Jun 27, 2026

This pull request is big! We're only showing the most recent 250 commits

Commits on Jun 20, 2026

fix(conversation): tighten schedule and emoji handling
Gunterlie
committed
0b33a0b
fix(llm): wire minP sampling through to providers (#2668)

kolacheee
and
claude
committed
ef24e3e
Fix SpicyMarinara assigned issue sweep
SpicyMarinara
committed
caca4e0
fix(llm): address review — trim/filter stop sequences and whitespace-only keys

kolacheee
and
claude
committed
bef00a9
Fix chat settings, DJ, and UI polish
SpicyMarinara
committed
07f1364
fix(conversation): address CodeRabbit review findings

Gunterlie
and
claude
committed
24ca12e
fix(prompt): trim trailing whitespace from assistant prefill before send (#2673)

kolacheee
and
claude
committed
cdee7e8
fix(scheduler): non-blocking busy delay — poll loop no longer stalls

Gunterlie
and
claude
committed
fb60c4f
fix(conversation): scope character presence status to chat, not character record

Gunterlie
and
claude
committed
0ab148f
Filter messages hidden from AI when supported
Gunterlie
committed
e8f77ea
fix(agents): await tool-loop result so a tool failure can't corrupt co-grouped agents (#2680)

kolacheee
and
claude
committed
1ac51f2
fix(anthropic): trim trailing whitespace from the final assistant turn at serialization (#2679)

kolacheee
and
claude
committed
7501a09
Add last-contact tracking and improve autonomous settings UI
Gunterlie
committed
d5ce1af

Commits on Jun 21, 2026

fix(uno): order the board seat row by live turn order
Romuromylus
committed
e3e71be
feat(uno): AI-driven UNO start via an in-character agreement command
Romuromylus
committed
26b0e6f
fix(uno): suppress autonomous messages while a turn-game is active
Romuromylus
committed
3e35fa6
Merge branch 'staging' into feat/turn-games-uno
Romuromylus
authored
2a97341
fix(turn-games): address Copilot review (UNO declaration race, engine-agnostic bot runner, generic board SSE)
Romuromylus
committed
5b80f9e
fix(turn-games): address Copilot 2nd-pass review (seat authority, defensive parse, real rewind)
Romuromylus
committed
1169a9d
Tighten UNO jump-in/7-0 rules, move-payload validation, and swipe-prune parity
Romuromylus
committed
ba2c720
fix(turn-games): guard mutating game routes against concurrent generation; fix stale SSE comment
Romuromylus
committed
ea5b2ea
fix(uno): reset UnoSetup state per chat; use functional updater for selection
Romuromylus
committed
a0baac3
fix(turn-games): make bot-runner prompts engine-agnostic; align model-facing draw_penalty
Romuromylus
committed
4ac03bf
fix(turn-games): dedupe live snapshots, label UNO controls, surface UNO command toggle
Romuromylus
committed
d96e8d0
fix(turn-games): use trySendSseEvent for the group_turn marker
Romuromylus
committed
960a758
fix(turn-games): gate game start to conversation mode; make bot-loop cap observable
Romuromylus
committed
a30ed7c
fix(uno): out-of-turn fallback returns a legal interrupt, never an illegal draw
Romuromylus
committed
b3f2d27
fix(uno): identify the drawn card to the model + duplicate-safe post-draw play; 404 for moves with no active game
Romuromylus
committed
19fd787
Address schedule CodeRabbit feedback
SpicyMarinara
committed
a9845c1
Address connection CodeRabbit feedback
SpicyMarinara
committed
afdc874
Address topbar hover CodeRabbit feedback
SpicyMarinara
committed
04ed9e9
Merge pull request #2654 from Pasta-Devs/feature-schedule-shenanigans
SpicyMarinara
authored
c8c101e
Merge pull request #2655 from Pasta-Devs/yang-bundled-fixes
SpicyMarinara
authored
70a0b78
Merge pull request #2669 from kolacheee/fix/connection-preset-send-tier1
SpicyMarinara
authored
1f3f8ab
Merge pull request #2671 from Pasta-Devs/codex/spicymarinara-assigned-issues
SpicyMarinara
authored
eae3edf
Merge pull request #2674 from kolacheee/fix/anthropic-prefill-trailing-whitespace
SpicyMarinara
authored
349b2fb
Merge pull request #2681 from kolacheee/fix/issue-2680-agent-tool-rethrow-group
SpicyMarinara
authored
e45f4ab
Merge remote-tracking branch 'origin/staging' into codex-pr-2670
SpicyMarinara
committed
9739222
Merge remote-tracking branch 'origin/staging' into codex-pr2721
SpicyMarinara
committed
5de96c3
Merge remote-tracking branch 'origin/staging' into codex/chat-settings-dj-bugfixes
SpicyMarinara
committed
976896d
Merge pull request #2670 from kolacheee/fix/wire-minp-parameter
SpicyMarinara
authored
c3d1ce4
Merge pull request #2672 from Pasta-Devs/codex/chat-settings-dj-bugfixes
SpicyMarinara
authored
cee75eb
Merge pull request #2721 from Pasta-Devs/feat/turn-games-uno
SpicyMarinara
authored
c0ff904
Fix chat sidebar recency on open
SpicyMarinara
committed
9658fb5
Preserve post-history prompt recency
SpicyMarinara
committed
90ac85b
Guard assistant prefill tail injection
SpicyMarinara
committed
b7f4a4e
Harden agent marker expansion
SpicyMarinara
committed
84d2865
Prevent silent agent connection fallback
SpicyMarinara
committed
eee1b06
Carry agent connection parameters
SpicyMarinara
committed
fc033c4
Clamp agent max output tokens
SpicyMarinara
committed
3a1ba03
Harden batched agent XML handling
SpicyMarinara
committed
8ef9b6d
Surface failed agent output paths
SpicyMarinara
committed
c1e15af
Bound agent call lifetime
SpicyMarinara
committed
99827f9
Preserve built-in agent import state
SpicyMarinara
committed
0c2bf55
Fix SillyTavern lorebook mappings
SpicyMarinara
committed
3118174
Preserve embedded lorebook depth placement
SpicyMarinara
committed
5885583
Honor lorebook selective gates
SpicyMarinara
committed
e9128df
Fix lorebook activation gates
SpicyMarinara
committed
f9e821a
Exclude constant entries from knowledge router
SpicyMarinara
committed
72c3265
Score all scoped memory chunks
SpicyMarinara
committed
4f6135f
Anchor custom agent cadence on success
SpicyMarinara
committed
73df3cb
Preserve backup secrets and custom media
SpicyMarinara
committed
66d7b4a
Preserve bot browser card fields
SpicyMarinara
committed
13f914d
Preserve character card import fields
SpicyMarinara
committed
840ffcf
Preserve ST regex import semantics
SpicyMarinara
committed
9311d34
Transcode avatars for PNG card export
SpicyMarinara
committed
9814bbc
Preserve Marinara chat JSONL fidelity
SpicyMarinara
committed
e9a74b7
Preserve ST preset generation fields
SpicyMarinara
committed
0e00702
Complete ST lorebook vectorized export mapping
SpicyMarinara
committed
e6a967f
Harden imported avatars and browser proxies
SpicyMarinara
committed
b2ab710
Bound game generation waits
SpicyMarinara
committed
6a9472e
Bound game asset generation work
SpicyMarinara
committed
93b71a2
Harden game world setup generation
SpicyMarinara
committed
99105fd
Harden game creation setup failures
SpicyMarinara
committed
1ab1521
Serialize game journal and conclusion updates
SpicyMarinara
committed
09bdc80
Harden game state parsing and keeper repair
SpicyMarinara
committed
c5ef429
Restore checkpoints by snapshot id
SpicyMarinara
committed
aedab56
Enforce game generation defaults after overrides
SpicyMarinara
committed
a61ccac
Apply combat control and NPC identity fixes
SpicyMarinara
committed
b48c995
Harden local sidecar inference path
SpicyMarinara
committed
ef8d287
Harden sidecar process lifecycle
SpicyMarinara
committed
c81c063
Verify sidecar model provisioning
SpicyMarinara
committed
bca13ef
Fix sidecar embedding paths
SpicyMarinara
committed
be161ee
Make local sidecar requests backend aware
SpicyMarinara
committed
f7a371d
Guard sidecar setup lifecycle
SpicyMarinara
committed
5a481bb
Stabilize tracker field locks
SpicyMarinara
committed
46b6144
Unify committed tracker context rendering
SpicyMarinara
committed
2d238ae
Harden tracker agent result merging
SpicyMarinara
committed
eb40316
Fix game state snapshot integrity paths
SpicyMarinara
committed
9d64907
Prevent tracker edit races during reruns
SpicyMarinara
committed
dc41ffa
Harden tracker rendering for malformed stats
SpicyMarinara
committed
eccb5e2
Harden game HUD widget persistence
SpicyMarinara
committed
6e3ff06
Align retry tracker result handling
SpicyMarinara
committed
1915404
Fix sweep validation type errors
SpicyMarinara
committed
2d12bff
Address CodeRabbit review feedback
SpicyMarinara
committed
9377f60
Merge pull request #2730 from Pasta-Devs/codex/spicy-issue-sweep-2026-06-21
SpicyMarinara
authored
facef98
Normalize post-history system prompt roles
SpicyMarinara
committed
e1ca5ab
Preserve prompt metadata when appending system content
SpicyMarinara
committed
324111f
Merge pull request #2731 from Pasta-Devs/codex/prompt-post-history-role-normalization
SpicyMarinara
authored
10e7745
Add accent pulse mode for solid colors
Gunterlie
committed
629ff8e
Disable accent color picker when RGB Mode is active
Gunterlie
committed
5dba3c2
Fix game custom agents and Claude prefill steering
SpicyMarinara
committed
19cee67
Merge branch 'staging' into split-accent-controls
Gunterlie
authored
1f91b94
Show game custom agent picker
SpicyMarinara
committed
7ae7d56
Fix accent control review follow-ups
Gunterlie
committed
b555cba
Merge pull request #2733 from Pasta-Devs/split-accent-controls
SpicyMarinara
authored
85285e6
Align game setup wizard shell
SpicyMarinara
committed
a2e97d4
Merge branch 'staging' into codex/game-custom-agents-claude-prefill
SpicyMarinara
authored
69d0f49
Polish agent imports and appearance controls
SpicyMarinara
committed
b938a00
Escape Claude prefill delimiter
SpicyMarinara
committed
0067369
Merge pull request #2732 from Pasta-Devs/codex/game-custom-agents-claude-prefill
SpicyMarinara
authored
e626a3a
Fix assigned issue sweep regressions
SpicyMarinara
committed
e36bcce
fix(generate): forward minP through the dry-run preview path (#2762)

kolacheee
and
claude
committed
f51a7e2
Merge pull request #2763 from kolacheee/fix/issue-2762-dry-run-minp
SpicyMarinara
authored
620b7ba
Fix remaining issue sweep regressions
SpicyMarinara
committed
dfc5530

Commits on Jun 22, 2026

fix(storage): aggregate lastContactByCharacter in JS for file-storage backend
kolacheee
committed
bc08067
Merge pull request #2776 from kolacheee/fix/issue-2775-last-contact-groupby
SpicyMarinara
authored
b71f7f4
Merge branch 'staging' into codex/assigned-issue-sweep-2734-2738
SpicyMarinara
authored
fe26e3f
Finalize v2 release follow-up fixes
SpicyMarinara
committed
74ff21a
Fix mobile popovers and DJ model selection
SpicyMarinara
committed
18d7bcf
Fix mobile folder touch dragging
SpicyMarinara
committed
91e4368
Merge pull request #2747 from Pasta-Devs/codex/assigned-issue-sweep-2734-2738
SpicyMarinara
authored
2f3e3a2
Claim mobile folder drag touch gestures earlier
SpicyMarinara
committed
9ea34be
Merge remote-tracking branch 'origin/staging' into codex/v2-release-followups
SpicyMarinara
committed
ba4f467
Resolve staging merge fallout
SpicyMarinara
committed
cffe697
Tighten mobile lorebook row controls
SpicyMarinara
committed
cc96d85
Match YouTube player volume color
SpicyMarinara
committed
440a0d5
Remove game notification sound tooltip
SpicyMarinara
committed
e0b6108
Polish mobile UI and touch interactions
SpicyMarinara
committed
795c5d8
fix: address coderabbit review feedback
SpicyMarinara
committed
95da922
Merge pull request #2777 from Pasta-Devs/codex/v2-release-followups
SpicyMarinara
authored
180f23d
Add helper functions for professor mari
Sulphuratum
committed
173d687
Merge branch 'staging' into staging
Sulphuratum
authored
4059f8d
Polish chat overlays and Prof Mari shell fallback
SpicyMarinara
committed
3a11494
Handle keyboard toolbar actions in game mode
SpicyMarinara
committed
78447c3
Merge pull request #2780 from Pasta-Devs/codex/chat-overlays-prof-mari-fallback
SpicyMarinara
authored
056d6a1
Merge remote-tracking branch 'origin/staging' into pr-2779-review
SpicyMarinara
committed
53d6ec8
Fix Mari data helper review findings
SpicyMarinara
committed
01099c8
Merge pull request #2779 from Sulphuratum/staging
SpicyMarinara
authored
cd32f5f
Prepare v2.0.0 release polish
SpicyMarinara
committed
32b3ed8
Merge pull request #2781 from Pasta-Devs/codex/v2-release-polish
SpicyMarinara
authored
1ff2315
Update v2.0.0 changelog
SpicyMarinara
committed
e040b9b
Merge pull request #2782 from Pasta-Devs/codex/v2-changelog-update
SpicyMarinara
authored
a2700eb
Update container release tag examples
SpicyMarinara
committed
135936a
Merge pull request #2783 from Pasta-Devs/codex/v2-container-doc-tag-update
SpicyMarinara
authored
08b835c
Publish staging container tag
SpicyMarinara
committed
b48d9a0
Merge pull request #2784 from Pasta-Devs/codex/staging-docker-tag
SpicyMarinara
authored
384d048
Refine accent and editor theming
SpicyMarinara
committed
d2848ee
Address accent theme review comments
SpicyMarinara
committed
498abf8
Merge pull request #2785 from Pasta-Devs/codex/accent-pulse-gradient
SpicyMarinara
authored
ebfe28b
Merge pull request #2786 from Pasta-Devs/staging
SpicyMarinara
authored
4c27abf
Fix conversation presence refresh
Gunterlie
committed
73b90ee
Clarify Docker Compose file location
SpicyMarinara
committed
c16075d
Merge branch 'staging' into codex/fix-conversation-presence-refresh
SpicyMarinara
authored
6cb5618
Merge pull request #2788 from Pasta-Devs/codex/docker-compose-doc-link
SpicyMarinara
authored
6310782
Merge pull request #2789 from Pasta-Devs/staging
SpicyMarinara
authored
6b22be3
Merge branch 'staging' into codex/fix-conversation-presence-refresh
SpicyMarinara
authored
9e98bcb
Fix setup wizard status invalidation
Gunterlie
committed
941a8ba
Merge pull request #2787 from Pasta-Devs/codex/fix-conversation-presence-refresh
SpicyMarinara
authored
7fb9754
fix(client): surface extension & Mari workspace import failures (#2802)

kolacheee
and
claude
committed
ecc32db
Prepare v2.0.1 hotfix release
SpicyMarinara
committed
9f91aca
Refactor Professor Mari workspace to native command runtime
munimunigamer
committed
f11e67a
Make Professor Mari workspace loop fluid
munimunigamer
committed
a340a7a
Address v2.0.1 follow-up fixes
SpicyMarinara
committed
55c410c
Add chat summary connection override
SpicyMarinara
committed
8bd5ee1
Harden Professor Mari workspace data mutations
munimunigamer
committed
9d45688
Address PR review hotfix comments
SpicyMarinara
committed
73fdda1
Unify chat summary connection resolution
SpicyMarinara
committed
27c0b19
Address follow-up review comments
SpicyMarinara
committed
ec3f1a0
Merge pull request #2790 from Pasta-Devs/codex/v2.0.1-hotfix
SpicyMarinara
authored
c52b3e5
Resolve staging conflicts for Professor Mari command runtime
SpicyMarinara
committed
41f40c2
Merge pull request #2805 from Pasta-Devs/codex/professor-mari-command-runtime
SpicyMarinara
authored
1847ef8
Resolve staging conflicts for extension import errors
SpicyMarinara
committed
9a2f643
Merge pull request #2803 from kolacheee/fix/issue-2802-extension-import-errors
SpicyMarinara
authored
a5083f6
fix(client): replace hidden file inputs with programmatic picker to resolve Gtk/Firefox silent failures
Minsklatte
committed
6ce4287
fix game setup cancel delete guard
SpicyMarinara
committed
2fb3cfc
fix game setup empty json responses
SpicyMarinara
committed
6d7e1e4
address game group delete guard review
SpicyMarinara
committed
c123e62
fix(client): guard triggerFilePicker from leaking inputs when cancelled
Minsklatte
committed
fc5f0e7
document game setup reasoning carveout
SpicyMarinara
committed
1a7a018
Merge pull request #2806 from Pasta-Devs/codex/fix-2804-game-setup-cancel
SpicyMarinara
authored
e972eb1
Merge pull request #2807 from Minsklatte/fix/linux-firefox-silent-import
SpicyMarinara
authored
32130d3
Merge remote-tracking branch 'origin/staging' into codex/fix-game-world-setup-empty-json
SpicyMarinara
committed
3113fa2
centralize chat delete safety guard
SpicyMarinara
committed
db8ea86
Merge pull request #2808 from Pasta-Devs/codex/fix-game-world-setup-empty-json
SpicyMarinara
authored
837fcd0
Preserve caret while formatting quotes (#2809)
SpicyMarinara
authored
dfbe40b
Merge pull request #2810 from Pasta-Devs/release/v2.0.1-to-main
SpicyMarinara
authored
719e1b2

Commits on Jun 23, 2026

Commits on Jun 24, 2026

Release v2.0.5 (#2860)

authored
c391711

Commits on Jun 25, 2026

Merge upstream (Pasta-Devs/main v2.0.5, 603 commits) into fork main
LukaTheHero
committed
2e779c5