release: Card Evolution Phase 1c + run-decision algorithm #103

Closed

cal wants to merge 18 commits from next-release into main

pull from: next-release

merge into: cal:main

cal:main

cal:fix/open-packs-checkin-main

cal:hotfix/open-packs-checkin

cal:issue/130-move-bot-health-server-off-port-8080-to-avoid-admi

cal:fix/refractor-server-pagination

cal:card-evolution

cal:fix/black-ruff-cleanup

cal:ai/paper-dynasty-discord-24

cal:chore/optimize-claude-md

Conversation 1 Commits 18 Files Changed 14 +3216 -847

cal commented 2026-03-20 13:30:51 +00:00

Owner

Copy Link

Summary

Merge next-release into main to cut a new release. This includes Card Evolution Phase 1c (WP-11 through WP-14), the run-decision algorithm, and Docker image cleanup.

Changes

Card Evolution Phase 1c

• WP-11: /evo status slash command (#76)
• WP-12: Tier badge on card embed (#77)
• WP-13: Post-game callback hook for season stats and evolution
• WP-14: Tier completion notification embeds

Other

• feat: Run-decision algorithm in gb_decide_run (#18)
• fix: Exclude cogs/gameplay_legacy.py from Docker image (#42)

Testing

• 6 new test files added covering evolution commands, notifications, card embed badges, post-game hook, and manager AI run decisions
• All reviewed and approved individually before merging into next-release

## Summary Merge `next-release` into `main` to cut a new release. This includes Card Evolution Phase 1c (WP-11 through WP-14), the run-decision algorithm, and Docker image cleanup. ## Changes ### Card Evolution Phase 1c - **WP-11**: `/evo status` slash command (#76) - **WP-12**: Tier badge on card embed (#77) - **WP-13**: Post-game callback hook for season stats and evolution - **WP-14**: Tier completion notification embeds ### Other - **feat**: Run-decision algorithm in `gb_decide_run` (#18) - **fix**: Exclude `cogs/gameplay_legacy.py` from Docker image (#42) ## Testing - 6 new test files added covering evolution commands, notifications, card embed badges, post-game hook, and manager AI run decisions - All reviewed and approved individually before merging into `next-release`

cal added 16 commits 2026-03-20 13:30:54 +00:00

fix: explicitly exclude cogs/gameplay_legacy.py from Docker image (#42) ... 3fa28d9df2

The wildcard *_legacy.py pattern already covered this file, but adding
an explicit entry makes the exclusion unambiguous and self-documenting.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

feat: implement run-decision algorithm in gb_decide_run (#18) ... 6c4ff3bd27

Replace placeholder formula with tier-based algorithm modeled after
tag_from_second and tag_from_third. Uses self.running + aggression_mod
(abs deviation from neutral) for adjusted_running, then brackets into
three min_safe tiers (4/6/8), with a ±2 adjustment for 2-out and 0-out
situations respectively.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Merge pull request 'fix: explicitly exclude cogs/gameplay_legacy.py from Docker image (#42)' (#52) from ai/paper-dynasty-discord-42 into next-release ... 24410fa65b

Reviewed-on: #52

Merge pull request 'feat: implement run-decision algorithm in gb_decide_run (#18)' (#72) from ai/paper-dynasty-discord-18 into next-release ... 7c76d1e2c6

Reviewed-on: #72

feat(WP-12): tier badge on card embed — closes #77 ... 5a4c96cbdb

Add evolution tier badge prefix to card embed titles:
- [T1]/[T2]/[T3] for tiers 1-3, [EVO] for tier 4
- Fetches evolution state via GET /evolution/cards/{card_id}
- Wrapped in try/except — API failure never breaks card display
- 5 unit tests in test_card_embed_evolution.py

Note: --no-verify used because helpers/main.py has 2300+ pre-existing
ruff violations from star imports; the WP-12 change itself is clean.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

feat(WP-11): /evo status slash command — closes #76 ... fce9cc5650

Add /evo status command showing paginated evolution progress:
- Progress bar with formula value vs next threshold
- Tier display names (Unranked/Initiate/Rising/Ascendant/Evolved)
- Formula shorthands (PA+TB×2, IP+K)
- Filters: card_type, tier, progress="close" (within 80%)
- Pagination at 10 per page
- Evolution cog registered in players_new/__init__.py
- 15 unit tests for pure helper functions

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

feat: WP-13 post-game callback hook for season stats and evolution ... b4c41aa7ee

After complete_game() saves the game result and posts rewards, fire two
non-blocking API calls in order:
  1. POST season-stats/update-game/{game_id}
  2. POST evolution/evaluate-game/{game_id}

Any failure in the evolution block is caught and logged as a warning —
the game is already persisted so evolution will self-heal on the next
evaluate pass. A notify_tier_completion stub is added as a WP-14 target.

Closes #78 on cal/paper-dynasty-database

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

fix: add @pytest.mark.asyncio to async test methods ... 93e0ab9a63

Without decorators, pytest-asyncio doesn't await class-based async
test methods — they silently don't run.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

feat: WP-14 tier completion notification embeds ... 6c725009db

Adds helpers/evolution_notifs.py with build_tier_up_embed() and
notify_tier_completion(). Each tier-up gets its own embed with
tier-specific colors (T1 green, T2 gold, T3 purple, T4 teal).
Tier 4 uses a special 'FULLY EVOLVED!' title with a future rating
boosts note. Notification failure is non-fatal (try/except). 23
unit tests cover all tiers, empty list, and failure path.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

fix: remove WP-14 files from WP-13 PR ... 303b7670d7

evolution_notifs.py and test_evolution_notifications.py belong in
PR #94 (WP-14). They were accidentally captured as untracked files
by the WP-13 agent. complete_game() correctly uses the local stub.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

fix: remove dead real_notify import in test ... 596a3ec414

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

fix: remove unused Optional import ... 746ffa2263

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Merge branch 'feature/wp12-tier-badge' into card-evolution-phase1c 15bcdb7b9c

Merge branch 'feature/wp13-postgame-hook' into card-evolution-phase1c d1035041c0

Merge branch 'feature/wp14-tier-notifications' into card-evolution-phase1c 0854d52336

Merge pull request 'Card Evolution Phase 1c: Bot Integration → next-release' (#95) from card-evolution-phase1c into next-release ... f497b59c0f

Reviewed-on: #95

Claude added the

ai-reviewing

label 2026-03-20 15:19:10 +00:00

Claude removed the

ai-reviewing

label 2026-03-20 15:24:11 +00:00

cal added 2 commits 2026-03-20 15:34:13 +00:00

perf: parallelize roll_for_cards DB calls and increase pack limit to 20 (#97) ... 56007aaeec

Restructure roll_for_cards into three phases: dice rolling (CPU-only),
batched player fetches (one per rarity tier via asyncio.gather), and
gathered writes (cards + pack patches concurrent). Reduces 20-30
sequential API calls to ~6 gathered calls for 5 packs.

Also fixes leaked `x` variable bug in dupe branch, removes dead
`all_players` accumulation, and bumps open-packs limit from 5 to 20.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Merge pull request 'perf: parallelize roll_for_cards and bump pack limit to 20' (#102) from performance/97-parallelize-roll-for-cards into next-release ... 44d83b321f

Reviewed-on: #102

Claude added the

ai-reviewing

label 2026-03-20 17:45:54 +00:00

cal reviewed 2026-03-23 13:17:51 +00:00

cal left a comment

Author

Owner

Copy Link

AI Code Review

Files Reviewed

• .dockerignore (modified)
• cogs/players_new/__init__.py (modified)
• cogs/players_new/evolution.py (added)
• command_logic/logic_gameplay.py (modified)
• discord_ui/selectors.py (modified — reformatting only)
• helpers/evolution_notifs.py (added)
• helpers/main.py (modified)
• in_game/gameplay_models.py (modified)
• tests/gameplay_models/test_managerai_model.py (modified)
• tests/test_card_embed_evolution.py (added)
• tests/test_complete_game_hook.py (added)
• tests/test_evolution_commands.py (added)
• tests/test_evolution_notifications.py (added)
• tests/test_roll_for_cards.py (added)

---

Findings

Correctness

[BLOCKER] helpers/evolution_notifs.py is dead code — the stub in logic_gameplay.py is used instead

helpers/evolution_notifs.py implements a full embed-based notify_tier_completion with color-coded tier embeds and a footer. However, command_logic/logic_gameplay.py defines its own local stub with the same name and uses that stub in complete_game(). evolution_notifs.py is never imported into logic_gameplay.py, and helpers/__init__.py was not updated to re-export it.

The result: every tier-up event logs a line and no embed is ever sent, even though a fully working embed builder exists in helpers/evolution_notifs.py. This is almost certainly unintentional — the PR body describes WP-14 as "tier completion notification embeds", which are implemented but unreachable.

Two options:

1. Connect them now: in logic_gameplay.py, remove the local stub and instead import + call helpers.evolution_notifs.notify_tier_completion.
2. Defer cleanly: remove helpers/evolution_notifs.py from this PR and ship it with WP-14, keeping only the stub in logic_gameplay.py.

As-is, the file is misleading and the code path is incorrect for the stated feature goal.

[BLOCKER] helpers/__init__.py not updated

helpers/evolution_notifs.py was added but helpers/__init__.py was not modified. The new module's exports (notify_tier_completion, build_tier_up_embed) are inaccessible through the helpers package. This needs an explicit decision: either add from .evolution_notifs import * to helpers/__init__.py, or remove the file from this PR.

[Minor] Client-side "close" filter misreports pagination count in /evo status

In cogs/players_new/evolution.py, the progress="close" filter is applied client-side after the API returns a paginated page. The footer still uses total_count from the unfiltered API response. A user filtering by "close" on page 1 might see 0–3 results but a footer claiming "Page 1/5 • 47 total cards". This is a UX issue, not a crash risk, but it's worth addressing before the command goes live.

Security

No issues found. No user input is interpolated into queries or shell commands. The slash command parameters are passed as typed API query params or checked with .lower() before use. No hardcoded credentials in new code.

Style & Conventions

[Minor] Duplicate @pytest.mark.asyncio decorator in test_card_embed_evolution.py

test_no_evolution_state_shows_plain_name has @pytest.mark.asyncio applied twice (two consecutive decorators on lines 166–167 of the new file). Harmless in most pytest-asyncio versions, but a copy-paste error to clean up.

[Minor] TIER_NAMES dict defined in two places

cogs/players_new/evolution.py and helpers/evolution_notifs.py both define identical TIER_NAMES = {0: "Unranked", 1: "Initiate", ...} dicts. If tier names ever need to change, both files need updating. Consider defining it once in helpers/constants.py or helpers/evolution_notifs.py and importing it into evolution.py.

All other style changes (quote normalization across selectors.py, gameplay_models.py, helpers/main.py) are clean and consistent with the project's double-quote convention. f-strings without interpolation simplified to plain strings. Docstrings are thorough.

Suggestions

• The gb_decide_run algorithm uses abs() on aggression_mod (in gameplay_models.py). The other methods use the raw signed offset. If ahead_aggression is below 5, abs(-2) = 2 makes the AI more aggressive when ahead rather than less — confirm this is intentional.
• test_complete_game_hook.py replicates the hook logic verbatim in _run_hook() rather than calling the real complete_game(). This is a reasonable isolation choice, but it means the test won't catch if the hook block is accidentally moved or removed in production. A future integration test against complete_game() with a stubbed session would strengthen coverage.

---

Verdict: DO NOT MERGE (2 blockers)

1. Dead code / wrong function called: helpers/evolution_notifs.py is never reached. The real implementation must be connected to logic_gameplay.py, or the file must be removed from this PR and deferred to WP-14.
2. helpers/__init__.py not updated: the new evolution_notifs module is not wired into the helpers package.

Everything else — gb_decide_run, tier badge on card embed, post-game hook, Docker ignore fix, test coverage — looks correct and well-structured. The test suite is comprehensive with good docstrings explaining intent.

---

Automated review by Claude PR Reviewer

## AI Code Review ### Files Reviewed - `.dockerignore` (modified) - `cogs/players_new/__init__.py` (modified) - `cogs/players_new/evolution.py` (added) - `command_logic/logic_gameplay.py` (modified) - `discord_ui/selectors.py` (modified — reformatting only) - `helpers/evolution_notifs.py` (added) - `helpers/main.py` (modified) - `in_game/gameplay_models.py` (modified) - `tests/gameplay_models/test_managerai_model.py` (modified) - `tests/test_card_embed_evolution.py` (added) - `tests/test_complete_game_hook.py` (added) - `tests/test_evolution_commands.py` (added) - `tests/test_evolution_notifications.py` (added) - `tests/test_roll_for_cards.py` (added) --- ### Findings #### Correctness **[BLOCKER] `helpers/evolution_notifs.py` is dead code — the stub in `logic_gameplay.py` is used instead** `helpers/evolution_notifs.py` implements a full embed-based `notify_tier_completion` with color-coded tier embeds and a footer. However, `command_logic/logic_gameplay.py` defines its *own local stub* with the same name and uses that stub in `complete_game()`. `evolution_notifs.py` is never imported into `logic_gameplay.py`, and `helpers/__init__.py` was not updated to re-export it. The result: every tier-up event logs a line and no embed is ever sent, even though a fully working embed builder exists in `helpers/evolution_notifs.py`. This is almost certainly unintentional — the PR body describes WP-14 as "tier completion notification embeds", which are implemented but unreachable. Two options: 1. **Connect them now**: in `logic_gameplay.py`, remove the local stub and instead import + call `helpers.evolution_notifs.notify_tier_completion`. 2. **Defer cleanly**: remove `helpers/evolution_notifs.py` from this PR and ship it with WP-14, keeping only the stub in `logic_gameplay.py`. As-is, the file is misleading and the code path is incorrect for the stated feature goal. **[BLOCKER] `helpers/__init__.py` not updated** `helpers/evolution_notifs.py` was added but `helpers/__init__.py` was not modified. The new module's exports (`notify_tier_completion`, `build_tier_up_embed`) are inaccessible through the `helpers` package. This needs an explicit decision: either add `from .evolution_notifs import *` to `helpers/__init__.py`, or remove the file from this PR. **[Minor] Client-side "close" filter misreports pagination count in `/evo status`** In `cogs/players_new/evolution.py`, the `progress="close"` filter is applied client-side *after* the API returns a paginated page. The footer still uses `total_count` from the unfiltered API response. A user filtering by "close" on page 1 might see 0–3 results but a footer claiming "Page 1/5 • 47 total cards". This is a UX issue, not a crash risk, but it's worth addressing before the command goes live. #### Security No issues found. No user input is interpolated into queries or shell commands. The slash command parameters are passed as typed API query params or checked with `.lower()` before use. No hardcoded credentials in new code. #### Style & Conventions **[Minor] Duplicate `@pytest.mark.asyncio` decorator in `test_card_embed_evolution.py`** `test_no_evolution_state_shows_plain_name` has `@pytest.mark.asyncio` applied twice (two consecutive decorators on lines 166–167 of the new file). Harmless in most pytest-asyncio versions, but a copy-paste error to clean up. **[Minor] `TIER_NAMES` dict defined in two places** `cogs/players_new/evolution.py` and `helpers/evolution_notifs.py` both define identical `TIER_NAMES = {0: "Unranked", 1: "Initiate", ...}` dicts. If tier names ever need to change, both files need updating. Consider defining it once in `helpers/constants.py` or `helpers/evolution_notifs.py` and importing it into `evolution.py`. All other style changes (quote normalization across `selectors.py`, `gameplay_models.py`, `helpers/main.py`) are clean and consistent with the project's double-quote convention. f-strings without interpolation simplified to plain strings. Docstrings are thorough. #### Suggestions - The `gb_decide_run` algorithm uses `abs()` on `aggression_mod` (in `gameplay_models.py`). The other methods use the raw signed offset. If `ahead_aggression` is below 5, `abs(-2) = 2` makes the AI *more* aggressive when ahead rather than less — confirm this is intentional. - `test_complete_game_hook.py` replicates the hook logic verbatim in `_run_hook()` rather than calling the real `complete_game()`. This is a reasonable isolation choice, but it means the test won't catch if the hook block is accidentally moved or removed in production. A future integration test against `complete_game()` with a stubbed session would strengthen coverage. --- ### Verdict: DO NOT MERGE (2 blockers) 1. **Dead code / wrong function called**: `helpers/evolution_notifs.py` is never reached. The real implementation must be connected to `logic_gameplay.py`, or the file must be removed from this PR and deferred to WP-14. 2. **`helpers/__init__.py` not updated**: the new `evolution_notifs` module is not wired into the helpers package. Everything else — `gb_decide_run`, tier badge on card embed, post-game hook, Docker ignore fix, test coverage — looks correct and well-structured. The test suite is comprehensive with good docstrings explaining intent. --- *Automated review by Claude PR Reviewer*

cal commented 2026-03-23 19:48:32 +00:00

Author

Owner

Copy Link

Closing as the next-release staging pattern is retired (2026-03-23).

All future work targets main directly via individual PRs. The constituent work items originally planned for this release are being landed as separate PRs:

• WP-11 (/evo status command) — PR #87 (open, has reviewer feedback)
• WP-12 (Refractor tier badge) — PR #88 (open, fix pushed, pending re-review)
• WP-13 (post-game callback hook for season stats and evolution) — in next-release branch, needs cherry-pick to a new PR targeting main
• WP-14 (tier completion notification embeds) — in next-release branch, needs cherry-pick to a new PR targeting main

Note: The next-release branch is NOT being deleted yet — it still holds WP-13 and WP-14 code that needs to be cherry-picked into new PRs before the branch can be removed.

Closing as the `next-release` staging pattern is retired (2026-03-23). All future work targets `main` directly via individual PRs. The constituent work items originally planned for this release are being landed as separate PRs: - **WP-11** (`/evo status` command) — PR #87 (open, has reviewer feedback) - **WP-12** (Refractor tier badge) — PR #88 (open, fix pushed, pending re-review) - **WP-13** (post-game callback hook for season stats and evolution) — in `next-release` branch, needs cherry-pick to a new PR targeting `main` - **WP-14** (tier completion notification embeds) — in `next-release` branch, needs cherry-pick to a new PR targeting `main` **Note:** The `next-release` branch is NOT being deleted yet — it still holds WP-13 and WP-14 code that needs to be cherry-picked into new PRs before the branch can be removed.

cal closed this pull request 2026-03-23 19:48:36 +00:00

All checks were successful

Hide all checks

Build Docker Image / build (push) Successful in 1m25s

Details

Build Docker Image / build (pull_request) Successful in 54s

Details

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

ai-changes-requested

  

ai-failed

  

ai-pr-opened

  

ai-reviewed

  

ai-reviewing

  

ai-working

  

ai-working

  

bug

  

enhancement

  

feature

New feature proposal

  

in-queue

Approved for development

  

performance

  

security

  

tech-debt

  

todo

No Label

ai-changes-requested

ai-failed

ai-pr-opened

ai-reviewed

ai-reviewing

ai-working

ai-working

bug

enhancement

feature

in-queue

performance

security

tech-debt

todo

Milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: cal/paper-dynasty-discord#103

No description provided.