Skip to content
This repository was archived by the owner on Sep 17, 2025. It is now read-only.

GeminiEditor: replace with expected_replacements and EOL handling (Phase 1a) #155

Draft
enyst wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

GeminiEditor: replace with expected_replacements and EOL handling (Phase 1a) #155

enyst wants to merge 8 commits into from

Conversation

@enyst
Copy link
Contributor

@enyst enyst commented Aug 16, 2025 •
edited
Loading

Summary

  • Introduce GeminiEditor with Gemini-CLI–compatible replace behavior.

Key Semantics

  • Normalize matching/comparison on LF; preserve original EOLs when writing
  • Error when new_string == old_string
  • If file is missing and old_string == '': create file with new_string
  • If file is missing and old_string != '': error
  • Enforce expected_replacements (default 1); error on mismatch or 0
  • Enforce absolute path and workspace-root boundaries; reject directories
  • Return old/new content to enable accurate upstream diffs

Why

  • Align ACI editor with Gemini-CLI semantics to improve reliability of Gemini models using replace.

Companion PR

  • OpenHands routes FileEditAction(command='replace', impl_source=OH_ACI) to GeminiEditor when present; falls back to OHEditor('str_replace') otherwise.

Co-authored-by: openhands [email protected]

@enyst
GeminiEditor replace with Gemini-CLI semantics (Phase 1a); export in …
fda4e89 
…__init__; add unit tests

Co-authored-by: OpenHands-GPT-5 [email protected]
@enyst enyst changed the title GeminiEditor (Phase 1a): Gemini-CLI–style replace with EOL preservation and expected_replacements GeminiEditor (Phase 1a): Gemini replace with EOL and expected_replacements Aug 16, 2025
@enyst enyst changed the title GeminiEditor (Phase 1a): Gemini replace with EOL and expected_replacements GeminiEditor: replace with EOL and expected_replacements Aug 16, 2025
@enyst enyst changed the title GeminiEditor: replace with EOL and expected_replacements GeminiEditor: replace with expected_replacements and EOL handling (Phase 1a) Aug 16, 2025
openhands-agent and others added 7 commits August 16, 2025 23:06
@openhands-agent
fix(gemini-editor): align error messages + CRLF preservation; return …
4665851 
…CLIResult.error on parameter issues\n\nMatches unit test expectations in tests/unit/editor/test_gemini_editor.py.\n\nCo-authored-by: openhands <[email protected]>
@openhands-agent
chore(lint): fix import order for ruff E402\n\nCo-authored-by: openha…
1c3a737 
…nds <[email protected]>
@openhands-agent
chore(lint): fix import grouping for ruff
c3f3102
@openhands-agent
style: wrap long line to satisfy ruff-format
511722c
@openhands-agent
style: apply ruff/format changes from CI
020180d
@timofimo @enyst
Strip whitespace if no occurences found str_replace (All-Hands-AI#143)
5b9f7f5 
Helps reduce the amount of retries when using an LLM like Devstral.
@xingyaoww @openhands-agent
@ryanhoangt @enyst
Clamp view_range end to file length and emit warning instead of error (…
b016a9c 
…fixes All-Hands-AI#154) (All-Hands-AI#157)

* editor: clamp view_range end to file length, emit warning instead of error when beyond EOF (fixes All-Hands-AI#154)

- Normalize end_line by capping to num_lines and allow -1 as before
- Append NOTE: warning to output when clamped
- Update tests to assert on warning text

Co-authored-by: openhands <[email protected]>

* Prepend warning message instead of appending it

Co-authored-by: openhands <[email protected]>

* Update openhands_aci/editor/editor.py

* Update openhands_aci/editor/editor.py

* bump to 0.3.2

* Update tests/integration/editor/test_error_handling.py

---------

Co-authored-by: openhands <[email protected]>
Co-authored-by: Ryan H. Tran <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@enyst @openhands-agent @timofimo @xingyaoww