nanocode-cli 0.2.5__tar.gz → 0.2.7__tar.gz

{nanocode_cli-0.2.5/nanocode_cli.egg-info → nanocode_cli-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nanocode-cli
-Version: 0.2.5
+Version: 0.2.7
 Summary: A lightweight terminal-based AI coding assistant
 Author-email: hit9 <hit9@icloud.com>
 License-Expression: BSD-3-Clause

{nanocode_cli-0.2.5 → nanocode_cli-0.2.7}/nanocode.py

@@ -41,7 +41,7 @@ from prompt_toolkit.patch_stdout import patch_stdout
 
 JsonValue: TypeAlias = Any
 Json: TypeAlias = dict[str, JsonValue]
-__version__ = "0.2.5"
+__version__ = "0.2.7"
 
 
 class Error(Exception): ...
@@ -355,6 +355,9 @@ class RangeFingerprintStore:
             f"fingerprint mismatch for range {start}:{end}: expected {fingerprint}, current {current_fingerprint}; "
             f"call Read(filepath, {start}, {end}) and reuse that range fingerprint"
         )
+        other_ranges = self._ranges_for_fingerprint(filepath=filepath, fingerprint=fingerprint)
+        if other_ranges:
+            message += "; this fingerprint was cached for exact range(s): " + ", ".join(f"{range_start}:{range_end}" for range_start, range_end in other_ranges)
         if not matches:
             raise ToolCallError(message)
         if len(matches) > 1:
@@ -389,6 +392,17 @@ class RangeFingerprintStore:
                         return matches
         return matches
 
+    def _ranges_for_fingerprint(self, *, filepath: str, fingerprint: str) -> list[tuple[int, int]]:
+        filepath = os.path.realpath(filepath)
+        ranges = []
+        for entry in self._entries:
+            if entry.fingerprint != fingerprint or entry.filepath != filepath:
+                continue
+            item = (entry.start, entry.end)
+            if item not in ranges:
+                ranges.append(item)
+        return ranges
+
 
 @final
 @dataclass
@@ -436,6 +450,7 @@ class Session:
     current: Current = field(default_factory=Current)
     conversation: list[ConversationItem] = field(default_factory=list)
     range_fingerprints: RangeFingerprintStore = field(default_factory=RangeFingerprintStore)
+    blackboard: list[str] = field(default_factory=list)
 
     def resolve_path(self, path: str) -> str:
         path = os.path.expanduser(path)
@@ -554,6 +569,13 @@ def _parse_line_range(start_arg: str, end_arg: str) -> tuple[int, int]:
     return start, end
 
 
+def _replacement_lines(content: str, *, has_following_line: bool) -> list[str]:
+    lines = content.splitlines(keepends=True)
+    if content and has_following_line and not content.endswith("\n"):
+        lines[-1] += "\n"
+    return lines
+
+
 def _range_fingerprint(content: str) -> str:
     return hashlib.blake2s(content.encode("utf-8"), digest_size=3).hexdigest()
 
@@ -585,7 +607,7 @@ class ReadTool(Tool):
             "Optional range is 0-based [start,end); end=0 means EOF.",
             "Returns at most 1000 lines; truncated results include total lines and next-step guidance.",
             "Prefer Search before Read for large or unknown files; use bounded reads when exact context is needed.",
-            "For ReplaceRange, call Read with the exact same filepath/start/end and reuse that range fingerprint.",
+            "For ReplaceRange, the fingerprint is valid only for this exact filepath/start/end; read the exact edit range immediately before replacing.",
         ]
 
     @classmethod
@@ -733,7 +755,7 @@ class ListDirTool(Tool):
 
     @classmethod
     def example(cls) -> list[str]:
-        return ['Example args: []', 'Example args: ["."]', 'Example args: ["src", "*.py"]']
+        return ["Example args: []", 'Example args: ["."]', 'Example args: ["src", "*.py"]']
 
     @classmethod
     def make(cls, session: Session, args: list[str]) -> Self:
@@ -793,7 +815,7 @@ class SearchTool(Tool):
     MAX_FILE_BYTES: ClassVar[int] = 2_000_000
     RG_MAX_FILESIZE: ClassVar[str] = "2M"
     CONTEXT_LINES: ClassVar[int] = 4
-    MAX_CONTEXT_LINES: ClassVar[int] = 20
+    MAX_CONTEXT_LINES: ClassVar[int] = 30
 
     @dataclass(frozen=True)
     class Match:
@@ -820,14 +842,15 @@ class SearchTool(Tool):
         return [
             "Search files or directories before Read; default is fixed text.",
             "Prefix pattern with re: for regex search.",
+            "Search is line-oriented; regex patterns must not contain newlines.",
             "Use A|B|C for literal OR search in fixed mode.",
-            "Optional context=N or N sets nearby context lines.",
+            "Optional context=N or N sets nearby context lines, from 0 to 30.",
             "Optional glob matches file basename or path relative to cwd.",
         ]
 
     @classmethod
     def signature(cls) -> str:
-        return "Search(pattern, path[, glob_pattern][, context=N|N]) -> SearchToolResult<matches>"
+        return "Search(pattern, path[, option...]) -> SearchToolResult<matches>; option is context=N|N (0..30) or glob_pattern"
 
     @classmethod
     def example(cls) -> list[str]:
@@ -850,6 +873,8 @@ class SearchTool(Tool):
         pattern = raw_pattern[3:] if regex else raw_pattern
         if not pattern:
             raise ToolCallError("pattern cannot be empty")
+        if regex and "\n" in pattern:
+            raise ToolCallError("multiline regex is not supported; Search is line-oriented. Search each line separately or Read a nearby range.")
         glob_pattern = ""
         context_lines = cls.CONTEXT_LINES
         for raw_option in args[2:]:
@@ -860,6 +885,10 @@ class SearchTool(Tool):
                 except ValueError:
                     raise ToolCallError("context must be an integer between 0 and " + str(cls.MAX_CONTEXT_LINES))
                 continue
+            if option.startswith("glob=") or option.startswith("glob_pattern="):
+                option = option.split("=", 1)[1]
+                if not option:
+                    raise ToolCallError("glob option cannot be empty")
             if glob_pattern:
                 raise ToolCallError("unexpected search option: " + option)
             glob_pattern = option
@@ -1080,6 +1109,8 @@ class SearchTool(Tool):
 
     def call(self) -> str:
         if not (os.path.isdir(self.target_path) or os.path.isfile(self.target_path)):
+            if os.path.basename(self.target_path) == "path":
+                raise ToolCallError('not a file or directory: "path" is a placeholder; pass a real file or directory')
             raise ToolCallError("not a file or directory")
         if os.path.isfile(self.target_path) and not self._matches_glob(self.target_path):
             return self._format_result("python", [], False)
@@ -1174,7 +1205,8 @@ class ReplaceRangeTool(Tool):
     @classmethod
     def description(cls) -> list[str]:
         return [
-            "Replace one 0-based line range when its fingerprint comes from Read(filepath, same start, same end).",
+            "Replace one 0-based line range when its fingerprint comes from Read(filepath, exact same start, exact same end).",
+            "Never use a wider Read fingerprint for a narrower edit; if mismatch happens, Read the exact target range and retry once.",
             "If earlier edits shifted lines, a cached Read fingerprint for the same original range can relocate only when old content still matches exactly once.",
         ]
 
@@ -1215,6 +1247,13 @@ class ReplaceRangeTool(Tool):
             return label + "\n# preview unavailable: " + str(error)
         return _make_unified_diff(original, new_content, self.filepath) or label
 
+    def preview_error(self) -> str:
+        try:
+            self._preview()
+        except (OSError, ToolCallError) as error:
+            return str(error)
+        return ""
+
     def call(self) -> str:
         original, new_content, resolved, _ = self._preview()
         if new_content == original:
@@ -1245,7 +1284,7 @@ class ReplaceRangeTool(Tool):
             end=self.end,
             fingerprint=self.fingerprint,
         )
-        replacement = self.content.splitlines(keepends=True)
+        replacement = _replacement_lines(self.content, has_following_line=resolved.end < len(lines))
         new_lines = lines[: resolved.start] + replacement + lines[resolved.end :]
         return original, "".join(new_lines), resolved, replacement
 
@@ -1275,7 +1314,8 @@ class BatchReplaceRangesTool(Tool):
         return [
             "Replace multiple 0-based line ranges in one file against one snapshot.",
             "Use this for multiple edits in the same file; earlier edits in this call do not shift later ranges.",
-            "Each edit fingerprint must come from Read(filepath, same start, same end); same-range cached fingerprints can relocate shifted old content.",
+            "Each edit fingerprint must come from Read(filepath, exact same start, exact same end); never reuse a wider Read fingerprint for a narrower edit.",
+            "Same-range cached fingerprints can relocate shifted old content.",
         ]
 
     @classmethod
@@ -1328,6 +1368,13 @@ class BatchReplaceRangesTool(Tool):
             return label + "\n# preview unavailable: " + str(error)
         return _make_unified_diff(original, new_content, self.filepath) or label
 
+    def preview_error(self) -> str:
+        try:
+            self._preview()
+        except (OSError, ToolCallError) as error:
+            return str(error)
+        return ""
+
     def call(self) -> str:
         original, new_content, resolved_edits = self._preview()
         if new_content == original:
@@ -1362,7 +1409,7 @@ class BatchReplaceRangesTool(Tool):
                 end=edit.end,
                 fingerprint=edit.fingerprint,
             )
-            resolved_edits.append((resolved, edit.content.splitlines(keepends=True)))
+            resolved_edits.append((resolved, _replacement_lines(edit.content, has_following_line=resolved.end < len(lines))))
         self._ensure_non_overlapping(resolved_edits)
 
         new_lines = list(lines)
@@ -1674,6 +1721,67 @@ class GitTool(Tool):
             return _format_process_result("GitToolResult", -1, error.stdout or "", (error.stderr or "") + "timeout")
 
 
+@final
+@dataclass
+class BlackboardTool(Tool):
+    action: str
+    content: str
+    blackboard: list[str]
+
+    @classmethod
+    def name(cls) -> str:
+        return "Blackboard"
+
+    @classmethod
+    def description(cls) -> list[str]:
+        return [
+            "Scratchpad for hypotheses, intermediate analysis, or task state.",
+            "Stores temporary data outside main context; cleared when the session ends. Actions: read, append, clear.",
+        ]
+
+    @classmethod
+    def signature(cls) -> str:
+        return "Blackboard(action[, content]) -> BlackboardToolResult<content>"
+
+    @classmethod
+    def example(cls) -> list[str]:
+        return [
+            '{"name": "Blackboard", "intention": "Record progress", "args": ["append", "Step 1 done"]}',
+            '{"name": "Blackboard", "intention": "Clear it", "args": ["clear"]}',
+        ]
+
+    @classmethod
+    def make(cls, session: Session, args: list[str]) -> Self:
+        action = args[0] if args else "read"
+        content = args[1] if len(args) > 1 else ""
+        return cls(action=action, content=content, blackboard=session.blackboard)
+
+    def requires_confirmation(self, session: Session) -> bool:
+        return False
+
+    def display(self) -> str:
+        if self.action == "append":
+            preview = self.content.replace("\n", " ")[:80]
+            return f"Blackboard append: {preview}"
+        return f"Blackboard {self.action}"
+
+    def call(self) -> str:
+        if self.action == "read":
+            content = "\n".join(self.blackboard)
+            return f"<BlackboardToolResult>\n{content}\n</BlackboardToolResult>"
+
+        if self.action == "append":
+            if self.content:
+                self.blackboard.append(self.content.rstrip())
+            return "<BlackboardToolResult>appended</BlackboardToolResult>"
+
+        if self.action == "clear":
+            self.blackboard.clear()
+            return "<BlackboardToolResult>cleared</BlackboardToolResult>"
+
+        raise ToolCallError("Blackboard action must be one of: read, append, clear")
+
+
 TOOL_REGISTRY: dict[str, ToolClass] = {
     ReadTool.name(): ReadTool,
     LineCountTool.name(): LineCountTool,
@@ -1685,13 +1793,14 @@ TOOL_REGISTRY: dict[str, ToolClass] = {
     ApplyPatchTool.name(): ApplyPatchTool,
     BashTool.name(): BashTool,
     GitTool.name(): GitTool,
+    BlackboardTool.name(): BlackboardTool,
 }
 
 
 #######################
 # Prompt
-#######################
 
+#######################
 MAIN_AGENT_SYSTEM_PROMPT = """You are nanocode, a minimal coding agent.
 
 Core:
@@ -1709,6 +1818,7 @@ Tools:
 - Prefer specific tools first; use Bash only when no provided tool fits.
 - Prefer Search before Read when locating code or facts; Read only known small ranges or exact files needed for editing.
 - Read returns at most 1000 lines; if truncated, use Search or smaller Read ranges in batches.
+- ReplaceRange/BatchReplaceRanges fingerprints are valid only for the exact filepath/start/end returned by Read. Never use a wider Read fingerprint for a narrower edit. If fingerprint mismatch happens, immediately Read the exact target range and retry once.
 - Summarize every latest tool result in last_tool_calls_summaries; raw results are shown once only, so include key_evidence when paths, lines, errors, or decisions matter later.
 - Latest tool results are already shown in Latest_Tool_Call_Results; use result_file logs only as a fallback when needed.
 - If an older tool result lacks detail that is needed for the task, prefer re-running a targeted source tool; Read result_file logs only when that is the cheapest accurate source.
@@ -1968,6 +2078,7 @@ class ModelClient:
             "model": self.session.model,
             "messages": messages,
             "temperature": self.session.temperature,
+            "response_format": {"type": "json_object"},
         }
         extra_params = self._reasoning_params()
         payload.update(extra_params)
@@ -2164,6 +2275,9 @@ class ToolCallRunner:
             try:
                 call = self.parse_tool_call(item)
                 tool = self._make_tool(call)
+                preview_error = self._preview_error(tool)
+                if preview_error:
+                    raise ToolCallError("preview unavailable: " + preview_error)
                 if tool.requires_confirmation(self.session):
                     if self.session.yolo:
                         if on_auto_approve is not None:
@@ -2256,6 +2370,12 @@ class ToolCallRunner:
             raise ToolCallError("tool not found: " + call.name)
         return tool_class.make(self.session, call.args)
 
+    def _preview_error(self, tool: Tool) -> str:
+        preview_error = getattr(tool, "preview_error", None)
+        if not callable(preview_error):
+            return ""
+        return str(preview_error())
+
     def _is_tool_result_file_read(self, call: ParsedToolCall) -> bool:
         if call.name != ReadTool.name() or not call.args:
             return False
@@ -2736,19 +2856,14 @@ class Agent:
                 if consecutive_format_errors >= self.MAX_CONSECUTIVE_FORMAT_ERRORS:
                     self._report_gate(
                         on_message,
-                        "Stopped: model returned invalid output "
-                        + str(self.MAX_CONSECUTIVE_FORMAT_ERRORS)
-                        + " times in a row.",
+                        "Stopped: model returned invalid output " + str(self.MAX_CONSECUTIVE_FORMAT_ERRORS) + " times in a row.",
                         "Format_Gate: stopped after "
                         + str(self.MAX_CONSECUTIVE_FORMAT_ERRORS)
                         + " consecutive invalid model outputs. "
                         + _shorten(format_error, 180),
                     )
                     raise LLMError(
-                        "model returned invalid output "
-                        + str(self.MAX_CONSECUTIVE_FORMAT_ERRORS)
-                        + " times in a row: "
-                        + _shorten(format_error, 300)
+                        "model returned invalid output " + str(self.MAX_CONSECUTIVE_FORMAT_ERRORS) + " times in a row: " + _shorten(format_error, 300)
                     )
                 self._report_gate(
                     on_message,
@@ -2809,7 +2924,11 @@ class Agent:
         return headline
 
     def step(self) -> Json:
-        response = self.request(self.build_system_prompt(), self.build_user_prompt(), activity="main")
+        response = self.request(self.build_system_prompt(), self.build_user_prompt(consume_latest_tool_results=False), activity="main")
+        if _json_str(response.get("_format_error")):
+            return response
+        self.latest_tool_call_results = ""
+        self.latest_agent_feedback = ""
         self.state_updater.apply_tool_call_summaries(response)
         return response
 
@@ -2926,6 +3045,7 @@ COMMANDS: tuple[CommandSpec, ...] = (
     CommandSpec("/yolo", "Show or toggle confirmation bypass", "Config", "/yolo [on|off|status]"),
     CommandSpec("/exit", "Exit nanocode", "Control", "/exit"),
     CommandSpec("/quit", "Exit nanocode", "Control", "/quit"),
+    CommandSpec("/blackboard", "View or clear the blackboard", "Control", "/blackboard [status|clear]"),
 )
 
 
@@ -2942,6 +3062,7 @@ class CommandDispatcher:
         self.agent = agent
         self.run_agent = run_agent
         self.run_with_status = run_with_status
+        self.blackboard = agent.session.blackboard
         self.handlers: dict[str, Callable[[str], str]] = {
             "/help": self._help,
             "/status": self._status,
@@ -2951,6 +3072,7 @@ class CommandDispatcher:
             "/reason": self._reason,
             "/reason_effort": self._reason_effort,
             "/yolo": self._yolo,
+            "/blackboard": self._blackboard,
         }
 
     def dispatch(self, user_input: str) -> CommandResult:
@@ -3015,6 +3137,7 @@ class CommandDispatcher:
                 "yolo: " + yolo,
                 "conversation: " + str(len(session.conversation)) + "/" + str(session.compact_at),
                 "tokens: last=" + _format_count(session.last_total_tokens) + " session=" + _format_count(session.session_total_tokens),
+                "blackboard: " + str(len(session.blackboard)) + " items",
                 "goal: " + (session.current.goal or "(empty)"),
                 "verification: " + session.current.verification.status,
             ]
@@ -3086,6 +3209,17 @@ class CommandDispatcher:
             return "YOLO is " + ("on" if self.agent.session.yolo else "off")
         return "Usage: /yolo [on|off|status]"
 
+    def _blackboard(self, args: str) -> str:
+        if args == "clear":
+            self.blackboard.clear()
+            return "Blackboard cleared"
+        if args in {"", "status"}:
+            content = "\n".join(self.blackboard)
+            if content:
+                return "Blackboard:\n" + content
+            return "Blackboard is empty"
+        return "Usage: /blackboard [status|clear]"
+
 
 def _format_count(value: int) -> str:
     if value <= 0:
@@ -3193,7 +3327,8 @@ class StatusBar:
         yolo = " | yolo" if session.yolo else ""
         context = str(len(session.conversation)) + "/" + str(session.compact_at)
         tokens = "last:" + self._format_count(session.last_total_tokens) + " session:" + self._format_count(session.session_total_tokens)
-        parts = [model + " (" + reasoning + ")" + yolo, "ctx:" + context, "tok:" + tokens]
+        blackboard = "bb:" + str(len(session.blackboard))
+        parts = [model + " (" + reasoning + ")" + yolo, "ctx:" + context, "tok:" + tokens, blackboard]
         if show_elapsed:
             parts.append(f"{turn_elapsed:.1f}s")
         if session.current_model_call_started_at > 0:

{nanocode_cli-0.2.5 → nanocode_cli-0.2.7/nanocode_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nanocode-cli
-Version: 0.2.5
+Version: 0.2.7
 Summary: A lightweight terminal-based AI coding assistant
 Author-email: hit9 <hit9@icloud.com>
 License-Expression: BSD-3-Clause

{nanocode_cli-0.2.5 → nanocode_cli-0.2.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nanocode-cli"
-version = "0.2.5"
+version = "0.2.7"
 description = "A lightweight terminal-based AI coding assistant"
 readme = "README.md"
 requires-python = ">=3.11"