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

lcode/__init__.py

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

lcode/agent.py

@@ -11,6 +11,7 @@ import shutil
 import subprocess
 import threading
 import time
+import urllib.parse
 import uuid
 from collections.abc import Callable
 from dataclasses import dataclass
@@ -63,6 +64,15 @@ MAX_MALFORMED_CALL_RETRIES = 2  # Ollama rejects tool calls whose arguments aren
 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
+# @path, @"path with spaces" or @'path'
+MENTION = re.compile(r"""(?<!\S)@(?:"([^"\n]+)"|'([^'\n]+)'|([\w./~\-]+))""")
+# An image path written in a message: in quotes, or without spaces (a space escaped as "\ " is fine), or as a
+# file:// address, the way terminals paste a dragged file.
+IMAGE_PATH = re.compile(
+    r"""(['"])((?:file://)?[^'"\n]+?\.(?:png|jpe?g|webp|gif))\1"""
+    r"""|(?<![^\s(])((?:[^\s\\'"(]|\\ )+?\.(?:png|jpe?g|webp|gif))(?=[\s,;:!?)\]]|\.(?:\s|$)|$)""",
+    re.IGNORECASE,
+)
 PROJECT_FILES = ("AGENTS.md", "LCODE.md", "CLAUDE.md")
 
 SYSTEM_PROMPT = """You are lcode, an autonomous software-engineering agent running in the user's terminal on their own machine, powered by the local model {model}. You help the user understand codebases, answer questions about code, write scripts (Python by default), fix bugs, refactor, and run commands.
@@ -965,30 +975,68 @@ class Agent:
         )
 
     def expand_mentions(self, text: str) -> str:
-        """Inline files referenced as @path in the user's message; @name of an agent asks for that agent."""
-        attached = []
-        for ref in re.findall(r"(?<!\S)@([\w./~\-]+)", text):
+        """Attach what the user's message points to: files and folders written as @path, image paths (with or
+        without @), and @name of an agent asks for that agent. An image path that doesn't exist is reported to
+        the user and the model, so the model doesn't guess what the image shows."""
+        attached: list[str] = []
+        seen: set[Path] = set()
+        question = MENTION.sub("", text)
+
+        def attach_image(p: Path) -> None:
+            try:
+                description = self.look(p, question)
+                who = f' described_by="{self.vision_model()}"'
+            except ToolError as e:
+                description, who = f"(lcode couldn't look at this image: {e})", ""
+                self.console.print(Text(f"  ⎿ {e}", style="yellow"))
+            else:
+                self.console.print(Text(f"  ⎿ looked at {self.tools.rel(p)}", style="dim"))
+            attached.append(f'<image path="{self.tools.rel(p)}"{who}>\n{description}\n</image>')
+
+        def missing_image(shown: str) -> None:
+            self.console.print(
+                Text(f"  ⎿ {shown} doesn't exist, so the model can't see it. Paste images with Ctrl+V.", style="yellow")
+            )
+            attached.append(
+                f"[lcode: the user's message mentions the image {shown}, but there's no such file, so it wasn't "
+                "attached and you can't see it. Don't guess what it shows: ask the user to paste it again (Ctrl+V "
+                "in lcode's prompt) or to describe it.]"
+            )
+
+        for match in MENTION.finditer(text):
+            ref = next(g for g in match.groups() if g)
             p = self.tools.resolve(ref)
+            seen.add(p)
             name = ref.removeprefix("agent-")
             if not p.exists() and self.settings.subagents and name in self.agent_types():
                 attached.append(f'[The user wants the {name} agent for this: call the agent tool with type "{name}".]')
                 continue
             if p.is_file() and vision.is_image(p):
-                try:
-                    description = self.look(p, re.sub(r"(?<!\S)@[\w./~\-]+", "", text))
-                    who = f' described_by="{self.vision_model()}"'
-                except ToolError as e:
-                    description, who = f"(lcode couldn't look at this image: {e})", ""
-                    self.console.print(Text(f"  ⎿ {e}", style="yellow"))
-                else:
-                    self.console.print(Text(f"  ⎿ looked at {self.tools.rel(p)}", style="dim"))
-                attached.append(f'<image path="{self.tools.rel(p)}"{who}>\n{description}\n</image>')
+                attach_image(p)
             elif p.is_file() and not is_binary(p) and p.stat().st_size < 200_000:
                 attached.append(f'<file path="{self.tools.rel(p)}">\n{p.read_text(errors="replace")}\n</file>')
                 self.tools.read_mtimes[str(p)] = p.stat().st_mtime
                 self.console.print(Text(f"  ⎿ attached {self.tools.rel(p)}", style="dim"))
             elif p.is_dir():
                 attached.append(f'<directory path="{self.tools.rel(p)}">\n{tree(p, 2)}\n</directory>')
+            elif not p.exists() and vision.is_image(p):
+                missing_image(ref)
+        for match in IMAGE_PATH.finditer(text):
+            quoted, raw = bool(match.group(2)), match.group(2) or match.group(3)
+            if raw.startswith("@") or "://" in raw.removeprefix("file://"):
+                continue  # attached above, or a web address
+            if raw.startswith("file://"):
+                shown = urllib.parse.unquote(raw.removeprefix("file://"))
+            else:
+                shown = raw.replace("\\ ", " ")
+            p = self.tools.resolve(shown)
+            if p in seen:
+                continue
+            seen.add(p)
+            if p.is_file():
+                attach_image(p)
+            elif quoted or raw.startswith(("/", "~", "./", "../", "file://")):
+                missing_image(shown)  # a name without a folder may be a file to create: no warning
         return text + ("\n\n" + "\n\n".join(attached) if attached else "")
 
     # -- context management

lcode/cli.py

@@ -346,6 +346,10 @@ def cmd_doctor(args) -> None:
             line("Vision", "off; set vision_model to a model the server serves that can see images", None)
         else:
             line("Vision", "off" if cfg["vision_model"] == "off" else vision.INSTALL_HINT, None)
+        if seer:
+            from lcode import clipboard
+
+            line("Clipboard", *clipboard.status())
         if limits.get(model):
             line(
                 "Limit",

lcode/clipboard.py

@@ -0,0 +1,139 @@
+"""Paste from the clipboard with Ctrl+V, images included.
+
+A terminal can only paste text, so a screenshot never reaches lcode that way. On Ctrl+V lcode reads the
+clipboard itself: with wl-paste on Wayland, xclip on X11, and pngpaste or osascript on macOS. An image is
+saved in lcode's state folder and goes into the prompt as `@path`, so it's attached like any other image;
+anything else is pasted as text.
+"""
+
+from __future__ import annotations
+
+import os
+import shutil
+import subprocess
+import sys
+import time
+from dataclasses import dataclass
+from pathlib import Path
+
+from lcode import config
+
+TIMEOUT = 5  # seconds for a clipboard tool
+IMAGE_TYPES = ("image/png", "image/jpeg", "image/webp", "image/gif")
+SUFFIXES = {"image/png": ".png", "image/jpeg": ".jpg", "image/webp": ".webp", "image/gif": ".gif"}
+KEEP = 50  # pasted images kept; older ones are removed
+
+
+@dataclass
+class Paste:
+    image: Path | None = None  # a saved image
+    text: str = ""  # or text
+    problem: str = ""  # why nothing could be pasted
+
+
+def run(argv: list[str]) -> bytes | None:
+    try:
+        done = subprocess.run(argv, capture_output=True, timeout=TIMEOUT, check=False)
+    except (OSError, subprocess.SubprocessError):
+        return None
+    return done.stdout if done.returncode == 0 else None
+
+
+def folder() -> Path:
+    return config.STATE_DIR / "pasted"
+
+
+def save(data: bytes, suffix: str) -> Path:
+    where = folder()
+    where.mkdir(parents=True, exist_ok=True)
+    old = sorted(where.glob("pasted-*"))  # the names sort by time
+    for path in old[: max(0, len(old) - KEEP + 1)]:
+        path.unlink(missing_ok=True)
+    now = time.time_ns()
+    stamp = f"{time.strftime('%Y%m%d-%H%M%S', time.localtime(now / 1e9))}-{now % 1_000_000_000:09d}"
+    path = where / f"pasted-{stamp}{suffix}"
+    n = 1
+    while path.exists():
+        n += 1
+        path = where / f"pasted-{stamp}-{n}{suffix}"
+    path.write_bytes(data)
+    return path
+
+
+def pick(types: list[str]) -> str | None:
+    return next((t for t in IMAGE_TYPES if t in types), None)
+
+
+def paste() -> Paste:
+    """Whatever is on the clipboard: an image (saved to a file) or text."""
+    if sys.platform == "darwin":
+        return paste_mac()
+    if os.environ.get("WAYLAND_DISPLAY") and shutil.which("wl-paste"):
+        return paste_with(
+            ["wl-paste", "--list-types"],
+            lambda kind: ["wl-paste", "--no-newline", "--type", kind],
+            ["wl-paste", "--no-newline"],
+        )
+    if os.environ.get("DISPLAY") and shutil.which("xclip"):
+        return paste_with(
+            ["xclip", "-selection", "clipboard", "-t", "TARGETS", "-o"],
+            lambda kind: ["xclip", "-selection", "clipboard", "-t", kind, "-o"],
+            ["xclip", "-selection", "clipboard", "-o"],
+        )
+    return Paste(problem=status()[0])
+
+
+def status() -> tuple[str, bool | None]:
+    """Whether Ctrl+V can paste images here, and if not, what to do (for the paste and `lcode doctor`)."""
+    if sys.platform == "darwin":
+        return "Ctrl+V pastes images" + (" (with pngpaste)" if shutil.which("pngpaste") else ""), True
+    if os.environ.get("WAYLAND_DISPLAY"):
+        if shutil.which("wl-paste"):
+            return "Ctrl+V pastes images (with wl-paste)", True
+        return "To paste images with Ctrl+V, install wl-clipboard (for example `sudo apt install wl-clipboard`).", None
+    if os.environ.get("DISPLAY"):
+        if shutil.which("xclip"):
+            return "Ctrl+V pastes images (with xclip)", True
+        return "To paste images with Ctrl+V, install xclip (for example `sudo apt install xclip`).", None
+    return "There's no clipboard here (no desktop session), so give an image by its path.", None
+
+
+def paste_with(list_types: list[str], get, get_text: list[str]) -> Paste:
+    types = (run(list_types) or b"").decode(errors="replace").split()
+    kind = pick(types)
+    if kind:
+        data = run(get(kind))
+        if data:
+            return Paste(image=save(data, SUFFIXES[kind]))
+    text = run(get_text)
+    if text:
+        return Paste(text=text.decode(errors="replace"))
+    return Paste(problem="The clipboard is empty.")
+
+
+def paste_mac() -> Paste:
+    if shutil.which("pngpaste"):
+        data = run(["pngpaste", "-"])
+        if data:
+            return Paste(image=save(data, ".png"))
+    else:
+        target = folder() / ".clipboard.png"
+        target.parent.mkdir(parents=True, exist_ok=True)
+        target.unlink(missing_ok=True)
+        script = [
+            "try",
+            "set png to (the clipboard as «class PNGf»)",
+            f'set f to open for access POSIX file "{target}" with write permission',
+            "write png to f",
+            "close access f",
+            "end try",
+        ]
+        run(["osascript", *[arg for line in script for arg in ("-e", line)]])
+        if target.exists() and target.stat().st_size:
+            data = target.read_bytes()
+            target.unlink(missing_ok=True)
+            return Paste(image=save(data, ".png"))
+    text = run(["pbpaste"])
+    if text:
+        return Paste(text=text.decode(errors="replace"))
+    return Paste(problem="The clipboard is empty.")

lcode/repl.py

@@ -14,6 +14,7 @@ import time
 from pathlib import Path
 
 from prompt_toolkit import PromptSession
+from prompt_toolkit.application import run_in_terminal
 from prompt_toolkit.completion import Completer, Completion
 from prompt_toolkit.formatted_text import HTML
 from prompt_toolkit.history import FileHistory
@@ -26,7 +27,7 @@ from rich.rule import Rule
 from rich.table import Table
 from rich.text import Text
 
-from lcode import __version__, backends, catalog, extensions, gitflow, limits, sessions, web
+from lcode import __version__, backends, catalog, clipboard, extensions, gitflow, limits, sessions, web
 from lcode import context as context_tools
 from lcode import memory as memory_notes
 from lcode.agent import AUTO_COMPACT_RATIO, INIT_PROMPT, Agent
@@ -101,6 +102,13 @@ class InputCompleter(Completer):
                 yield Completion(completion, start_position=-len(fragment))
 
 
+def mention(path: Path) -> str:
+    """How a file goes into the prompt: @path, with ~ for the home folder, in quotes if it has spaces."""
+    home = Path.home()
+    shown = f"~/{path.relative_to(home)}" if path.is_relative_to(home) else str(path)
+    return f'@"{shown}"' if " " in shown else f"@{shown}"
+
+
 def build_session(agent: Agent) -> PromptSession:
     kb = KeyBindings()
 
@@ -119,6 +127,19 @@ def build_session(agent: Agent) -> PromptSession:
     def _newline(event):
         event.current_buffer.insert_text("\n")
 
+    @kb.add("c-v")
+    def _paste(event):
+        """Paste the clipboard: an image becomes @path (terminals can't paste images), anything else is text."""
+        got = clipboard.paste()
+        buf = event.current_buffer
+        if got.image:
+            before = buf.document.char_before_cursor
+            buf.insert_text(("" if not before or before.isspace() else " ") + mention(got.image) + " ")
+        elif got.text:
+            buf.insert_text(got.text.replace("\r\n", "\n"))
+        else:
+            run_in_terminal(lambda: agent.console.print(Text(f"  {got.problem}", style="yellow")))
+
     @kb.add("s-tab")
     def _cycle_mode(event):
         agent.perms.cycle()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: lcode-cli
-Version: 0.23.0
+Version: 0.24.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.23.0.dist-info → lcode_cli-0.24.0.dist-info}/RECORD

@@ -1,15 +1,16 @@
-lcode/__init__.py,sha256=G36hAKq_BqNwKGr17AmtWXAKHe-_Nnbzm_VWmWBC-SI,473
+lcode/__init__.py,sha256=TKS4ocYb1I6mIhEHcL41tMRS6veQZlQM9xS4vXe2mCk,473
 lcode/__main__.py,sha256=s5N5pryX2FAu93GGZ3FxUrIXHWGzxz66lKUoaV_h8Ws,35
 lcode/acp.py,sha256=Tpc8lsvffZSYbTRI4t7X4E2chahqZIPcKeYIcL5bV3Y,29035
 lcode/action.py,sha256=W-QqdGt4VAVLq7mcIdvL9UrEOwDEWvkZ26gNDv8k1kg,16330
-lcode/agent.py,sha256=Br-L-7sLnGBG_Hw2lwi19peFZldCh4Ve7PgtVPURjTU,53254
+lcode/agent.py,sha256=fXy5sCexEhOjCcdmQJ-_gAYYX0JhNog5uXaGyptUiL4,55568
 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
 lcode/catalog.py,sha256=pZ1azX9OH2r4JE2c6E5OfwywpgS39-W2oXzoCHJhmtM,4141
 lcode/checkpoints.py,sha256=eqPtmPe44-aweWqc2H21ROogwzIt3NpvcUobsaCHoGY,18354
-lcode/cli.py,sha256=ue5wsoFxraXXVu7X32S4tbKPLKYhgeI6zpK2i5nXXlU,40180
+lcode/cli.py,sha256=cH5mcYi54Aofcv0PDNgFmFFQX8OQjhwTGdbWMUM_FG8,40289
+lcode/clipboard.py,sha256=nTSdJyCXPdtjH947RjvB3QvRqnL5HZsS9KB8EkC42cc,5138
 lcode/codesearch.py,sha256=Io8leN1nb_Y-Dvlm9xaGtwUWYXX-ooswuznJV6dGU1s,10766
 lcode/config.py,sha256=fGjK4fM_YRY0qDQmbIVT3FAfL2I2UxLfYEFxnAI-Xu4,10365
 lcode/context.py,sha256=qJymLE3eYeaF6qVOzlUwDURqlky__8cskl_6vXeU3AA,10701
@@ -29,7 +30,7 @@ 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/repl.py,sha256=ZKd4l4wDGKHVaGz8bxjLGc2gRc2W-RpHPQYG9M2A_Zw,49441
 lcode/repomap.py,sha256=1GRJgEUjBl9XHSXsF7tSGXBCEgsY-3CzwMohaTudZ_M,13969
 lcode/sandbox.py,sha256=u_pkrVRXhCGhh-wFDPwuZ3jGG7UeXxXRAeBNsm37ZvE,8608
 lcode/sessions.py,sha256=wOR-J0EHgJxLSPboKPHnvBcp5VTUYTj3tZWgpsa6-K4,4013
@@ -54,8 +55,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.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,,
+lcode_cli-0.24.0.dist-info/METADATA,sha256=el8BWCJBrgargRIUs2z5O4a5ZKZyVQ9-6vCtuhmFf3k,12620
+lcode_cli-0.24.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+lcode_cli-0.24.0.dist-info/entry_points.txt,sha256=Hxsn_itbnbgft3U0FwxWdmEt0yoAV2LB-nJDnL9WT20,172
+lcode_cli-0.24.0.dist-info/licenses/LICENSE,sha256=JWjmoL7nNIC1XUa-dZm2hwLUgjUQMFo6k8APb0idNzs,1074
+lcode_cli-0.24.0.dist-info/RECORD,,