lcode-cli 0.22.0__py3-none-any.whl → 0.23.0__py3-none-any.whl

lcode/__init__.py

@@ -3,7 +3,7 @@
 From a program: `from lcode import Session` (see lcode.api).
 """
 
-__version__ = "0.22.0"
+__version__ = "0.23.0"
 
 API = ("Session", "Result", "Options", "SetupError")
 

lcode/acp.py

@@ -48,7 +48,12 @@ KINDS = {
     "bash": "execute", "web_search": "fetch", "web_fetch": "fetch", "agent": "think", "todo_write": "think",
     "present_plan": "switch_mode", "bash_output": "read", "bash_stop": "execute",
 }  # fmt: skip
-STOP = {"success": "end_turn", "max_steps": "max_turn_requests", "interrupted": "cancelled"}
+STOP = {
+    "success": "end_turn",
+    "max_steps": "max_turn_requests",
+    "loop": "max_turn_requests",
+    "interrupted": "cancelled",
+}
 MAX_INLINE = 200_000  # bytes of a file the editor attaches that go into the prompt
 METHOD_NOT_FOUND, INVALID_PARAMS, INTERNAL_ERROR, NOT_FOUND = -32601, -32602, -32603, -32002
 

lcode/action.py

@@ -297,7 +297,7 @@ def answer(hub: GitHub, task: Task, inputs: Inputs, cwd: Path) -> None:
     )
     with open_session(inputs, cwd) as session:
         result = session.run(prompt)
-        if result.status not in ("success", "max_steps"):
+        if result.status not in ("success", "max_steps", "loop"):
             raise ActionError(result.error or result.status)
         reply = result.text.strip() or "(no answer)"
         changed = git(cwd, "status", "--porcelain").strip()
@@ -336,6 +336,8 @@ def answer(hub: GitHub, task: Task, inputs: Inputs, cwd: Path) -> None:
             reply += f"\n\n{link}"
         if result.status == "max_steps":
             reply += f"\n\n(Stopped after {inputs.max_steps} steps.)"
+        elif result.status == "loop":
+            reply += "\n\n(Stopped: the model kept repeating the same call.)"
         hub.comment(task.number, reply[:MAX_COMMENT] + footer(result))
 
 
@@ -349,7 +351,7 @@ def review(hub: GitHub, task: Task, inputs: Inputs, cwd: Path) -> None:
         prompt = gitflow.review_prompt(session.agent, base)
         session.agent.no_changes = "This is a review, so nothing can be changed: report what should change instead."
         result = session.run(prompt)
-    if result.status not in ("success", "max_steps"):
+    if result.status not in ("success", "max_steps", "loop"):
         raise ActionError(result.error or result.status)
     hub.comment(task.number, f"**lcode review**\n\n{result.text.strip()[:MAX_COMMENT]}{footer(result)}")
 

lcode/agent.py

@@ -32,6 +32,7 @@ from lcode.mcp import McpManager
 from lcode.ollama import Ollama, OllamaError
 from lcode.permissions import Permissions
 from lcode.render import MarkdownStreamer
+from lcode.repeats import Repeats
 from lcode.sandbox import Sandbox, SandboxError, project_root
 from lcode.tools import (
     LSP_SCHEMA,
@@ -57,7 +58,9 @@ MAX_STEPS_PER_TURN = 150
 EVENT_OUTPUT = 4000  # characters of a tool's output in an event
 # How a tool result starts when the call failed or wasn't allowed (an "error" in events and results).
 REFUSED = ("Error:", "A deny rule", "The user denied", "This needs the user's permission")
-MAX_MALFORMED_CALL_RETRIES = 2  # Ollama rejects tool calls whose arguments aren't valid JSON  # safety cap on tool-call iterations for one request
+MAX_MALFORMED_CALL_RETRIES = 2  # Ollama rejects tool calls whose arguments aren't valid JSON
+# How Ollama reports a tool call it couldn't parse (Qwen3.6's calls are XML)
+MALFORMED_CALL = ("error parsing tool call", "XML syntax error")
 AUTO_COMPACT_RATIO = 0.85  # summarize the history when the context is this full
 PRUNED_ENOUGH = 0.6  # after pruning old tool output, summarize only if the context is still this full
 PROJECT_FILES = ("AGENTS.md", "LCODE.md", "CLAUDE.md")
@@ -216,6 +219,7 @@ class Settings:
     notify: bool = False  # desktop notifications after long requests (lcode.notify)
     notify_after: int = 30  # seconds: a request this long notifies when it's done or waits for an answer
     max_parallel_agents: int = 1
+    repeat_limit: int = 3  # identical calls with identical results before the model is told (lcode.repeats)
 
 
 class Agent:
@@ -267,7 +271,8 @@ class Agent:
         # Decides on a presented plan instead of asking in the terminal: "ask", "auto-edit", or why not.
         self.plan_review: Callable[[str, str], str] | None = None
         self.max_steps = MAX_STEPS_PER_TURN
-        self.turn_status = ""  # how the last request ended: success, max_steps
+        self.turn_status = ""  # how the last request ended: success, max_steps, loop
+        self.repeats = Repeats(settings.repeat_limit)  # notices when the model repeats itself
         self.response = None  # the streaming response, so another thread can abort it
         self.ctx_used = 0
         self.last_speed = 0.0
@@ -809,7 +814,9 @@ class Agent:
         self.turn_status = "running"
         note = planning.NOTE if self.planning() and self.allowed_tools is None else ""
         self.messages.append({"role": "user", "content": self.expand_mentions(user_text) + note})
+        self.repeats.reset()
         malformed = 0
+        looping = ""  # the call the model kept repeating, when lcode stopped the request for it
         for step in range(self.max_steps):
             if self.cancel is not None and self.cancel.is_set():
                 raise KeyboardInterrupt
@@ -834,17 +841,22 @@ class Agent:
                     }
                 )
             except OllamaError as e:
-                if "error parsing tool call" not in str(e) or malformed >= MAX_MALFORMED_CALL_RETRIES:
+                if not any(m in str(e) for m in MALFORMED_CALL) or malformed >= MAX_MALFORMED_CALL_RETRIES:
                     raise
                 malformed += 1
-                reason = str(e).rsplit("err=", 1)[-1].strip() if "err=" in str(e) else "invalid JSON"
+                if "err=" in str(e):
+                    reason = str(e).rsplit("err=", 1)[-1].strip()
+                elif "XML syntax error" in str(e):
+                    reason = str(e).split("XML syntax error", 1)[1].strip(" :") or "invalid XML"
+                else:
+                    reason = "invalid JSON"
                 self.console.print("[yellow]The model wrote a malformed tool call; asking it to try again.[/]")
                 self.messages.append(
                     {
                         "role": "user",
-                        "content": f"[lcode] Your last tool call could not be parsed ({reason}): its arguments "
-                        "must be one complete, valid JSON object. Make the call again. If it writes a file, "
-                        "make sure the whole content is included and properly escaped.",
+                        "content": f"[lcode] Your last tool call could not be parsed ({reason}): it must be "
+                        "complete and well-formed, with every argument closed. Make the call again. If it writes "
+                        "a file, make sure the whole content is included and properly escaped.",
                     }
                 )
                 continue
@@ -892,6 +904,15 @@ class Agent:
                     self.console.print(Text(f"  {result[:300]}", style="red"))
                 elif name in ("read_file", "grep", "glob", "list_dir"):
                     self.console.print(Text(f"  ⎿ {result.count(chr(10)) + 1} line(s)", style="dim"))
+                verdict = self.repeats.check(name, args, result)
+                if verdict.note:
+                    result += verdict.note
+                    what = "stopping the request" if verdict.stop else "told the model"
+                    self.console.print(
+                        Text(f"  ⎿ same call, same result, {verdict.count} times: {what}", style="yellow")
+                    )
+                    if verdict.stop:
+                        looping = self.describe_call(name, args)
                 tool_msg = {"role": "tool", "tool_name": name, "content": result}
                 if call.get("id"):
                     tool_msg["tool_call_id"] = call["id"]
@@ -905,6 +926,27 @@ class Agent:
                         "output": result[:EVENT_OUTPUT] + ("…" if len(result) > EVENT_OUTPUT else ""),
                     }
                 )
+                if looping:
+                    for rest in calls[i + 1 :]:
+                        skipped = {
+                            "role": "tool",
+                            "tool_name": rest.get("function", {}).get("name", ""),
+                            "content": "Not run: lcode stopped the request before this call.",
+                        }
+                        if rest.get("id"):
+                            skipped["tool_call_id"] = rest["id"]
+                        self.messages.append(skipped)
+                    break
+            if looping:
+                self.turn_status = "loop"
+                self.console.print(
+                    Text(
+                        f"Stopped: the model kept making the same call with the same result: {looping}. Tell it "
+                        "what to do differently, or try again.",
+                        style="yellow",
+                    )
+                )
+                return
         else:
             self.turn_status = "max_steps"
             self.console.print(f"[yellow]Stopped after {self.max_steps} steps.[/]")

lcode/api.py

@@ -35,8 +35,8 @@ if TYPE_CHECKING:
     from lcode.hardware import Hardware
 
 SCHEMA_VERSION = 1
-STATUSES = ("success", "error", "max_steps", "interrupted")
-EXIT_CODES = {"success": 0, "error": 1, "max_steps": 3, "interrupted": 130}
+STATUSES = ("success", "error", "max_steps", "loop", "interrupted")
+EXIT_CODES = {"success": 0, "error": 1, "max_steps": 3, "loop": 4, "interrupted": 130}
 OLLAMA_INSTALL = {
     "linux": "curl -fsSL https://ollama.com/install.sh | sh",
     "darwin": "brew install ollama   (or download it from https://ollama.com/download)",
@@ -69,7 +69,7 @@ class Options:
 class Result:
     """How a request went. `to_json()` is what `lcode -p --output json` prints."""
 
-    status: str  # success, error, max_steps or interrupted
+    status: str  # success, error, max_steps, loop (stopped: the model kept repeating itself) or interrupted
     text: str  # the model's final answer
     session_id: str
     model: str
@@ -194,6 +194,7 @@ def open_agent(cwd: Path, options: Options, console: Console, hw: Hardware | Non
         embed_model=cfg["embed_model"],
         notify=cfg["notify"],
         notify_after=cfg["notify_after"],
+        repeat_limit=cfg["repeat_limit"],
     )
     agent = Agent(ollama, settings, cwd, console=console)
     agent.interactive = options.interactive
@@ -272,7 +273,7 @@ def run_request(agent: Agent, prompt: str) -> Result:
 
     try:
         agent.run_turn(prompt)
-        status = "max_steps" if agent.turn_status == "max_steps" else "success"
+        status = agent.turn_status if agent.turn_status in ("max_steps", "loop") else "success"
     except KeyboardInterrupt:
         status, error = "interrupted", "interrupted before the request was done"
     except ModelError as e:

lcode/config.py

@@ -59,6 +59,7 @@ SETTINGS: dict[str, tuple[object, type, str]] = {
     "subagents": (True, bool, "let the model hand tasks to subagents that have their own context"),
     "notify": (True, bool, "desktop notification when a long request is done or waits for you"),
     "notify_after": (30, int, "seconds a request runs before it notifies (with notify on)"),
+    "repeat_limit": (3, int, "identical tool calls with identical results before lcode steps in (0: never)"),
     "max_parallel_agents": (1, int, "subagents that may run at the same time (more needs OLLAMA_NUM_PARALLEL)"),
 }
 ENV_OVERRIDES = {

lcode/repeats.py

@@ -0,0 +1,104 @@
+"""Notice when the model goes round in circles.
+
+Small models sometimes fall into a loop: they make a tool call, get a result, and make the very same call
+again, and again, until the user steps in. Within one request lcode counts the calls that repeat an earlier
+one exactly: the same tool, the same arguments and the same result. At the `limit`-th one (a call that
+failed: one sooner) the result gets a note that tells the model so, and if it still goes on, lcode ends the
+request.
+
+Results that change aren't repeats: a test run again after a fix, a background job read while it runs. And
+a call that may have changed something (a file edit, a shell command that isn't read-only) starts the count
+again for every other call, so checking a build after each edit never adds up. Its own repeats still count:
+running the same failing command over and over is a loop.
+"""
+
+from __future__ import annotations
+
+import hashlib
+import json
+from dataclasses import dataclass
+
+from lcode.permissions import is_read_only
+
+STOP_AFTER_NOTE = 2  # repeats after the note before the request ends
+FAILED = ("Error:", "A deny rule", "The user denied", "This needs the user's permission")
+UNCHANGING = frozenset(
+    {
+        "read_file",
+        "list_dir",
+        "glob",
+        "grep",
+        "view_image",
+        "repo_map",
+        "search_code",
+        "lsp",
+        "web_search",
+        "web_fetch",
+        "bash_output",
+        "todo_write",
+        "skill",
+        "mcp_find_tools",
+    }
+)  # tools that don't change files; anything else might
+
+
+@dataclass
+class Verdict:
+    count: int  # how often this exact call got this exact result in the request
+    note: str = ""  # to add to the tool result
+    stop: bool = False  # end the request
+
+
+class Repeats:
+    def __init__(self, limit: int = 3) -> None:
+        self.limit = limit  # 0: off
+        self.seen: dict[str, int] = {}
+
+    def reset(self) -> None:
+        """A new request."""
+        self.seen.clear()
+
+    def check(self, name: str, args: dict, result: str) -> Verdict:
+        """Count this call and its result."""
+        if self.limit <= 0:
+            return Verdict(1)
+        key = hashlib.sha256(json.dumps([name, args, result], sort_keys=True, default=str).encode()).hexdigest()
+        count = self.seen.get(key, 0) + 1
+        if changes_things(name, args, result):
+            self.seen.clear()
+        self.seen[key] = count
+        failed = result.startswith(FAILED)
+        note_at = max(2, self.limit - 1) if failed else max(2, self.limit)
+        if count < note_at:
+            return Verdict(count)
+        same = "the same error" if failed else "the same result"
+        if count >= note_at + STOP_AFTER_NOTE:
+            return Verdict(
+                count,
+                f"\n\n[lcode] You made this exact call {count} times in this request and got {same} each "
+                "time, so lcode stopped the request here. Next time, don't repeat a call that didn't help: "
+                "change your approach, or tell the user what is blocking you.",
+                stop=True,
+            )
+        hint = (
+            "If it's an edit, read the file again and copy the text exactly. "
+            if failed and name in ("edit_file", "write_file")
+            else ""
+        )
+        return Verdict(
+            count,
+            f"\n\n[lcode] You made this exact call {count} times in this request and got {same} each time. "
+            f"Making it again won't change that. Use what it returned, or try something different. {hint}"
+            "If you're stuck, stop and tell the user what is blocking you.",
+        )
+
+
+def changes_things(name: str, args: dict, result: str) -> bool:
+    """Whether the call may have changed files (or anything else a later call could see)."""
+    if name in UNCHANGING:
+        return False
+    if name in ("edit_file", "write_file"):
+        return not result.startswith(FAILED)
+    if name == "bash":
+        return not is_read_only(str(args.get("command", "")))
+    return True  # other tools (MCP, subagents…) might

lcode/subagents.py

@@ -486,12 +486,17 @@ class Run:
             child._run_turn(self.task)
             last = child.messages[-1]
             if last.get("role") != "assistant" or last.get("tool_calls") or not last.get("content", "").strip():
-                # It ran out of steps: ask for what it has so far, without tools.
+                # It ran out of steps, or went round in circles: ask for what it has so far, without tools.
+                why = (
+                    "You kept making the same call, so lcode stopped you."
+                    if child.turn_status == "loop"
+                    else "You've used all your steps."
+                )
                 child.messages.append(
                     {
                         "role": "user",
-                        "content": "[lcode] You've used all your steps. Stop here and write your report: what "
-                        "you found or did so far, and what's left.",
+                        "content": f"[lcode] {why} Stop here and write your report: what you found or did so "
+                        "far, and what's left.",
                     }
                 )
                 child.allowed_tools = set()

{lcode_cli-0.22.0.dist-info → lcode_cli-0.23.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: lcode-cli
-Version: 0.22.0
+Version: 0.23.0
 Summary: A local-first terminal coding agent powered by open-weight models on your own GPU or Mac, via Ollama.
 Project-URL: Homepage, https://nasser1941.github.io/lcode/
 Project-URL: Documentation, https://nasser1941.github.io/lcode/

{lcode_cli-0.22.0.dist-info → lcode_cli-0.23.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-lcode/__init__.py,sha256=s1wi6lDwnIt_wcDMaRuhH7baVfU3UfYMQ2ejuBf_W9E,473
+lcode/__init__.py,sha256=G36hAKq_BqNwKGr17AmtWXAKHe-_Nnbzm_VWmWBC-SI,473
 lcode/__main__.py,sha256=s5N5pryX2FAu93GGZ3FxUrIXHWGzxz66lKUoaV_h8Ws,35
-lcode/acp.py,sha256=kRD_uuDDdGXt7xwvXZ8OqePK1HprEV76wWAWkV_gcak,28987
-lcode/action.py,sha256=1r3abjheYFYQ-EUArvotls8pLmE3YjNMGHAy_iF0Z70,16198
-lcode/agent.py,sha256=FgZJpGD1a46qaa1nixZYXS3rPaFaJgnGpfoUi7ikhGY,51106
-lcode/api.py,sha256=rOpcA2-axzUj_DppH3EelanVnwd-2O4MgN91OXGJePY,15250
+lcode/acp.py,sha256=Tpc8lsvffZSYbTRI4t7X4E2chahqZIPcKeYIcL5bV3Y,29035
+lcode/action.py,sha256=W-QqdGt4VAVLq7mcIdvL9UrEOwDEWvkZ26gNDv8k1kg,16330
+lcode/agent.py,sha256=Br-L-7sLnGBG_Hw2lwi19peFZldCh4Ve7PgtVPURjTU,53254
+lcode/api.py,sha256=FQ6aVLB936Cu2XEBmuOoq0u1DfOiExmgap0Y3WxJ2mQ,15376
 lcode/backends.py,sha256=dtJHrC6ys73bRDg64z0tQz1PavmeAkiODZu1fOO9ExQ,20635
 lcode/bench.py,sha256=XVdk0hDxmRcjgROOCgwwOsExcUhIxgh0B2vnxtGnA3o,40742
 lcode/bench_backend.py,sha256=X2fo-zRX92Xp3KMxSsFlWioc2vRupBTtowj5kLME8mw,14287
@@ -11,7 +11,7 @@ lcode/catalog.py,sha256=pZ1azX9OH2r4JE2c6E5OfwywpgS39-W2oXzoCHJhmtM,4141
 lcode/checkpoints.py,sha256=eqPtmPe44-aweWqc2H21ROogwzIt3NpvcUobsaCHoGY,18354
 lcode/cli.py,sha256=ue5wsoFxraXXVu7X32S4tbKPLKYhgeI6zpK2i5nXXlU,40180
 lcode/codesearch.py,sha256=Io8leN1nb_Y-Dvlm9xaGtwUWYXX-ooswuznJV6dGU1s,10766
-lcode/config.py,sha256=eDEvOAA1plsSjvihzHEwGjNVgvcz3Pb-AR5DY5JmXnM,10255
+lcode/config.py,sha256=fGjK4fM_YRY0qDQmbIVT3FAfL2I2UxLfYEFxnAI-Xu4,10365
 lcode/context.py,sha256=qJymLE3eYeaF6qVOzlUwDURqlky__8cskl_6vXeU3AA,10701
 lcode/extensions.py,sha256=W0HFDl0BvROzr7i_qtabHdIbacBgP5o5qIJLzoM2oNE,16806
 lcode/frontmatter.py,sha256=Bx0n4vLPhp7ZCWx-g7xqzqNy5VoKBxyeeikh5UFB_gA,2441
@@ -28,11 +28,12 @@ lcode/ollama.py,sha256=u5tnvL28cfaFS4GhmiEsHhTQe6w3Ng_Tej05UUzLQTQ,7715
 lcode/permissions.py,sha256=i04YLtqYCxwApgawomPp4d35uk9HAJtpKY__gfw8j9s,6347
 lcode/planning.py,sha256=Q2upaoZPnXDMQT2F-ETxX1lk_wDntTzhSKNVYIQSoQA,6540
 lcode/render.py,sha256=gMvf4W3qkLUJ4Vot3az_hP_zRDAItJC9pP-68dHFkfA,1375
+lcode/repeats.py,sha256=uzyAewX03nJf5dKwYFH4y9ZDnh0Lvy2k0qC2vdntM5Y,4061
 lcode/repl.py,sha256=pQAPePNsBxJfcuif2Cvyxr0FSeO_DVGv_T5cL9BrWu4,48470
 lcode/repomap.py,sha256=1GRJgEUjBl9XHSXsF7tSGXBCEgsY-3CzwMohaTudZ_M,13969
 lcode/sandbox.py,sha256=u_pkrVRXhCGhh-wFDPwuZ3jGG7UeXxXRAeBNsm37ZvE,8608
 lcode/sessions.py,sha256=wOR-J0EHgJxLSPboKPHnvBcp5VTUYTj3tZWgpsa6-K4,4013
-lcode/subagents.py,sha256=rD7lnIioodirh8eVnXvRWdZx79J_rscPLssD2Gt7KIo,28914
+lcode/subagents.py,sha256=Z2RHp7an16dhOGReucVIEOAnXjxM8jx7sHvWd_Fp2V4,29142
 lcode/tools.py,sha256=pOdA4ihQHSs8yWUzfxhiLw3GajF5Dr1edxVX0Akr6CU,47257
 lcode/update.py,sha256=i92bnW252VneYh0vD6djxmXsDOa5MXP20bjlLZUue_c,25236
 lcode/vision.py,sha256=w33QPmdGwP33wM4mvmAH4amFDZ1xzeXhEsSLJ-STSHY,4243
@@ -53,8 +54,8 @@ lcode/servers/__init__.py,sha256=qrIhxEodEB8cjKEQ4Cicc0GsQhE2OH-9qlVHzr3-tq8,77
 lcode/servers/encord.py,sha256=WSauawL1UKYZCUAG1oalcKL_An3DVof-JM6xIgFyQSE,12769
 lcode/servers/valohai.py,sha256=e5xZGIoa4cja4f5i85q1GpL9c7cglUjV8jN2co1CFMY,14430
 lcode/servers/xai.py,sha256=h2emAvHSnkuB9WmJInlynsDhvxJwNVD2AHFX7vqMXNc,13627
-lcode_cli-0.22.0.dist-info/METADATA,sha256=3pd56TbC41-H0Ta-kGkl1jn461kw3OqcIOLp-2DZrJE,12620
-lcode_cli-0.22.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-lcode_cli-0.22.0.dist-info/entry_points.txt,sha256=Hxsn_itbnbgft3U0FwxWdmEt0yoAV2LB-nJDnL9WT20,172
-lcode_cli-0.22.0.dist-info/licenses/LICENSE,sha256=JWjmoL7nNIC1XUa-dZm2hwLUgjUQMFo6k8APb0idNzs,1074
-lcode_cli-0.22.0.dist-info/RECORD,,
+lcode_cli-0.23.0.dist-info/METADATA,sha256=r2mvuIagBxzC4y5i14mZ7tYHnhy-Osy50M-wTYhkk-4,12620
+lcode_cli-0.23.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+lcode_cli-0.23.0.dist-info/entry_points.txt,sha256=Hxsn_itbnbgft3U0FwxWdmEt0yoAV2LB-nJDnL9WT20,172
+lcode_cli-0.23.0.dist-info/licenses/LICENSE,sha256=JWjmoL7nNIC1XUa-dZm2hwLUgjUQMFo6k8APb0idNzs,1074
+lcode_cli-0.23.0.dist-info/RECORD,,