nanocode-cli 0.9.4__tar.gz → 0.9.6__tar.gz

{nanocode_cli-0.9.4/nanocode_cli.egg-info → nanocode_cli-0.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nanocode-cli
-Version: 0.9.4
+Version: 0.9.6
 Summary: A small terminal coding agent written in Python
 Author-email: hit9 <hit9@icloud.com>
 License-Expression: BSD-3-Clause

{nanocode_cli-0.9.4 → nanocode_cli-0.9.6}/nanocode.py

@@ -76,7 +76,7 @@ except ImportError:  # pragma: no cover - optional highlighting dependency
     pygments = None
     Token = None  # keep the name defined so class-body/token lookups don't NameError
 
-__version__ = "0.9.4"
+__version__ = "0.9.6"
 
 Json = dict[str, Any]
 
@@ -3210,8 +3210,10 @@ class BashTool(Tool):
         threading.Thread(target=drain_pipe, args=(stderr_pipe,), daemon=True).start()
         partial_stdout = "".join(stdout_parts)
         partial_stderr = "".join(stderr_parts)
-        note = f"backgrounded after {self.session.settings.bash_wait_timeout}s; still running as {job_id}. Use Job(action=\"wait\"|\"status\"|\"kill\", job=\"{job_id}\")."
-        partial_stderr = (partial_stderr + ("\n" if partial_stderr else "") + note)
+        note = (
+            f'backgrounded after {self.session.settings.bash_wait_timeout}s; still running as {job_id}. Use Job(action="wait"|"status"|"kill", job="{job_id}").'
+        )
+        partial_stderr = partial_stderr + ("\n" if partial_stderr else "") + note
         return self.process_result("BashToolResult", -1, partial_stdout, partial_stderr)
 
     def drain_selector(self, selector: selectors.BaseSelector, stdout_parts: list[str], stderr_parts: list[str]) -> None:
@@ -6286,7 +6288,7 @@ REVIEW MODE:
 FINAL:
 - Be concise: lead with the result, often 1-3 lines, no preamble/recap/filler.
 - Note changed files and checks run (or not run).
-- Use GitHub-flavored Markdown: flat lists (`1. 2. 3.`), backticks for code/paths, info strings on code blocks, clickable file links `[app.py](/abs/path/app.py:12)` without backticks or file://, vscode://, https://.
+- Use GitHub-flavored Markdown: flat lists (`1. 2. 3.`), backticks for code/paths, info strings on code blocks, clickable file links `[app.py](/abs/path/app.py:12)` without backticks or file://, vscode://, https://. Write http(s) URLs bare (terminal auto-links them); `[text](url)` prints as `text (url)` here.
 - No emoji/em dash unless asked; no "X rather than Y" framing; no trailing "If you want".
 - The user doesn't see raw outputs; summarize when asked. If you couldn't do something, say so.
 - LANGUAGE (strict): write in the user's current natural language, detected per turn. Keep code, identifiers, paths, shell commands, and tool/API names verbatim — translate only prose.
@@ -6609,6 +6611,20 @@ class UiPrinter:
     # as a solid band. We track the SGR bg state per token and only strip whitespace rendered with
     # bg off.
     SGR_RE: ClassVar[re.Pattern[str]] = re.compile(r"\x1b\[([0-9;]*)m")
+    # OSC / APC / DCS / SOS / PM sequences are terminal control strings that prompt_toolkit's ANSI
+    # parser doesn't recognize. When they slip through Rich's output (OSC 8 hyperlinks were the
+    # historical culprit, iTerm image escapes / Kitty graphics / shell-integration marks are
+    # potential future ones), pt eats the ESC framing but leaks the payload as visible garbage
+    # (e.g. `8;id=…;https://…;;` for OSC 8). Strip these up front so pt only ever sees CSI escapes.
+    # The trade is that any legitimate uses of these (clickable hyperlinks, inline images) never
+    # reach the terminal — but they weren't working through pt anyway; better clean than garbled.
+    NON_CSI_ESCAPE_RE: ClassVar[re.Pattern[str]] = re.compile(
+        r"\x1b[\]_PX^][^\x07\x1b]*(?:\x07|\x1b\\)"
+    )
+
+    @classmethod
+    def strip_unknown_escapes(cls, text: str) -> str:
+        return cls.NON_CSI_ESCAPE_RE.sub("", text)
 
     @classmethod
     def strip_trailing_pad(cls, text: str) -> str:
@@ -6662,7 +6678,7 @@ class UiPrinter:
         console = Console(force_terminal=True, width=shutil.get_terminal_size().columns)
         with console.capture() as capture:
             self.render_message(console, text, role, rule, indent)
-        print_formatted_text(ANSI(self.strip_trailing_pad(capture.get())), end="", flush=True)
+        print_formatted_text(ANSI(self.strip_unknown_escapes(self.strip_trailing_pad(capture.get()))), end="", flush=True)
 
     @staticmethod
     def indent_message(text: str, role: str = "", indent: int = 0) -> str:
@@ -6678,13 +6694,13 @@ class UiPrinter:
             console.print("")
             console.print(Padding(RichText(UiPrinter.USER_LOG_PREFIX + text, style=self.user_log_style()), (0, 0, 0, len(margin))))
         elif role == "assistant":
-            content = RichText(text, style="red") if error else Markdown(text)
+            content = RichText(text, style="red") if error else Markdown(text, hyperlinks=False)
             console.print(Padding(content, (0, 0, 0, len(margin))))
         else:
             if role:
                 label = RichText(role + ":", style=self.MESSAGE_ROLE_STYLES.get(role, "bright_black"))
                 console.print(Padding(label, (0, 0, 0, len(margin))))
-            content = RichText(text, style="red") if error else Markdown(text)
+            content = RichText(text, style="red") if error else Markdown(text, hyperlinks=False)
             console.print(Padding(content, (0, 0, 0, len(margin))))
 
     def emit_markdown(self, text: str) -> None:
@@ -6696,8 +6712,8 @@ class UiPrinter:
             return
         console = Console(force_terminal=True, width=shutil.get_terminal_size().columns)
         with console.capture() as capture:
-            console.print(Markdown(text))
-        print_formatted_text(ANSI(self.strip_trailing_pad(capture.get())), end="", flush=True)
+            console.print(Markdown(text, hyperlinks=False))
+        print_formatted_text(ANSI(self.strip_unknown_escapes(self.strip_trailing_pad(capture.get()))), end="", flush=True)
 
     @staticmethod
     def tab_segments(titles: tuple[str, ...], active: int) -> list[tuple[str, str]]:
@@ -6904,18 +6920,35 @@ class UiPrinter:
     DIFF_GUTTER_WIDTH: ClassVar[int] = 12
 
     def diff_segments(self, text: str, row_width: int | None = None) -> list[tuple[str, str]]:
+        return self._diff_segments(text, row_width=row_width, live=False)
+
+    def diff_segments_live(self, text: str, row_width: int | None = None) -> list[tuple[str, str]]:
+        """Same as diff_segments, but pads the bg band to the current pane width. Only for live
+        full-screen renderers that repaint on resize (the `/diff` viewer). Scrollback callers must
+        NOT use this — baked-in wide padding wraps on a later pane shrink and drops the bg color on
+        the wrapped continuation, which looks broken."""
+        return self._diff_segments(text, row_width=row_width, live=True)
+
+    def _diff_segments(self, text: str, *, row_width: int | None, live: bool) -> list[tuple[str, str]]:
         segments: list[tuple[str, str]] = []
         old_line: int | None = None
         new_line: int | None = None
         lines = text.splitlines()
-        # Pad the bg band to the current pane width for a solid edge-to-edge look. Scrollback bakes
-        # the width in, so a later resize can zigzag — same tradeoff we already accept for Rich
-        # syntax-highlighted code blocks that come out of the strip_trailing_pad path. Callers pass
-        # `row_width` when they know the width available AFTER their own outer prefix (nested log
-        # trees, tree edges) so the padding doesn't overflow and wrap onto a phantom second row.
+        natural_changed_width = max(
+            (get_cwidth(line) for line in lines if line.startswith(("+", "-")) and not line.startswith(("+++", "---"))),
+            default=1,
+        )
         if row_width is None:
             row_width = shutil.get_terminal_size((120, 20)).columns - 3
-        changed_width = max(1, row_width - self.DIFF_GUTTER_WIDTH)
+        available_changed_width = max(1, row_width - self.DIFF_GUTTER_WIDTH)
+        # Scrollback path: cap the bg band at the widest actual changed line, and drop bg entirely
+        # if that would already exceed the pane — a later resize can't wrap what wasn't padded. Live
+        # path (the /diff viewer): fill edge-to-edge with the current pane width; the viewer repaints
+        # on resize, so wide padding stays fresh.
+        if live:
+            changed_width: int | None = available_changed_width
+        else:
+            changed_width = natural_changed_width if natural_changed_width <= available_changed_width else None
 
         # Determine the target file path from the diff header.  The `+++` line
         # names the resulting file; for created files `---` is /dev/null.
@@ -6973,7 +7006,7 @@ class UiPrinter:
             for style, piece in content_hl:
                 segments.append((styled(style), piece))
             width = get_cwidth(prefix) + sum(get_cwidth(piece) for _style, piece in content_hl)
-            padding = " " * max(0, changed_width - width) if background else ""
+            padding = " " * max(0, changed_width - width) if background and changed_width is not None else ""
             segments.append((background if padding else "", padding + suffix))
 
         for index, line in enumerate(lines):
@@ -7578,6 +7611,8 @@ class CommandLoop:
         "Scaffold a fresh config with `nanocode --init-config`.",
         "Launch with `--yolo` to skip confirmations; `/debug` shows recent diagnostics.",
         'Filter MCP servers at launch with `--mcp "name*,!exclude"`.',
+        # Rendering behavior
+        "Markdown links render as `text (url)` — clickable hyperlinks are disabled so the URL stays visible; most terminals auto-link the bare URL.",
     )
 
     def startup_tip(self) -> str:
@@ -7789,9 +7824,7 @@ Tools:
         "class:divider.glow4",
     )
 
-    def sweep_divider_fragments(
-        self, label: str, width: int | None = None, prefix: list[tuple[str, str]] | None = None
-    ) -> list[tuple[str, str]]:
+    def sweep_divider_fragments(self, label: str, width: int | None = None, prefix: list[tuple[str, str]] | None = None) -> list[tuple[str, str]]:
         prefix = prefix or []
         prefix_len = sum(len(text) for _style, text in prefix)
         cols = shutil.get_terminal_size((80, 20)).columns
@@ -8863,7 +8896,7 @@ Tools:
             status, path, diff = sections[state.file]
             parts.append(("", "\n"))
             parts.append(("ansicyan", f"  {status.title()} · {path}\n"))
-            lines = self.ui.segment_lines(self.ui.diff_segments(diff))
+            lines = self.ui.segment_lines(self.ui.diff_segments_live(diff))
             visible = state.view.visible(lines, viewport())
             for line in visible:
                 parts.extend(line)

{nanocode_cli-0.9.4 → nanocode_cli-0.9.6/nanocode_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nanocode-cli
-Version: 0.9.4
+Version: 0.9.6
 Summary: A small terminal coding agent written in Python
 Author-email: hit9 <hit9@icloud.com>
 License-Expression: BSD-3-Clause

{nanocode_cli-0.9.4 → nanocode_cli-0.9.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nanocode-cli"
-version = "0.9.4"
+version = "0.9.6"
 description = "A small terminal coding agent written in Python"
 readme = "README.md"
 requires-python = ">=3.11"