Skip to content

resovle conflicts #39

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.

Sign up for GitHub

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

Merged
khezen merged 2 commits into from
Aug 31, 2026
Merged

resovle conflicts #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a70c0b1
resovle conflicts
khezen Aug 31, 2026
fb3683a
resovle conflicts
khezen Aug 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,8 @@ DEFAULT_MODEL=anthropic/claude-opus-4-6
# Falls back to DEFAULT_MODEL if not set
# EXTRACTION_MODEL=anthropic/claude-sonnet-4-5-20250929

<<<<<<< HEAD
# DEFAULT_MAX_ITERS=5
# DEFAULT_MAX_LLM_CALLS=8
=======
# DEFAULT_MAX_ITERS=3
# DEFAULT_MAX_LLM_CALLS=5
>>>>>>> main
# Provider reasoning budget: minimal | low | medium | high
# DEFAULT_REASONING_EFFORT=medium
# DEFAULT_TEMPERATURE=0.2
Expand Down
8 changes: 5 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

## [Unreleased]

<<<<<<< HEAD
## [1.0.14] - 2026-08-31

### Fixed
- Resolved leftover merge conflict markers in `.env.example` and `CHANGELOG.md`

## [1.0.13] - 2026-08-31

### Changed
Expand All @@ -24,8 +28,6 @@
- `max_llm_calls` now propagated to code reviewer, scope resolver, and supply chain auditor RLM agents
- GitHub Action: `default-max-tokens` input, `summary-max-iters` input, full `audit-*` signature inputs (`audit-enabled`, `audit-model`, `audit-max-iters`, `audit-max-llm-calls`, `audit-reasoning-effort`, `audit-temperature`), `audit-memory-enabled` input

=======
>>>>>>> main
## [1.0.12] - 2026-08-30

### Changed
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "codespy-ai"
version = "1.0.13"
version = "1.0.14"
description = "Code review agent powered by DSPy"
readme = "README.md"
license = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion src/codespy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""codespy - Code review agent powered by DSPy."""

__version__ = "1.0.13"
__version__ = "1.0.14"
Loading