wafer-cli 0.2.61__tar.gz → 0.2.63__tar.gz

{wafer_cli-0.2.61 → wafer_cli-0.2.63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wafer-cli
-Version: 0.2.61
+Version: 0.2.63
 Summary: CLI for running GPU workloads, managing remote workspaces, and evaluating/optimizing kernels
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{wafer_cli-0.2.61 → wafer_cli-0.2.63}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "wafer-cli"
-version = "0.2.61"
+version = "0.2.63"
 description = "CLI for running GPU workloads, managing remote workspaces, and evaluating/optimizing kernels"
 readme = "README.md"
 requires-python = ">=3.11"

{wafer_cli-0.2.61 → wafer_cli-0.2.63}/tests/test_corpus_lockdown.py

@@ -66,13 +66,12 @@ class TestCorpusModuleRemoved:
 class TestNoCorpusPathsInTemplates:
     """Templates should not reference local corpus paths."""
 
-    def test_ask_docs_template_uses_ask_docs_tool(self) -> None:
+    def test_ask_docs_template_uses_direct_endpoint(self) -> None:
+        """ask-docs streams from server via direct_endpoint — no local agent, no local corpus."""
         from wafer_core.rollouts.templates.loader import load_template
         bundled = Path(__file__).parent.parent / "wafer" / "templates"
         config = load_template("ask-docs", search_paths=[bundled])
-        assert "ask_docs" in config.tools
-        assert "bash" not in config.tools
-        assert "glob" not in config.tools
+        assert config.direct_endpoint == "/v1/docs/query"
 
     def test_no_corpus_path_in_ask_docs_prompt(self) -> None:
         from wafer_core.rollouts.templates.loader import load_template

{wafer_cli-0.2.61 → wafer_cli-0.2.63}/tests/test_direct_streaming.py

@@ -274,6 +274,7 @@ class TestStreamDirectEndpoint:
 
     def test_json_mode_tool_events(self) -> None:
         events = [
+            {"type": "tool_call_start", "name": "grep"},
             {"type": "tool_call", "name": "grep", "input": {"pattern": "warp"}},
             {"type": "tool_result", "name": "grep", "content": "line1\n"},
             {"type": "text", "content": "Answer"},
@@ -287,6 +288,8 @@ class TestStreamDirectEndpoint:
         assert "tool_result" in types
         assert "text_delta" in types
         assert "session_end" in types
+        # Exactly one tool_call_start (from tool_call_start event, not duplicated by tool_call event)
+        assert types.count("tool_call_start") == 1
 
     def test_json_mode_error_event(self) -> None:
         events = [
@@ -350,3 +353,126 @@ class TestStreamDirectEndpoint:
         assert "grep" in stderr_text
         assert "reading" in stderr_text
         assert any("Final answer." in s for s in stdout)
+
+    def test_sources_event_renders_to_stderr(self) -> None:
+        events = [
+            {"type": "text", "content": "Answer here."},
+            {"type": "sources", "files": ["./memory.md", "./guide.md"]},
+            {"type": "done"},
+        ]
+        _, _, stderr = self._run(events)
+        stderr_text = " ".join(stderr)
+        assert "Sources" in stderr_text
+        assert "./memory.md" in stderr_text
+        assert "./guide.md" in stderr_text
+
+    def test_json_mode_sources_event(self) -> None:
+        events = [
+            {"type": "text", "content": "Answer"},
+            {"type": "sources", "files": ["./memory.md"]},
+            {"type": "done"},
+        ]
+        _, stdout, _ = self._run(events, json_output=True)
+        json_events = [json.loads(line) for line in stdout if line.strip()]
+        sources_events = [e for e in json_events if e.get("type") == "sources"]
+        assert len(sources_events) == 1
+        assert sources_events[0]["files"] == ["./memory.md"]
+
+    def test_turn_start_renders_to_stderr(self) -> None:
+        """turn_start event should print turn number to stderr."""
+        events = [
+            {"type": "turn_start", "turn": 1, "max_turns": 10},
+            {"type": "text", "content": "Answer."},
+            {"type": "done"},
+        ]
+        _, _, stderr = self._run(events)
+        stderr_text = " ".join(stderr)
+        assert "[Turn 1]" in stderr_text
+        assert "Searching documentation" in stderr_text
+
+    def test_tool_call_start_renders_to_stderr(self) -> None:
+        """tool_call_start event should print tool name to stderr."""
+        events = [
+            {"type": "turn_start", "turn": 1, "max_turns": 10},
+            {"type": "tool_call_start", "name": "grep"},
+            {"type": "tool_call", "name": "grep", "input": {"pattern": "test"}},
+            {"type": "tool_exec_start", "name": "grep", "index": 1, "total": 1},
+            {"type": "tool_result", "name": "grep", "content": "match\n"},
+            {"type": "text", "content": "Answer."},
+            {"type": "done"},
+        ]
+        _, _, stderr = self._run(events)
+        stderr_text = " ".join(stderr)
+        assert "Calling grep" in stderr_text
+
+    def test_tool_exec_start_renders_to_stderr(self) -> None:
+        """tool_exec_start event should print tool execution progress to stderr."""
+        events = [
+            {"type": "turn_start", "turn": 1, "max_turns": 10},
+            {"type": "tool_call_start", "name": "grep"},
+            {"type": "tool_call", "name": "grep", "input": {"pattern": "test"}},
+            {"type": "tool_exec_start", "name": "grep", "index": 2, "total": 5},
+            {"type": "tool_result", "name": "grep", "content": "match\n"},
+            {"type": "text", "content": "Answer."},
+            {"type": "done"},
+        ]
+        _, _, stderr = self._run(events)
+        stderr_text = " ".join(stderr)
+        assert "Executing grep (2/5)" in stderr_text
+
+    def test_turn_start_json_mode(self) -> None:
+        """turn_start in JSON mode should emit a status event."""
+        events = [
+            {"type": "turn_start", "turn": 1, "max_turns": 10},
+            {"type": "text", "content": "Answer"},
+            {"type": "done"},
+        ]
+        _, stdout, _ = self._run(events, json_output=True)
+        json_events = [json.loads(line) for line in stdout if line.strip()]
+        status_events = [e for e in json_events if e.get("type") == "status"]
+        assert len(status_events) == 1
+        assert "Turn 1/10" in status_events[0]["message"]
+
+    def test_tool_exec_start_json_mode(self) -> None:
+        """tool_exec_start in JSON mode should emit a tool_exec_start event."""
+        events = [
+            {"type": "turn_start", "turn": 1, "max_turns": 10},
+            {"type": "tool_call_start", "name": "grep"},
+            {"type": "tool_call", "name": "grep", "input": {"pattern": "test"}},
+            {"type": "tool_exec_start", "name": "grep", "index": 1, "total": 3},
+            {"type": "tool_result", "name": "grep", "content": "match\n"},
+            {"type": "text", "content": "Answer"},
+            {"type": "done"},
+        ]
+        _, stdout, _ = self._run(events, json_output=True)
+        json_events = [json.loads(line) for line in stdout if line.strip()]
+        exec_events = [e for e in json_events if e.get("type") == "tool_exec_start"]
+        assert len(exec_events) == 1
+        assert exec_events[0]["tool_name"] == "grep"
+        assert exec_events[0]["index"] == 1
+        assert exec_events[0]["total"] == 3
+
+    def test_full_progress_sequence(self) -> None:
+        """Full event sequence renders all progress lines in correct order."""
+        events = [
+            {"type": "turn_start", "turn": 1, "max_turns": 10},
+            {"type": "tool_call_start", "name": "grep"},
+            {"type": "tool_call", "name": "grep", "input": {"pattern": "bank conflict"}},
+            {"type": "tool_exec_start", "name": "grep", "index": 1, "total": 2},
+            {"type": "tool_result", "name": "grep", "content": "file.md:10:bank conflict\n"},
+            {"type": "tool_call_start", "name": "read_file"},
+            {"type": "tool_call", "name": "read_file", "input": {"path": "./file.md"}},
+            {"type": "tool_exec_start", "name": "read_file", "index": 2, "total": 2},
+            {"type": "tool_result", "name": "read_file", "content": "Full content here\n"},
+            {"type": "turn_start", "turn": 2, "max_turns": 10},
+            {"type": "text", "content": "Final answer."},
+            {"type": "done"},
+        ]
+        _, stdout, stderr = self._run(events)
+        stderr_text = " ".join(stderr)
+        assert "[Turn 1]" in stderr_text
+        assert "Calling grep" in stderr_text
+        assert "Executing grep (1/2)" in stderr_text
+        assert "Executing read_file (2/2)" in stderr_text
+        assert "[Turn 2]" in stderr_text
+        assert any("Final answer." in s for s in stdout)

{wafer_cli-0.2.61 → wafer_cli-0.2.63}/wafer/wevin_cli.py

@@ -492,7 +492,7 @@ async def _stream_direct_endpoint(
                     summary = _format_tool_call_summary(tool_name, tool_input)
                     if json_output:
                         assert frontend is not None
-                        frontend._emit({"type": "tool_call_start", "tool_name": tool_name})
+                        # tool_call_start already emitted by the tool_call_start event handler
                         frontend._emit({"type": "tool_call_end", "tool_name": tool_name, "args": tool_input})
                     else:
                         print(f"\033[2m  {summary}\033[0m", file=sys.stderr)
@@ -523,6 +523,44 @@ async def _stream_direct_endpoint(
                     else:
                         print(f"\nError: {error_msg}", file=sys.stderr)
 
+                elif event_type == "turn_start":
+                    turn_num = event.get("turn", "?")
+                    max_turns = event.get("max_turns", "?")
+                    if json_output:
+                        assert frontend is not None
+                        frontend._emit({"type": "status", "message": f"Turn {turn_num}/{max_turns}"})
+                    else:
+                        print(f"\033[2m  [Turn {turn_num}] Searching documentation...\033[0m", file=sys.stderr)
+
+                elif event_type == "tool_call_start":
+                    tool_name = event.get("name", "")
+                    if json_output:
+                        assert frontend is not None
+                        frontend._emit({"type": "tool_call_start", "tool_name": tool_name})
+                    else:
+                        print(f"\033[2m  Calling {tool_name}...\033[0m", file=sys.stderr)
+
+                elif event_type == "tool_exec_start":
+                    tool_name = event.get("name", "")
+                    index = event.get("index", "?")
+                    total = event.get("total", "?")
+                    if json_output:
+                        assert frontend is not None
+                        frontend._emit({"type": "tool_exec_start", "tool_name": tool_name, "index": index, "total": total})
+                    else:
+                        print(f"\033[2m  Executing {tool_name} ({index}/{total})...\033[0m", file=sys.stderr)
+
+                elif event_type == "sources":
+                    files = event.get("files", [])
+                    if json_output:
+                        assert frontend is not None
+                        frontend._emit({"type": "sources", "files": files})
+                    else:
+                        if files:
+                            print(f"\033[2m  Sources:\033[0m", file=sys.stderr)
+                            for f in files:
+                                print(f"\033[2m    {f}\033[0m", file=sys.stderr)
+
                 elif event_type == "done":
                     break
 

{wafer_cli-0.2.61 → wafer_cli-0.2.63}/wafer_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wafer-cli
-Version: 0.2.61
+Version: 0.2.63
 Summary: CLI for running GPU workloads, managing remote workspaces, and evaluating/optimizing kernels
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown