lcode-cli 0.31.0__py3-none-any.whl → 0.33.0__py3-none-any.whl

lcode/__init__.py

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

lcode/agent.py

@@ -35,6 +35,7 @@ from lcode import (
     planning,
     repomap,
     residency,
+    review,
     sessions,
     subagents,
     vision,
@@ -51,6 +52,7 @@ 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.steer import NOTE_INTRO, Steering
 from lcode.tools import (
     LSP_SCHEMA,
     MEMORY_SCHEMA,
@@ -223,10 +225,12 @@ class Progress:
     arrives, for example while the model writes a long file into a tool call.
     """
 
-    def __init__(self, phase: str = "Thinking") -> None:
+    def __init__(self, phase: str = "Thinking", steering: Steering | None = None, tokens: bool = True) -> None:
         self.started = self.last_chunk = time.time()
         self.phase = phase
         self.chars = 0
+        self.steering = steering  # the note being typed and the notes waiting, shown on a second line
+        self.tokens = tokens  # False for a command running: no tokens to count
 
     def update(self, phase: str, text: str) -> None:
         self.phase, self.chars, self.last_chunk = phase, self.chars + len(text), time.time()
@@ -239,9 +243,11 @@ class Progress:
         now = time.time()
         streaming = self.phase in ("Thinking", "Writing")  # loading and reading say what they are throughout
         phase = self.phase if now - self.last_chunk < 3 or not streaming else "Working"
-        return Text.from_markup(
-            f"[cyan]{phase}…[/] [dim]({self.chars // 4} tokens, {now - self.started:.0f}s · Ctrl+C to stop)[/]"
-        )
+        tokens = f"{self.chars // 4} tokens, " if self.tokens else ""
+        keys = "Ctrl+C to stop" if self.steering is None else "type a note · Esc pauses · Ctrl+C stops"
+        line = Text.from_markup(f"[cyan]{phase}…[/] [dim]({tokens}{now - self.started:.0f}s · {keys})[/]")
+        below = self.steering.status() if self.steering is not None else None
+        return line if below is None else Text("\n").join([line, below])
 
 
 @dataclass
@@ -276,6 +282,7 @@ class Settings:
     compact_at: int = 0  # tokens: make room at this size even when the window is larger (0: only at 85%)
     repeat_limit: int = 3  # identical calls with identical results before the model is told (lcode.repeats)
     checks: str = "off"  # the project's checks after a change (lcode.checks): auto, off or a command
+    review: str = "off"  # check a change against the request before the answer (lcode.review): auto or off
 
 
 class Agent:
@@ -319,6 +326,9 @@ class Agent:
         self.read_only = False  # only read-only shell commands
         self.no_changes = ""  # set during a review: why nothing may change (read-only tools only)
         self.cancel: threading.Event | None = None  # set from another thread to stop
+        self.steering: Steering | None = None  # notes typed and pauses asked for during a request (lcode.repl)
+        self.turn_requests: list[str] = []  # the request, then the notes added to it while it ran
+        self.unsent = ""  # typed during the last request but never sent to the model: back in the prompt (lcode.repl)
         self.on_tool = None  # called with (name, arguments) before each tool runs
         self.jobs = Jobs()  # background commands (shared with subagents)
         self.turn_started = 0.0  # when the running request started (time.monotonic)
@@ -334,6 +344,7 @@ class Agent:
         self.autosave = False  # save the session after every step (sessions people resume; not the bench's)
         self._check: tuple[Path, checks.Check | None] | None = None
         self.check_results: list[dict] = []  # the checks of the last request: command, exit code, who ran them
+        self.review_results: list[str] | None = None  # what the last request's review found (None: no review)
         self.sent_chars = 0  # characters of the conversation the model had already read
         self.counted_chars: int | None = None  # characters that ctx_used covers (None: all of them)
         self.turn_status = ""  # how the last request ended: success, max_steps, loop
@@ -746,7 +757,7 @@ class Agent:
         """Stream one model response, rendering thinking/content live. Returns the assistant message."""
         content, thinking, tool_calls, final = "", "", [], {}
         md = MarkdownStreamer(self.console)
-        progress = Progress()
+        progress = Progress(steering=self.steering)
         watch = self.before_request(progress)
         status = None
         printed_thinking = False
@@ -831,6 +842,43 @@ class Agent:
             self.last_speed = final.get("eval_count", 0) / seconds if seconds else 0.0
         return message
 
+    def reviewing(self) -> bool:
+        return (
+            self.settings.review != "off" and self.allowed_tools is None and not self.planning() and not self.no_changes
+        )
+
+    def self_review(self, answer: str) -> list[str]:
+        """Check the request's change against the request before the answer counts; the problems found."""
+        budget = int(self.settings.context * 3 * 0.25)
+        diff, changed = review.diff_of(self.tools.before, self.current_text, budget)
+        if changed < review.MIN_CHANGED_LINES:
+            return []
+        request = self.turn_requests[0] if self.turn_requests else ""
+        if len(self.turn_requests) > 1:
+            added = "\n".join(f"- {note}" for note in self.turn_requests[1:])
+            request += f"\n\nWhat the user added while you worked:\n{added}"
+        try:
+            with self.console.status("Reviewing the change against your request…", spinner="dots"):
+                problems = review.run(self, request, answer, diff)
+        except OllamaError as e:
+            self.say(f"The review didn't run: {e}", warning=True)
+            return []
+        self.review_results = problems
+        if problems:
+            self.say(
+                f"Review: {len(problems)} point(s) sent back to the model. First: {problems[0][:160]}", warning=True
+            )
+        else:
+            self.say("Review: the change does what was asked.")
+        return problems
+
+    def current_text(self, path: str) -> str | None:
+        p = self.tools.resolve(path)
+        try:
+            return self.tools.read_text(p) if p.is_file() else None
+        except OSError:
+            return None
+
     def checks_prompt(self) -> str:
         check = self.project_check()
         if check is None:
@@ -1024,8 +1072,12 @@ 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.turn_requests = [user_text.strip()]
         self.repeats.reset()
         self.check_results = []
+        self.review_results = None
+        self.tools.before = {}
+        reviewed = False
         changed = verified = False  # files changed in this request; the checks passed since
         check_rounds = 0
         malformed = 0
@@ -1033,6 +1085,8 @@ class Agent:
         for step in range(self.max_steps):
             if self.cancel is not None and self.cancel.is_set():
                 raise KeyboardInterrupt
+            if step and self.steering is not None:
+                self.steer()
             if step and self.autosave:
                 self.save()  # a crash or a closed terminal loses at most this step
             self.maybe_compact()
@@ -1078,6 +1132,8 @@ class Agent:
                 )
                 continue
             if not calls:
+                if self.steering is not None and self.steering.waiting():
+                    continue  # the user added a note while the model wrote its answer: it reads the note first
                 check = self.project_check() if changed and not verified else None
                 if check is not None and check_rounds < checks.MAX_ROUNDS:
                     check_rounds += 1
@@ -1087,6 +1143,12 @@ class Agent:
                         changed = False  # run them again only if the model changes something more
                         continue
                     verified = True
+                if not reviewed and self.tools.before and self.reviewing():
+                    reviewed = True
+                    problems = self.self_review(reply.get("content") or "")
+                    if problems:
+                        self.messages.append({"role": "user", "content": review.feedback(problems)})
+                        continue
                 break
             done: dict[int, str] = {}  # results of subagents that ran together
             together = [
@@ -1187,6 +1249,34 @@ class Agent:
         self.turn_status = "success"
         self.print_stats()
 
+    def steer(self) -> None:
+        """Between two steps: pause if the user pressed Esc, then hand the model the notes typed meanwhile."""
+        steering = self.steering
+        if steering is None:
+            return
+        if steering.take_pause():
+            self.console.print(
+                Text(
+                    "⏸ Paused. Press Enter to go on, type a note to go on with it, or press Ctrl+C to stop the request.",
+                    style="yellow",
+                )
+            )
+            note = steering.ask("  ⏸ ").strip()
+            if note:
+                steering.add(note)
+        notes = steering.take()
+        if not notes:
+            return
+        self.turn_requests += notes
+        self.messages.append({"role": "user", "content": "\n\n".join(notes) + "\n\n" + NOTE_INTRO})
+        for note in notes:
+            shown = note if len(note) <= 200 else note[:200] + "…"
+            self.console.print(Text(f"✎ Note for the model: {shown}", style="cyan"))
+
+    def activity(self, phase: str):
+        """A spinner with the elapsed time while something runs (a command), with the note being typed under it."""
+        return self.console.status(Progress(phase, self.steering, tokens=False), spinner="dots")
+
     def print_stats(self) -> None:
         pct = 100 * self.ctx_used / self.settings.context
         self.console.print(

lcode/api.py

@@ -77,6 +77,7 @@ class Result:
     files_changed: list[dict] = field(default_factory=list)  # {"status": "A" | "M" | "D", "path"}
     usage: dict = field(default_factory=dict)  # requests, prompt_tokens, output_tokens
     checks: list[dict] = field(default_factory=list)  # {"command", "exit_code", "by": "lcode" | "model"}
+    review: list[str] | None = None  # problems the review sent back ([] when it found none; None: no review)
     seconds: float = 0.0
     error: str = ""
 
@@ -198,6 +199,7 @@ def open_agent(cwd: Path, options: Options, console: Console, hw: Hardware | Non
         secret_check=cfg["secret_check"],
         repeat_limit=cfg["repeat_limit"],
         checks=cfg["checks"],
+        review=cfg["review"],
         compact_at=cfg["compact_at"],
     )
     agent = Agent(ollama, settings, cwd, console=console)
@@ -306,6 +308,7 @@ def run_request(agent: Agent, prompt: str) -> Result:
         files_changed=files,
         usage=usage,
         checks=list(agent.check_results),
+        review=agent.review_results,
         seconds=round(time.monotonic() - started, 2),
         error=error,
     )

lcode/cli.py

@@ -581,6 +581,7 @@ def cmd_bench(args) -> None:
             prune=not args.no_prune,
             compact_at=cfg["compact_at"] if args.compact_at is None else args.compact_at,
             checks=cfg["checks"] if args.checks is None else args.checks,
+            review=cfg["review"] if args.review is None else args.review,
             repo_map=args.repo_map,
             embed_model=cfg["embed_model"] if args.code_search else "off",
         )
@@ -775,6 +776,9 @@ def build_subparsers() -> dict[str, argparse.ArgumentParser]:
     p.add_argument("--repo-map", action="store_true", help="give the model the repository map (off by default)")
     p.add_argument("--code-search", action="store_true", help="index each task's folder and offer semantic code search")
     p.add_argument("--no-prune", action="store_true", help="don't remove old tool output (to compare, with --session)")
+    p.add_argument(
+        "--review", choices=["auto", "off"], help="review each change before it counts (default: the setting)"
+    )
     p.add_argument(
         "--checks",
         metavar="auto|off|COMMAND",

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)"),
+    "review": ("off", str, "before the answer, check a change against the request and send problems back: auto | off"),
     "checks": ("auto", str, "run the project's checks before calling work done: auto | off | a command"),
     "repeat_limit": (3, int, "identical tool calls with identical results before lcode steps in (0: never)"),
     "secret_check": (True, bool, "before git commit and git push, look for passwords, keys and tokens they'd add"),

lcode/permissions.py

@@ -198,6 +198,7 @@ class Permissions:
         self.always: set[str] = set()
         self.rules = Rules()  # allow and deny lists from the settings (lcode.hooks)
         self.on_prompt = None  # called with the title before lcode asks the user (notification hooks)
+        self.read_line: Callable[[str], str] | None = None  # asks instead of input() (lcode.steer, during a request)
         # Decides instead of asking (lcode.api, lcode acp): True, False, or a message saying why not.
         self.approve: Callable[[dict], bool | str] | None = None
 
@@ -243,7 +244,8 @@ class Permissions:
         if kind == "mcp":
             scope = scope.replace(":", " › ", 1)
         try:
-            answer = input(f"  Allow? [y]es / [a]lways for '{scope}' this session / [n]o (+ optional reason): ")
+            question = f"  Allow? [y]es / [a]lways for '{scope}' this session / [n]o (+ optional reason): "
+            answer = (self.read_line or input)(question)
         except EOFError:
             return False, "The user denied this action (no input available)."
         answer = answer.strip()

lcode/repl.py

@@ -36,6 +36,7 @@ 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
+from lcode.steer import KeyReader, Steering
 from lcode.tools import IGNORE_DIRS
 
 COMMANDS = {
@@ -874,6 +875,7 @@ def git_command(agent: Agent, cmd: str, arg: str) -> None:
 
 def run_safely(agent: Agent, text: str) -> None:
     started = time.monotonic()
+    reader = start_steering(agent) if agent.interactive else None
     try:
         agent.run_turn(text)
     except KeyboardInterrupt:
@@ -881,10 +883,33 @@ def run_safely(agent: Agent, text: str) -> None:
     except OllamaError as e:
         agent.console.print(f"[red]{e}[/]")
     finally:
+        if reader is not None:
+            stop_steering(agent, reader)
         agent.save()
         agent.finished(text, time.monotonic() - started)
 
 
+def start_steering(agent: Agent) -> KeyReader | None:
+    """Read the keyboard while the request runs: a typed line becomes a note for the model, Esc pauses."""
+    steering = Steering()
+    reader = KeyReader(steering)
+    if not reader.start():
+        return None  # not a terminal lcode can read keys from (or Windows): the request runs as before
+    agent.steering = steering
+    agent.perms.read_line = steering.ask  # questions take the keyboard back meanwhile
+    return reader
+
+
+def stop_steering(agent: Agent, reader: KeyReader) -> None:
+    reader.stop()
+    agent.steering = None
+    agent.perms.read_line = None
+    unsent = reader.steering.leftover()
+    if unsent:
+        agent.unsent = unsent
+        agent.console.print(Text("✎ What you typed didn't reach the model; it's in the prompt below.", style="cyan"))
+
+
 def session_start(agent: Agent) -> None:
     """session_start hooks: their output is shown, and with feedback = true also given to the model."""
     for outcome in agent.hooks.run("session_start", {"cwd": str(agent.cwd), "session": agent.session_id}, agent.cwd):
@@ -1115,13 +1140,13 @@ def resume_session(agent: Agent, info: sessions.SessionInfo) -> None:
 
 def print_recap(agent: Agent) -> None:
     """Show the last request and the start of the last answer, so it's clear where things left off."""
-    last_user = next((m for m in reversed(agent.messages) if m.get("role") == "user"), None)
+    requests = context_tools.user_requests(agent.messages)  # the user's own words, not lcode's notes to the model
     last_answer = next(
         (m for m in reversed(agent.messages) if m.get("role") == "assistant" and m.get("content", "").strip()), None
     )
-    if not last_user:
+    if not requests:
         return
-    lines = [f"[bold]You:[/] {escape(sessions.title_from([last_user]))}"]
+    lines = [f"[bold]You:[/] {escape(sessions.title_from([{'role': 'user', 'content': requests[-1]}]))}"]
     if last_answer:
         answer = " ".join(last_answer["content"].split())
         answer = answer if len(answer) <= 300 else answer[:299].rstrip() + "…"
@@ -1153,7 +1178,8 @@ def repl(agent: Agent, prompt: str | None, hardware: Hardware, cont: bool = Fals
     while True:
         try:
             agent.console.print()
-            line = session.prompt(HTML("<ansicyan><b>❯ </b></ansicyan>")).strip()
+            unsent, agent.unsent = agent.unsent, ""
+            line = session.prompt(HTML("<ansicyan><b>❯ </b></ansicyan>"), default=unsent).strip()
         except KeyboardInterrupt:
             continue
         except EOFError:

lcode/review.py

@@ -0,0 +1,103 @@
+"""A second look at a change before the answer goes to the user.
+
+Models claim more than they did: "users can now shrink the window" without having checked, half of a
+two-part request done, a debug print left behind. So when a request changed files, lcode asks the model to
+step back and check its change against the request (what was asked, what the diff shows, what the answer
+claims) before the answer counts. Real problems go back to the model once; the user sees a line about it.
+
+The review is asked on top of the conversation, not in a fresh one: the model server keeps the processed
+conversation cached, and a separate review prompt would push it out, so the next step would have to read the
+whole conversation again, tens of seconds on a small GPU. The question tells the model to judge only from the
+request and the diff.
+"""
+
+from __future__ import annotations
+
+import difflib
+from typing import TYPE_CHECKING
+
+from lcode.gitflow import parse_json
+
+if TYPE_CHECKING:
+    from lcode.agent import Agent
+
+MIN_CHANGED_LINES = 1  # even one line: a one-line bug fix is where a wrong fix hides
+MAX_PROBLEMS = 5
+SCHEMA = {
+    "type": "object",
+    "properties": {"problems": {"type": "array", "items": {"type": "string"}}},
+    "required": ["problems"],
+}
+PROMPT = """[lcode] Before your answer goes to the user, review your change as a strict reviewer would: judge it only by what the user asked and what the diff shows, not by what you meant to do.
+
+The user's request:
+<request>
+{request}
+</request>
+
+Your answer to them:
+<answer>
+{answer}
+</answer>
+
+{checks}The change (unified diff of the files changed in this request):
+<diff>
+{diff}
+</diff>
+
+Find real problems only, each one you can point to in the request or the diff:
+1. Something the user asked for that the change doesn't do, or only partly does.
+2. A claim in your answer that the diff doesn't support, or something called tested or working that nothing shows was run.
+3. A mistake in the diff: a bug, a broken edge case the request mentions, leftover debugging (prints, commented-out code), an unfinished TODO.
+No style preferences, no suggestions beyond the request. Answer in JSON: {{"problems": ["…"]}}, with an empty list when the change does what was asked."""
+
+FEEDBACK = """[lcode] A review of your change against the user's request found:
+{problems}
+
+Fix what's real; if a point is wrong, say why in your answer. Then finish."""
+
+
+def diff_of(before: dict[str, str | None], read, budget: int) -> tuple[str, int]:
+    """The unified diff of the files changed in the request, and how many lines it changes."""
+    parts, changed = [], 0
+    for path, old in before.items():
+        new = read(path)
+        if new is None or new == old:
+            continue
+        lines = list(
+            difflib.unified_diff((old or "").splitlines(True), new.splitlines(True), f"a/{path}", f"b/{path}", n=2)
+        )
+        changed += sum(1 for line in lines if line[:1] in "+-" and not line.startswith(("+++", "---")))
+        parts.append("".join(lines))
+    text = "".join(parts)
+    if len(text) > budget:
+        text = text[:budget] + f"\n[… the rest of the diff ({len(text) - budget} characters) is cut]"
+    return text, changed
+
+
+def run(agent: Agent, request: str, answer: str, diff: str) -> list[str]:
+    """Ask for the review; the problems it found (empty when none, or when the answer can't be read)."""
+    checks = ""
+    if agent.check_results:
+        last = agent.check_results[-1]
+        code = last.get("exit_code")
+        state = "passed" if code == 0 else "didn't run" if code is None else f"failed (exit code {code})"
+        checks = f"The project's checks (`{last.get('command')}`) {state} after the change.\n\n"
+    prompt = PROMPT.format(request=request[:4000], answer=answer[:3000] or "(none)", checks=checks, diff=diff)
+    payload = {
+        "model": agent.settings.model,
+        "messages": [*agent.messages, {"role": "user", "content": prompt}],
+        "tools": agent.tool_schemas(),  # as in the session, so the cached conversation is reused
+        "think": agent.settings.think,  # without reasoning it missed every gap it caught with it, and wasn't faster
+        "format": SCHEMA,
+        "keep_alive": agent.settings.keep_alive,
+        "options": agent.options(),
+    }
+    reply = agent.ollama.chat(payload)
+    data = parse_json((reply.get("message") or {}).get("content") or "")
+    problems = data.get("problems") if isinstance(data.get("problems"), list) else []
+    return [str(p).strip()[:500] for p in problems if str(p).strip()][:MAX_PROBLEMS]
+
+
+def feedback(problems: list[str]) -> str:
+    return FEEDBACK.format(problems="\n".join(f"- {p}" for p in problems))

lcode/sessions.py

@@ -45,7 +45,9 @@ def title_from(messages: list[dict]) -> str:
         if content.startswith(SUMMARY_PREFIX):
             compacted = True
             continue
-        text = re.split(r"\n\n<(?:file|directory) path=", content, maxsplit=1)[0]
+        if content.startswith("[lcode]"):
+            continue  # lcode's own message to the model (a failed check, a review), not the user's words
+        text = re.split(r"\n\n(?:<(?:file|directory|image) path=|\[lcode[:\]] )", content, maxsplit=1)[0]
         text = " ".join(text.split())
         if text:
             return text if len(text) <= TITLE_LENGTH else text[: TITLE_LENGTH - 1].rstrip() + "…"

lcode/steer.py

@@ -0,0 +1,287 @@
+"""Steer a request while it runs: type a note for the model, or press Esc to pause after the step.
+
+With a local model a request can take minutes. Ctrl+C throws away the step in progress; a note doesn't
+interrupt anything: a line typed while lcode works is kept and handed to the model before its next step, and the
+spinner line shows what's being typed and what's waiting. Esc asks lcode to stop after the current step, so you
+can look at what it did and then go on, with or without a note.
+
+`Steering` holds the state and turns keystrokes into notes; it knows nothing about terminals, so it's easy to
+test. `KeyReader` reads the keys from the terminal in the background, without echoing them (that would garble
+the output), and hands the keyboard back whenever lcode asks a question (`Steering.ask`).
+"""
+
+from __future__ import annotations
+
+import codecs
+import contextlib
+import os
+import select
+import sys
+import threading
+import time
+from collections.abc import Callable, Iterator
+
+from rich.text import Text
+
+try:
+    import termios
+except ImportError:  # Windows: no steering, everything else works
+    termios = None  # type: ignore[assignment]
+
+MAX_NOTE = 4000  # characters in one note
+SHOWN = 45  # characters of the line being typed shown under the spinner (the line fits 80 columns)
+ESC_WAIT = 0.03  # an Esc followed by more bytes this soon is an arrow or function key, not the Esc key
+TOO_QUICK = 0.4  # an Enter this soon after a question appears was meant for the note being typed
+NOTE_INTRO = (
+    "[lcode] The user wrote this while you were working. Take it into account from here on; it doesn't mean "
+    "starting over unless it says so."
+)
+
+
+class Steering:
+    """Notes typed during a request, the line being typed, and whether to pause after the step."""
+
+    def __init__(self) -> None:
+        self.lock = threading.Lock()
+        self.typed = ""  # the line being typed
+        self.notes: list[str] = []  # finished lines, waiting for the model's next step
+        self.pause = False  # stop after the current step
+        self.reader: KeyReader | None = None
+        self.read_line: Callable[[str], str] | None = None  # input() when None (looked up when asking)
+
+    # Input ------------------------------------------------------------------------------------------------
+
+    def feed(self, keys: str) -> None:
+        """Keystrokes as text: printable characters, Enter, Backspace, Ctrl+U/Ctrl+W, Esc and escape sequences.
+
+        A lone "\\x1b" is the Esc key (KeyReader waits a moment for the rest of a sequence before it hands one
+        over). Everything else that starts with it is skipped: the sequences arrow and function keys send,
+        Alt+key, and a terminal's answers to queries (cursor position, colours).
+        """
+        with self.lock:
+            i = 0
+            while i < len(keys):
+                ch = keys[i]
+                i += 1
+                if ch == "\x1b":
+                    after = keys[i] if i < len(keys) else ""
+                    if after == "[":  # CSI: parameters, then a final byte in @..~
+                        i += 1
+                        while i < len(keys) and not ("@" <= keys[i] <= "~"):
+                            i += 1
+                        i += 1
+                    elif after == "O":  # SS3: one more character (F1-F4, keypad)
+                        i += 2
+                    elif after in ("]", "P", "_", "^"):  # a string (OSC, DCS…), ended by BEL or ESC \
+                        end = min(
+                            (j for j in (keys.find("\x07", i), keys.find("\x1b\\", i)) if j >= 0), default=len(keys)
+                        )
+                        i = end + (2 if keys.startswith("\x1b\\", end) else 1)
+                    elif after in ("", "\x1b"):  # the Esc key (twice in a row: two presses)
+                        self.pause = not self.pause
+                    else:
+                        i += 1  # Alt+key
+                elif ch in "\r\n":
+                    note = self.typed.strip()
+                    self.typed = ""
+                    if note:
+                        self.notes.append(note[:MAX_NOTE])
+                elif ch in "\x7f\x08":
+                    self.typed = self.typed[:-1]
+                elif ch == "\x15":  # Ctrl+U: clear the line
+                    self.typed = ""
+                elif ch == "\x17":  # Ctrl+W: delete the last word
+                    self.typed = self.typed.rstrip()
+                    self.typed = self.typed[: self.typed.rfind(" ") + 1] if " " in self.typed else ""
+                elif ch == "\t":
+                    self.typed += " "
+                elif ch >= " " and len(self.typed) < MAX_NOTE:
+                    self.typed += ch
+
+    # For the agent ----------------------------------------------------------------------------------------
+
+    def add(self, note: str) -> None:
+        with self.lock:
+            self.notes.append(note[:MAX_NOTE])
+
+    def waiting(self) -> bool:
+        with self.lock:
+            return bool(self.notes)
+
+    def take(self) -> list[str]:
+        """The notes waiting for the model (and forget them)."""
+        with self.lock:
+            notes, self.notes = self.notes, []
+            return notes
+
+    def take_pause(self) -> bool:
+        """Whether a pause was asked for (and clear the request)."""
+        with self.lock:
+            asked, self.pause = self.pause, False
+            return asked
+
+    def leftover(self) -> str:
+        """What never reached the model: notes still waiting and the unfinished line, for the next prompt."""
+        with self.lock:
+            text = "\n".join([*self.notes, self.typed.strip()]).strip()
+            self.notes, self.typed = [], ""
+            return text
+
+    def ask(self, question: str) -> str:
+        """Ask the user a question while the keyboard is being read for notes (permission prompts, the pause).
+
+        Keys typed before the question appeared are dropped, and an Enter pressed right as it appeared asks
+        once more: it was meant to finish a note, not to answer (an empty answer often means yes).
+        """
+        hold = self.reader.suspended() if self.reader is not None else contextlib.nullcontext()
+        with hold:
+            asked = time.monotonic()
+            answer = (self.read_line or input)(question)
+            if not answer.strip() and time.monotonic() - asked < TOO_QUICK:
+                answer = (self.read_line or input)(question)
+            return answer
+
+    def status(self) -> Text | None:
+        """The line under the spinner: what's being typed, notes waiting, a pause coming."""
+        with self.lock:
+            typed, waiting, pause = self.typed, len(self.notes), self.pause
+        parts: list[Text] = []
+        if typed:
+            shown = typed if len(typed) <= SHOWN else "…" + typed[-SHOWN:]
+            parts.append(Text.assemble(("✎ ", "cyan"), shown, ("▏", "cyan"), ("  Enter adds it as a note", "dim")))
+        if waiting:
+            what = "a note" if waiting == 1 else f"{waiting} notes"
+            parts.append(Text(f"✎ {what} waiting for the model's next step", style="cyan"))
+        if pause:
+            parts.append(Text("⏸ Pausing after this step (Esc again to go on without pausing)", style="yellow"))
+        if not parts:
+            return None
+        return Text("\n").join(parts)
+
+
+class KeyReader:
+    """Reads the keyboard in the background while a request runs, and gives the keys to a Steering.
+
+    The terminal stays in "cbreak" mode meanwhile: keys arrive one by one and aren't echoed, while Ctrl+C still
+    interrupts. `suspended()` hands the keyboard back, in its usual mode, for a question.
+    """
+
+    def __init__(self, steering: Steering, fd: int | None = None) -> None:
+        self.steering = steering
+        self.fd = fd  # stdin when None
+        self.saved: list | None = None
+        self.thread: threading.Thread | None = None
+        self.stopping = threading.Event()
+        self.hold = threading.Event()  # asked to stop reading for a while
+        self.held = threading.Event()  # ...and the thread has stopped
+        self.resume = threading.Event()
+        self.decoder = codecs.getincrementaldecoder("utf-8")(errors="replace")
+
+    def start(self) -> bool:
+        """Start reading; False when this isn't a terminal lcode can read keys from."""
+        if termios is None:
+            return False
+        try:
+            if self.fd is None:
+                self.fd = sys.stdin.fileno()
+            if not os.isatty(self.fd):
+                return False
+        except (OSError, ValueError):  # no real stdin (tests, some IDE consoles)
+            return False
+        try:
+            self.saved = termios.tcgetattr(self.fd)
+            self._cbreak()
+        except termios.error:
+            self.saved = None
+            return False
+        self.steering.reader = self
+        self.thread = threading.Thread(target=self._run, name="lcode-keys", daemon=True)
+        self.thread.start()
+        return True
+
+    def stop(self) -> None:
+        self.stopping.set()
+        self.resume.set()
+        if self.thread is not None:
+            self.thread.join(timeout=1)
+        self._restore()
+        self.steering.reader = None
+
+    def __enter__(self) -> KeyReader:
+        self.start()
+        return self
+
+    def __exit__(self, *exc) -> None:
+        self.stop()
+
+    @contextlib.contextmanager
+    def suspended(self) -> Iterator[None]:
+        """The keyboard back in its usual mode (echo, line editing) for a question, with typed-ahead keys dropped."""
+        if self.thread is None or not self.thread.is_alive():
+            yield
+            return
+        self.resume.clear()
+        self.hold.set()
+        self.held.wait(timeout=1)
+        self._restore()
+        with contextlib.suppress(termios.error):
+            termios.tcflush(self.fd, termios.TCIFLUSH)
+        try:
+            yield
+        finally:
+            with contextlib.suppress(termios.error):
+                self._cbreak()
+            self.hold.clear()
+            self.held.clear()
+            self.resume.set()
+
+    def _cbreak(self) -> None:
+        mode = termios.tcgetattr(self.fd)
+        mode[3] &= ~(termios.ECHO | termios.ICANON)  # lflags; ISIG stays, so Ctrl+C still interrupts
+        mode[6][termios.VMIN] = 1
+        mode[6][termios.VTIME] = 0
+        termios.tcsetattr(self.fd, termios.TCSANOW, mode)
+
+    def _restore(self) -> None:
+        if self.saved is not None:
+            with contextlib.suppress(termios.error):
+                termios.tcsetattr(self.fd, termios.TCSANOW, self.saved)
+
+    def _run(self) -> None:
+        while not self.stopping.is_set():
+            if self.hold.is_set():
+                self.held.set()
+                self.resume.wait()
+                continue
+            try:
+                ready, _, _ = select.select([self.fd], [], [], 0.1)
+                if not ready or self.hold.is_set():
+                    continue
+                data = os.read(self.fd, 1024)
+                if not data:
+                    return  # the terminal is gone
+                while incomplete_escape(data):
+                    more, _, _ = select.select([self.fd], [], [], ESC_WAIT)  # the rest of an escape sequence?
+                    if not more:
+                        break  # a lone "\x1b" is then the Esc key
+                    data += os.read(self.fd, 1024)
+            except (OSError, ValueError):
+                return
+            self.steering.feed(self.decoder.decode(data))
+
+
+def incomplete_escape(data: bytes) -> bool:
+    """Whether the bytes end in the middle of an escape sequence (or with a "\\x1b" that may start one)."""
+    start = data.rfind(b"\x1b")
+    if start < 0:
+        return False
+    tail = data[start:]
+    if tail == b"\x1b":
+        return True
+    if tail.startswith(b"\x1b["):
+        return not any(0x40 <= b <= 0x7E for b in tail[2:])
+    if tail.startswith(b"\x1bO"):
+        return len(tail) < 3
+    if tail[1:2] in (b"]", b"P", b"_", b"^"):
+        return b"\x07" not in tail  # (one ended by ESC \ has its last ESC there: complete)
+    return False

lcode/tools.py

@@ -448,6 +448,7 @@ class Toolbox:
         self.formats: dict[str, TextFormat] = {}  # encoding and line endings of the files read
         self.notes: list[str] = []  # the model's notes on the task (todo_write): decisions, findings, questions
         self.changed: dict[str, None] = {}  # files lcode wrote in this session, in order
+        self.before: dict[str, str | None] = {}  # files changed in this request: their text before (None: new)
         self.todos: list[dict] = []
         # An editor's buffers (lcode acp): read unsaved changes and write through the editor.
         self.reader: Callable[[Path], str | None] | None = None
@@ -870,6 +871,8 @@ class Toolbox:
         p.parent.mkdir(parents=True, exist_ok=True)
         fmt = self.formats.get(str(p)) or (decode(p.read_bytes())[1] if p.exists() else TextFormat())
         data = encode(content, fmt)  # before anything is written: it may not be possible
+        if self.rel(p) not in self.before:
+            self.before[self.rel(p)] = decode(p.read_bytes())[0] if p.exists() else None
         if self.writer is not None:
             self.writer(p, content)  # the editor updates its buffer (and the file)
         if not p.exists() or p.read_bytes() != data:
@@ -1118,6 +1121,8 @@ class Toolbox:
         deadline = time.time() + int(timeout or 180)
         finished = 0.0  # when the command itself ended (its marker arrived)
         held_open = False  # something it started still holds the output open
+        spinner = self.agent.activity("Running the command")  # the elapsed time, and a note being typed
+        spinner.start()
         try:
             while True:
                 if self.agent.cancel is not None and self.agent.cancel.is_set():
@@ -1151,6 +1156,8 @@ class Toolbox:
             reading.clear()
             stop()
             raise
+        finally:
+            spinner.stop()
         reading.clear()
         code = proc.wait()
         if held_open and sandbox and token:

{lcode_cli-0.31.0.dist-info → lcode_cli-0.33.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: lcode-cli
-Version: 0.31.0
+Version: 0.33.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.31.0.dist-info → lcode_cli-0.33.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-lcode/__init__.py,sha256=gXBLoiYa3VhO8oR-eyFbfplfXuE6GNMT6g92TwUc_2g,473
+lcode/__init__.py,sha256=cScEtA6ZlYacKlh7dY1BybTR-WQqVhO0LRooeZQ6OB8,473
 lcode/__main__.py,sha256=s5N5pryX2FAu93GGZ3FxUrIXHWGzxz66lKUoaV_h8Ws,35
 lcode/acp.py,sha256=d97VV3sbqXdWKhPQQNbYRaDTm8WrUk0mGbDLiOyX7jE,29058
 lcode/action.py,sha256=wuT5F9EJCdEligPeytzmEi8FpahWBhXer528tpuTj_k,16711
-lcode/agent.py,sha256=OkGViWlZd8g-MFZpaCnbRIpmrFXnKajbIeEMKV1e7-o,70275
-lcode/api.py,sha256=PhG8PZReM7DXSxG6wf7mEjAKx_TAsgj3xHApacrXGCM,15684
+lcode/agent.py,sha256=fs40oIivqNV6R_Y2Yp8jHbQUywK55czn3wRHrdViyQ0,75086
+lcode/api.py,sha256=YTfXVMSYSp1EC3tNI_fW-JcNBgrdFTN7V57HNIzB7Kc,15861
 lcode/backends.py,sha256=dtJHrC6ys73bRDg64z0tQz1PavmeAkiODZu1fOO9ExQ,20635
 lcode/bench.py,sha256=KDgPnkceZOS3gDDEl5j6-k8Ser2es4-IuV_S8p_46Zo,41517
 lcode/bench_backend.py,sha256=X2fo-zRX92Xp3KMxSsFlWioc2vRupBTtowj5kLME8mw,14287
@@ -11,10 +11,10 @@ lcode/bench_runtime.py,sha256=EjzNgIvUkdbT8cbSy1TpmlyeIk6e-ipjlDFpM7Dnqx0,6835
 lcode/catalog.py,sha256=pZ1azX9OH2r4JE2c6E5OfwywpgS39-W2oXzoCHJhmtM,4141
 lcode/checkpoints.py,sha256=eqPtmPe44-aweWqc2H21ROogwzIt3NpvcUobsaCHoGY,18354
 lcode/checks.py,sha256=FOD8DOxPWXY1RMtrL9ONJsOxsV10BLgzPvzIJMK5NrU,6582
-lcode/cli.py,sha256=svnW6pfLtqiMXbA3wMlYESKGgGe6Xb9wlWkqg6Cz0O0,41081
+lcode/cli.py,sha256=pB8gnPuVkqanm9amuLKWanH3_0onpn8oS8botxl-DSw,41292
 lcode/clipboard.py,sha256=nTSdJyCXPdtjH947RjvB3QvRqnL5HZsS9KB8EkC42cc,5138
 lcode/codesearch.py,sha256=Io8leN1nb_Y-Dvlm9xaGtwUWYXX-ooswuznJV6dGU1s,10766
-lcode/config.py,sha256=KSjSBvxA9nmd4h4QYk3xp8BQ7C04pjTULsSn0jcQwBc,11301
+lcode/config.py,sha256=CujFZiUPsbZERjPw2j_uTBnZqUfCgYz1hvcvQSSMCu0,11421
 lcode/context.py,sha256=0YYLrC7gI164HqDjW_jrgHSnfrAilrRUoTLhvw54VI8,19082
 lcode/extensions.py,sha256=W0HFDl0BvROzr7i_qtabHdIbacBgP5o5qIJLzoM2oNE,16806
 lcode/frontmatter.py,sha256=Bx0n4vLPhp7ZCWx-g7xqzqNy5VoKBxyeeikh5UFB_gA,2441
@@ -29,18 +29,20 @@ lcode/memory.py,sha256=WZEHTp-lVxAwS-yyLQR2xB3TMZ9sejmX2Ivg7T-tl3w,21949
 lcode/models.toml,sha256=lt2G64zzo_Ryxv2ISRSNZoVD_JqCqYqsM01n8WoXGs8,4098
 lcode/notify.py,sha256=uieDeXe7XwuVHjOk4tqVyZEW_85XWkoWQmFOWEf77oc,1538
 lcode/ollama.py,sha256=u5tnvL28cfaFS4GhmiEsHhTQe6w3Ng_Tej05UUzLQTQ,7715
-lcode/permissions.py,sha256=3OPVVth6uTE5kcAWMZ8X_vUnFRbf6STEHAJimZX0Yu4,12118
+lcode/permissions.py,sha256=q7CjDsc_Xrblw7t3_BbxA5LUjxFSswGs1RiJmtMi0po,12288
 lcode/planning.py,sha256=Q2upaoZPnXDMQT2F-ETxX1lk_wDntTzhSKNVYIQSoQA,6540
 lcode/render.py,sha256=gMvf4W3qkLUJ4Vot3az_hP_zRDAItJC9pP-68dHFkfA,1375
 lcode/repeats.py,sha256=-vcbj363nFcIyso7yFJgsbHz9C6VOu2EOg3Svs4eFyE,4091
-lcode/repl.py,sha256=0f3nojURlQE8Pm_JkXvh9y7nEg1CHG3xanZIs0osPxw,52107
+lcode/repl.py,sha256=_krcqKqHKsGUKo4JfQS9KQNBxA47qE1k__TAkDTusRc,53242
 lcode/repomap.py,sha256=1GRJgEUjBl9XHSXsF7tSGXBCEgsY-3CzwMohaTudZ_M,13969
 lcode/residency.py,sha256=bDB2J0SZULDOz6wYuMCnkjacYk7pWi5f75iY83ycAXQ,6912
+lcode/review.py,sha256=0QBIS-R1B2b3zqx5TcC1qZptpKBbrDhYvMKSNCaDAUo,4686
 lcode/sandbox.py,sha256=u_pkrVRXhCGhh-wFDPwuZ3jGG7UeXxXRAeBNsm37ZvE,8608
 lcode/secretscan.py,sha256=6Euvfk2gCtK7lZbuQD84zgWuSECi6OnSw8V5rFu1tfU,13575
-lcode/sessions.py,sha256=wOR-J0EHgJxLSPboKPHnvBcp5VTUYTj3tZWgpsa6-K4,4013
+lcode/sessions.py,sha256=ojkpP453JyIll8_iFeJgW4BG4Zz2FKMRsLiij6spiTo,4185
+lcode/steer.py,sha256=0vaqLxgRKgC0yGp8xoQfV1f9VEOzH3U4rCIb74eFnZ8,12127
 lcode/subagents.py,sha256=GGn2E7QUwEsShJEHXaMhG53leyGFUZwJku_n33gJguU,29157
-lcode/tools.py,sha256=PofQ77Y7TvsUcFcvrUDP4GirpgkQKhhC_NL_1K_8_Jo,61182
+lcode/tools.py,sha256=Af4CYJUB7hCmsrNWAn5dIfI11YZFBTLclYaoEZ4Tsm4,61599
 lcode/update.py,sha256=i92bnW252VneYh0vD6djxmXsDOa5MXP20bjlLZUue_c,25236
 lcode/vision.py,sha256=w33QPmdGwP33wM4mvmAH4amFDZ1xzeXhEsSLJ-STSHY,4243
 lcode/web.py,sha256=vyxKbSRJTl1Lj3hj7Yd_NwTgbv0Xi6dup2YfUXjqp-Y,14579
@@ -60,8 +62,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.31.0.dist-info/METADATA,sha256=kGzeEZoj0ZAZxYBHC30JRJAKERgqAq4h9XObVzJYPms,12620
-lcode_cli-0.31.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-lcode_cli-0.31.0.dist-info/entry_points.txt,sha256=Hxsn_itbnbgft3U0FwxWdmEt0yoAV2LB-nJDnL9WT20,172
-lcode_cli-0.31.0.dist-info/licenses/LICENSE,sha256=JWjmoL7nNIC1XUa-dZm2hwLUgjUQMFo6k8APb0idNzs,1074
-lcode_cli-0.31.0.dist-info/RECORD,,
+lcode_cli-0.33.0.dist-info/METADATA,sha256=ZaaBzVSgt8pvJJ9rc-6vc2UkbNO4TYAxVCgTfgIcq6Q,12620
+lcode_cli-0.33.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+lcode_cli-0.33.0.dist-info/entry_points.txt,sha256=Hxsn_itbnbgft3U0FwxWdmEt0yoAV2LB-nJDnL9WT20,172
+lcode_cli-0.33.0.dist-info/licenses/LICENSE,sha256=JWjmoL7nNIC1XUa-dZm2hwLUgjUQMFo6k8APb0idNzs,1074
+lcode_cli-0.33.0.dist-info/RECORD,,