lcode-cli 0.2.2__py3-none-any.whl → 0.3.1__py3-none-any.whl

lcode/repl.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import html
+import json
 import os
 import re
 import threading
@@ -23,6 +24,7 @@ from rich.text import Text
 from lcode import __version__, catalog, limits, sessions, web
 from lcode.agent import AUTO_COMPACT_RATIO, INIT_PROMPT, Agent
 from lcode.catalog import MIN_USEFUL_CONTEXT
+from lcode.checkpoints import Checkpoint, CheckpointError, Restore
 from lcode.config import PERMISSION_MODES, STATE_DIR, ConfigError, format_tokens, parse_context
 from lcode.hardware import Hardware
 from lcode.ollama import OllamaError
@@ -34,6 +36,9 @@ COMMANDS = {
     "/clear": "Start a fresh conversation",
     "/rename": "Name this session so you can find it later, e.g. /rename auth refactor",
     "/resume": "Resume a saved session: pick from a list, or /resume <number|name> (/resume all: every folder)",
+    "/undo": "Undo the file changes of the last request (lcode saves a checkpoint before changing files)",
+    "/rewind": "Go back to before an earlier request: its files, and optionally the conversation",
+    "/checkpoints": "List the requests that changed files, and which files",
     "/compact": "Summarize the conversation to free context (optional: what to focus on)",
     "/context": "Show context usage and change the window size: pick from a list, or /context 128k",
     "/ctx": "Shortcut for /context",
@@ -229,6 +234,157 @@ def context_command(agent: Agent, arg: str, hardware: Hardware) -> None:
     apply_context(agent, size, hardware)
 
 
+def ask_yes(question: str) -> bool:
+    try:
+        return input(f"  {question} [y/N] ").strip().lower() in ("y", "yes")
+    except EOFError:
+        return False
+
+
+def checkpoints_off(agent: Agent) -> bool:
+    if agent.checkpoints.enabled:
+        return False
+    agent.console.print("Checkpoints are off. Turn them on with: lcode config set checkpoints true")
+    return True
+
+
+def print_checkpoints(agent: Agent) -> None:
+    c = agent.console
+    if checkpoints_off(agent):
+        return
+    items = agent.checkpoints.items
+    if not items:
+        c.print(
+            "No checkpoints yet. Before the model first changes files in a request, lcode saves a checkpoint; "
+            "/undo restores it."
+        )
+        return
+    table = Table(title="Checkpoints", title_justify="left", header_style="bold")
+    table.add_column("#", justify="right", style="cyan")
+    table.add_column("When")
+    table.add_column("Request")
+    table.add_column("Files changed")
+    for cp in items:
+        files = ", ".join(escape(p) for p in cp.paths[:3]) + (f", +{len(cp.paths) - 3}" if len(cp.paths) > 3 else "")
+        style = "dim strike" if cp.undone else ""
+        table.add_row(
+            str(cp.n),
+            sessions.age(cp.created),
+            escape(cp.title),
+            files + (" [dim](undone)[/]" if cp.undone else ""),
+            style=style,
+        )
+    c.print(table)
+    c.print("[dim]/undo reverts the latest request; /rewind <number> goes back to before that request.[/]")
+
+
+def undo_command(agent: Agent) -> None:
+    if checkpoints_off(agent):
+        return
+    active = agent.checkpoints.active()
+    if not active:
+        agent.console.print("Nothing to undo: no request in this session has changed files (or they're all undone).")
+        return
+    restore_checkpoint(agent, active[-1], rewind=False)
+
+
+def rewind_command(agent: Agent, arg: str) -> None:
+    c = agent.console
+    if checkpoints_off(agent):
+        return
+    if not arg:
+        print_checkpoints(agent)
+        if not agent.checkpoints.active():
+            return
+        try:
+            arg = input("  Go back to before which request? (number, Enter to cancel): ").strip()
+        except EOFError:
+            return
+        if not arg:
+            return
+    target = agent.checkpoints.find(int(arg)) if arg.isdigit() else None
+    if target is None:
+        c.print(f"[yellow]No checkpoint {escape(arg)}. /checkpoints lists them.[/]")
+    elif target.undone:
+        c.print(f"Checkpoint {target.n} is already undone.")
+    else:
+        restore_checkpoint(agent, target, rewind=True)
+
+
+def file_summary(plan: Restore, limit: int = 30) -> str:
+    parts = []
+    for verb, paths in (("restored", plan.restore), ("removed", plan.remove)):
+        if paths:
+            shown = ", ".join(paths[:limit]) + (f" and {len(paths) - limit} more" if len(paths) > limit else "")
+            parts.append(f"{verb} {shown}")
+    return "; ".join(parts)
+
+
+def restore_checkpoint(agent: Agent, target: Checkpoint, rewind: bool) -> None:
+    """Put the files back to how they were before `target`'s request (and every later one)."""
+    c, cps = agent.console, agent.checkpoints
+    try:
+        plan = cps.plan(target)
+    except CheckpointError as e:
+        c.print(f"[red]Can't read checkpoint {target.n}: {escape(str(e))}[/]")
+        return
+    later = len(plan.undoing) - 1
+    also = f" and {later} later request{'' if later == 1 else 's'}" if later > 0 else ""
+    action = "Going back to before" if rewind else "Undoing"
+    c.print(f"{action} request {target.n}{also}: [bold]{escape(target.title)}[/]")
+    for path in plan.restore[:20]:
+        c.print(f"  [green]restore[/] {escape(path)}")
+    for path in plan.remove[:20]:
+        c.print(f"  [red]remove[/]  {escape(path)}")
+    hidden = max(0, len(plan.restore) - 20) + max(0, len(plan.remove) - 20)
+    if hidden:
+        c.print(f"  … and {hidden} more")
+    if plan.conflicts:
+        c.print("[yellow]These files changed again after lcode changed them; going back loses those later edits:[/]")
+        for path in plan.conflicts[:20]:
+            c.print(f"  [yellow]{escape(path)}[/]")
+        if not ask_yes("Go back anyway?"):
+            c.print("Nothing changed.")
+            return
+    elif rewind and (plan.restore or plan.remove) and not ask_yes("Restore these files?"):
+        c.print("Nothing changed.")
+        return
+    index = target.message_index
+    truncate = (
+        rewind
+        and 0 < index < len(agent.messages)
+        and agent.messages[index].get("role") == "user"
+        and agent.messages[index].get("content", "").startswith(target.request)
+        and ask_yes("Also remove those requests and answers from the conversation?")
+    )
+    try:
+        cps.apply(plan)
+    except CheckpointError as e:
+        c.print(f"[red]Couldn't restore the files: {escape(str(e))}[/]")
+        return
+    for path in cps.absolute_paths(plan):
+        agent.tools.read_mtimes.pop(path, None)  # the model must read restored files again before editing
+    if not (plan.restore or plan.remove):
+        c.print("The files were already back to how they were before that request.")
+    else:
+        c.print(f"[green]Done:[/] {escape(file_summary(plan, limit=8))}.")
+    if truncate:
+        agent.messages = agent.messages[:index]
+        agent.ctx_used = sum(len(json.dumps(m)) for m in agent.messages) // 3
+        c.print(f"The conversation is back to before request {target.n} as well.")
+    elif plan.restore or plan.remove:
+        what = "undid the file changes from" if not rewind else "rolled the files back to before"
+        agent.messages.append(
+            {
+                "role": "user",
+                "content": f'[lcode] The user {what} their request "{target.title}": {file_summary(plan)}. '
+                "Those files are back to how they were before that request, so read them again before "
+                "changing them.",
+            }
+        )
+    agent.save()
+
+
 def apply_context(agent: Agent, size: int, hardware: Hardware) -> None:
     c, s = agent.console, agent.settings
     if size == s.context:
@@ -282,7 +438,7 @@ def handle_command(agent: Agent, line: str, hardware: Hardware) -> bool:
     if cmd in ("/exit", "/quit", "/q"):
         return False
     if cmd == "/help":
-        rows = "\n".join(f"  [cyan]{k:<10}[/] {v}" for k, v in COMMANDS.items())
+        rows = "\n".join(f"  [cyan]{k:<13}[/] {v}" for k, v in COMMANDS.items())
         keys = (
             "Enter = send · Esc+Enter or trailing \\ = newline · Ctrl+C = interrupt · Ctrl+D = quit · "
             "@path = attach a file · Shift+Tab = cycle permission mode"
@@ -302,6 +458,12 @@ def handle_command(agent: Agent, line: str, hardware: Hardware) -> bool:
         info = choose_session(agent, arg)
         if info:
             resume_session(agent, info)
+    elif cmd == "/undo":
+        undo_command(agent)
+    elif cmd == "/rewind":
+        rewind_command(agent, arg)
+    elif cmd == "/checkpoints":
+        print_checkpoints(agent)
     elif cmd == "/compact":
         agent.compact(arg)
     elif cmd in ("/context", "/ctx"):

lcode/tools.py

@@ -438,6 +438,7 @@ class Toolbox:
         ok, feedback = self.agent.perms.request("edit", "edit", f"{verb} {self.rel(p)}", body)
         if not ok:
             return feedback
+        self.agent.checkpoint()
         self._write(p, content)
         n = len(content.splitlines())
         self.console.print(f"  [green]✓[/] {'Updated' if exists else 'Created'} {self.rel(p)} ({n} lines)")
@@ -472,6 +473,7 @@ class Toolbox:
         ok, feedback = self.agent.perms.request("edit", "edit", f"Edit {self.rel(p)}", self._diff(p, text, new_text))
         if not ok:
             return feedback
+        self.agent.checkpoint()
         self._write(p, new_text)
         self.console.print(f"  [green]✓[/] Edited {self.rel(p)}")
         idx = new_text.find(new_string) if new_string else -1
@@ -493,6 +495,7 @@ class Toolbox:
             )
             if not ok:
                 return feedback
+            self.agent.checkpoint()
         self.console.print(Text(f"  $ {command}", style="bold cyan"))
         fd, cwd_file = tempfile.mkstemp(prefix="lcode_cwd_")
         os.close(fd)

{lcode_cli-0.2.2.dist-info → lcode_cli-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: lcode-cli
-Version: 0.2.2
+Version: 0.3.1
 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/
@@ -73,9 +73,12 @@ through [Ollama](https://ollama.com), and when it needs current information it c
   plans multi-step tasks with a visible todo list.
 - **Long context.** 256K tokens with the default model (1M with Nemotron). You choose the window.
 - **Hardware-aware.** Detects your NVIDIA GPU or Apple Silicon Mac and picks the best model and the
-  largest context that fits: `lcode setup` does it in one step.
+  largest context that fits: `lcode setup` does it in one step. `lcode bench` compares models on
+  real coding tasks on your machine.
 - **Safe by default.** Every edit is shown as a diff and every command that isn't read-only needs
   your approval. `auto-edit` and `yolo` modes when you want speed.
+- **Undo.** lcode saves a checkpoint before the model changes files; `/undo` takes back the last
+  request's edits, new files and shell-command changes, without touching your git history.
 - **Bring your own model.** Eight curated open-weight models, all tested end to end, or any Ollama model
   with tool calling.
 - **Web search when needed.** Looks up the latest versions, docs and error messages with Ollama web
@@ -123,6 +126,8 @@ lcode
 | `lcode -c` / `lcode --resume` | continue the last session here / pick a saved session from a list |
 | `lcode --model qwen3.5-9b --context 128k` | pick a model and context window for this session |
 | `lcode models` / `lcode doctor` | what fits this machine / check the installation |
+| `lcode bench qwen3.6-35b qwen3.5-9b` | compare models on small coding tasks on this machine |
+| `/undo`, `/rewind` | take back the last request's file changes, or go back further |
 | `/rename`, `/resume` | name the current session, resume a saved one |
 | `/model`, `/context`, `/compact`, `/help` | switch model, resize the context window (pick from a list), summarize, list commands |
 
@@ -167,8 +172,6 @@ fills up. Details: [How it works](https://nasser1941.github.io/lcode/how-it-work
 
 See the pinned [Roadmap issue](https://github.com/nasser1941/lcode/issues/10). Next up:
 
-- [`/undo` and automatic checkpoints](https://github.com/nasser1941/lcode/issues/4)
-- [`lcode bench`: score models on your own hardware](https://github.com/nasser1941/lcode/issues/5)
 - [MCP tool servers](https://github.com/nasser1941/lcode/issues/6)
 - [Homebrew formula](https://github.com/nasser1941/lcode/issues/8) and an [optional sandbox for shell commands](https://github.com/nasser1941/lcode/issues/9)
 - More models in the catalog, and test reports from your hardware ([report one](https://github.com/nasser1941/lcode/issues/new?template=model_request.yml))

lcode_cli-0.3.1.dist-info/RECORD

@@ -0,0 +1,23 @@
+lcode/__init__.py,sha256=7co3jkJP_ri78Ap0JVyQJkT8sWh6fKXdJUCuT5A5Ab4,117
+lcode/__main__.py,sha256=s5N5pryX2FAu93GGZ3FxUrIXHWGzxz66lKUoaV_h8Ws,35
+lcode/agent.py,sha256=VYYGmkQi8CnP7mXgA2n_tjXnYn44uwK00j4Ow7vGKmg,25776
+lcode/bench.py,sha256=72TSBit063ERFlzgsq2xuCSzWaCLGoZKhB3G_E5HlBM,37751
+lcode/catalog.py,sha256=pZ1azX9OH2r4JE2c6E5OfwywpgS39-W2oXzoCHJhmtM,4141
+lcode/checkpoints.py,sha256=eqPtmPe44-aweWqc2H21ROogwzIt3NpvcUobsaCHoGY,18354
+lcode/cli.py,sha256=h830l_4BTgQCZULcKbMvKMV57v5g6Va0livr83vAF1E,24295
+lcode/config.py,sha256=xkD7L5gSrHbgnXt7C8SYktNXO62BqNIXtuGyCY-y4FY,6002
+lcode/hardware.py,sha256=2VbknZCxTZJwJUD8YWdQ7ryEQo_LcjtoOBOHOU9Y0fw,3085
+lcode/limits.py,sha256=oJzVQoMyTZ0_Fkpu5t3qxrf9v7Hv9S8U8BRQR5M1aKA,1237
+lcode/models.toml,sha256=lt2G64zzo_Ryxv2ISRSNZoVD_JqCqYqsM01n8WoXGs8,4098
+lcode/ollama.py,sha256=-EB_8DKh87larG7iV0neyndPRom1Hxh4y8AAfI1Ebq8,6690
+lcode/permissions.py,sha256=wJKwhJQx44AzjOFZCWwM4M2oUlPFUNYI2cIVfoBGGgc,3898
+lcode/render.py,sha256=gMvf4W3qkLUJ4Vot3az_hP_zRDAItJC9pP-68dHFkfA,1375
+lcode/repl.py,sha256=F5DsLYya5UmJt2LvJf-N_3CdBKxiK8sr7B0zNSS7gKI,26525
+lcode/sessions.py,sha256=wOR-J0EHgJxLSPboKPHnvBcp5VTUYTj3tZWgpsa6-K4,4013
+lcode/tools.py,sha256=0JFM-owT3K243tvMhHlcfWKSMyHSa44GY4A2GebKU0k,25935
+lcode/web.py,sha256=vyxKbSRJTl1Lj3hj7Yd_NwTgbv0Xi6dup2YfUXjqp-Y,14579
+lcode_cli-0.3.1.dist-info/METADATA,sha256=8sici8niZzAGQwTLMDDsOckVIbZmYB3lXZ8Cqpn7F2o,9490
+lcode_cli-0.3.1.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+lcode_cli-0.3.1.dist-info/entry_points.txt,sha256=pZ_uDQ98UzVAHUQeXn5HeyQWKGSH3r3T5aPHuSB89eI,41
+lcode_cli-0.3.1.dist-info/licenses/LICENSE,sha256=JWjmoL7nNIC1XUa-dZm2hwLUgjUQMFo6k8APb0idNzs,1074
+lcode_cli-0.3.1.dist-info/RECORD,,

lcode_cli-0.2.2.dist-info/RECORD

@@ -1,21 +0,0 @@
-lcode/__init__.py,sha256=f69CJWRNbXrayd_uWS82hWDQJcvsIH6fRtjvpXj-I8s,117
-lcode/__main__.py,sha256=s5N5pryX2FAu93GGZ3FxUrIXHWGzxz66lKUoaV_h8Ws,35
-lcode/agent.py,sha256=ppO9sMxymIVvFPeHS-5hqTyryQYBOK_0OAucaX6SeWU,24535
-lcode/catalog.py,sha256=pZ1azX9OH2r4JE2c6E5OfwywpgS39-W2oXzoCHJhmtM,4141
-lcode/cli.py,sha256=bvKv_5SGJgy8bkY-zFpXwyNACiGa6nu_n16ems_Vmq8,20103
-lcode/config.py,sha256=ZyddgIZ9TaHAcJSW_A8o7qFQbp1s2RHmsbFzOzEjV4o,5894
-lcode/hardware.py,sha256=2VbknZCxTZJwJUD8YWdQ7ryEQo_LcjtoOBOHOU9Y0fw,3085
-lcode/limits.py,sha256=oJzVQoMyTZ0_Fkpu5t3qxrf9v7Hv9S8U8BRQR5M1aKA,1237
-lcode/models.toml,sha256=lt2G64zzo_Ryxv2ISRSNZoVD_JqCqYqsM01n8WoXGs8,4098
-lcode/ollama.py,sha256=fELwqw7xqLH9TM7XvdI1pxqYZFeIRJBv-VSz9REdvwA,6516
-lcode/permissions.py,sha256=wJKwhJQx44AzjOFZCWwM4M2oUlPFUNYI2cIVfoBGGgc,3898
-lcode/render.py,sha256=gMvf4W3qkLUJ4Vot3az_hP_zRDAItJC9pP-68dHFkfA,1375
-lcode/repl.py,sha256=1InDmkMz286vuCOwRHNCTdBih_KekYkM4Ol52_g7C4s,20001
-lcode/sessions.py,sha256=wOR-J0EHgJxLSPboKPHnvBcp5VTUYTj3tZWgpsa6-K4,4013
-lcode/tools.py,sha256=97wPiabQuztMr4qsMgf_beNAFfraxSlU2195QJffFkg,25835
-lcode/web.py,sha256=vyxKbSRJTl1Lj3hj7Yd_NwTgbv0Xi6dup2YfUXjqp-Y,14579
-lcode_cli-0.2.2.dist-info/METADATA,sha256=XQ3SNVJtZ6MAxIM90xpJVSLQ17uCvulOJ00kyhSNbco,9232
-lcode_cli-0.2.2.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-lcode_cli-0.2.2.dist-info/entry_points.txt,sha256=pZ_uDQ98UzVAHUQeXn5HeyQWKGSH3r3T5aPHuSB89eI,41
-lcode_cli-0.2.2.dist-info/licenses/LICENSE,sha256=JWjmoL7nNIC1XUa-dZm2hwLUgjUQMFo6k8APb0idNzs,1074
-lcode_cli-0.2.2.dist-info/RECORD,,