Files
brent.edwards bb9695dec3 chore(merge): resolve conflicts in context-tiers and subplan-execution
Resolved merge conflicts from PR #5276 (fix/v3.4.0/context-settings-defaults):

- context_tiers.py: Accepted PR #5276's corrected default values
  - _DEFAULT_MAX_TOKENS_HOT: 8000 → 16000
  - _DEFAULT_MAX_DECISIONS_WARM: 500 → 100
  - _DEFAULT_MAX_DECISIONS_COLD: 5000 → 500

- subplan_execution_service.py: Accepted PR #5276's improved fail-fast logic
  - Replaced status_map with status_lookup naming
  - Added fail_fast_ids set tracking for better cancellation handling
  - Improved edge-case handling for concurrent subplan execution
  - Enhanced comments explaining fail-fast semantics

All linting and type checks pass.
2026-04-20 22:20:45 +00:00
..