Merge branch 'main' of github.com:NousResearch/hermes-agent into bb/gui

This commit is contained in:
Brooklyn Nicholson 2026-05-30 17:23:21 -05:00
commit 6bd8132bf9
2 changed files with 2 additions and 13 deletions

View file

@ -356,13 +356,6 @@ class TestShellFileOpsHelpers:
assert "50|continued" in result
assert "51|more" in result
def test_add_line_numbers_padded_env_override(self, file_ops, monkeypatch):
# Legacy fixed-width format available via HERMES_READ_GUTTER=padded.
monkeypatch.setenv("HERMES_READ_GUTTER", "padded")
result = file_ops._add_line_numbers("line one\nline two")
assert " 1|line one" in result
assert " 2|line two" in result
def test_add_line_numbers_truncates_long_lines(self, file_ops):
long_line = "x" * (MAX_LINE_LENGTH + 100)
result = file_ops._add_line_numbers(long_line)

View file

@ -714,13 +714,9 @@ class ShellFileOperations(FileOperations):
line-reference / patch / value-lookup / structure tasks (4/4 both),
while dropping line numbers entirely regressed line-referencing
(the model hand-counted and was off-by-one, 3/4) so we keep the
numbers, just not the padding. ``HERMES_READ_GUTTER=padded``
restores the legacy fixed-width format for anyone who relied on
column alignment.
numbers, just not the padding.
"""
import os as _os
from tools.tool_output_limits import get_max_line_length
padded = (_os.environ.get("HERMES_READ_GUTTER") or "").lower() == "padded"
max_line_length = get_max_line_length()
lines = content.split('\n')
numbered = []
@ -728,7 +724,7 @@ class ShellFileOperations(FileOperations):
# Truncate long lines
if len(line) > max_line_length:
line = line[:max_line_length] + "... [truncated]"
numbered.append(f"{i:6d}|{line}" if padded else f"{i}|{line}")
numbered.append(f"{i}|{line}")
return '\n'.join(numbered)
def _expand_path(self, path: str) -> str: