pcode 0.1.3__tar.gz → 0.1.5__tar.gz

{pcode-0.1.3 → pcode-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pcode
-Version: 0.1.3
+Version: 0.1.5
 Summary: Terminal-native AI coding agent with background jobs, parallel worktrees, forkable sessions, and multi-model support
 Project-URL: Homepage, https://github.com/cruxwell/pcode
 Project-URL: Documentation, https://cruxwell.github.io/pcode/

{pcode-0.1.3 → pcode-0.1.5}/src/pcode/aside_ui.py

@@ -51,6 +51,7 @@ from pcode.popup_ui import (
 from pcode.prefix_keys import PrefixKeys
 from pcode.session_ui import literal
 from pcode.task_prompt import TaskPrompt
+from pcode.text_selection import copy_drags
 from pcode.tool_display import plain
 from pcode.ui import StatusLine, status_parts, status_spinner
 
@@ -164,15 +165,22 @@ class AsideBrowser:
         self._refreshing = False
         # Enter on the list reads the selected thread full width; Esc brings
         # the list back. A viewer opened on a lone thread starts reading, so
-        # one that arrives meanwhile does not pull the list in beside it.
-        self.reading = len(self.threads) <= 1
+        # one that arrives meanwhile does not pull the list in beside it. One
+        # opened to type in (`edit`) starts reading the newest thread too, with
+        # the cursor in its editor; Esc shows the list.
+        self.reading = len(self.threads) <= 1 or self.edit
         self._ids: list[str] = []
         self.notice = ""
         # The copy or link picker over the viewer, while one is open.
         self.picker: CopyPicker | LinkPicker | None = None
         self.list = TextArea(read_only=True, wrap_lines=False, scrollbar=True)
+        copy_drags(self.list, lambda text: setattr(self, "notice", text))
         self.list.window.cursorline = Always()
-        self.detail = RichPane(theme=rich_theme, color_system=color_system)
+        self.detail = RichPane(
+            theme=rich_theme,
+            color_system=color_system,
+            notify=lambda text: setattr(self, "notice", text),
+        )
         self.list.buffer.on_cursor_position_changed += lambda _: self.select()
         self.prefix_keys = shortcuts = PrefixKeys(key_prefix)
         shortcuts.set_help(self.help)
@@ -243,7 +251,7 @@ class AsideBrowser:
                         submit=lambda text: self.finish(Bridge(thread, "summary", text)),
                     )
 
-            @shortcuts.add("t", "Merge to /tree", filter=idle)
+            @shortcuts.add("t", "Merge into conversation", filter=idle)
             def merge(event):
                 if self.bridgeable():
                     self.finish(Bridge(self.selected, "merge"))
@@ -447,7 +455,9 @@ class AsideBrowser:
                     lambda focus: bridge("summary", focus),
                     argument="[focus]",
                 ),
-                PopupCommand("/merge", "Merge to /tree", lambda _: bridge("merge", "")),
+                PopupCommand(
+                    "/merge", "Merge into the conversation", lambda _: bridge("merge", "")
+                ),
             ]
         commands.append(PopupCommand("/stop", "Stop running answers", lambda _: self.stop()))
         return commands

{pcode-0.1.3 → pcode-0.1.5}/src/pcode/claude_sdk/messages.py

@@ -95,9 +95,30 @@ def _render_block(block: dict) -> str:
         return f"[Result of tool call {block.get('tool_use_id')}{status}]\n{_result_text(block)}"
     if kind in ("thinking", "redacted_thinking"):
         return ""
+    if kind == "server_tool_use":
+        arguments = json.dumps(block.get("input"), ensure_ascii=False, default=str)
+        return f"[Ran {block.get('name')} (id {block.get('id')}) with {arguments}]"
+    if kind in ("web_search_tool_result", "web_fetch_tool_result"):
+        return f"[Result of {block.get('tool_use_id')}]\n{_web_result_text(block.get('content'))}"
     return f"[{kind or 'content'} omitted]"
 
 
+def _web_result_text(content: Any) -> str:
+    """A web search's hits or a fetched page, as `web.result_block` shaped them."""
+    if isinstance(content, list):
+        hits = [item for item in content if isinstance(item, dict)]
+        lines = [f"{h.get('title') or h['url']}: {h['url']}" for h in hits if h.get("url")]
+        summary = next((hit["summary"] for hit in hits if hit.get("summary")), "")
+        return "\n\n".join(filter(None, ("\n".join(lines), summary)))
+    if not isinstance(content, dict):
+        return ""
+    if "error_code" in content:
+        return f"(error: {content.get('message') or content['error_code']})"
+    document = content.get("content")
+    source = document.get("source") if isinstance(document, dict) else None
+    return str(source.get("data", "")) if isinstance(source, dict) else ""
+
+
 def replay(messages: list[dict], open_tool_ids: tuple[str, ...] = ()) -> list[dict]:
     """One user turn carrying `messages`, for a CLI transcript that lacks them.
 

{pcode-0.1.3 → pcode-0.1.5}/src/pcode/claude_sdk/model.py

@@ -24,6 +24,7 @@ from pcode.claude_sdk.errors import MISSING_SDK, ClaudeSDKMissing
 from pcode.claude_sdk.messages import _digest, lineage, normalize
 from pcode.claude_sdk.session import SessionConfig
 from pcode.claude_sdk.session_pool import pool
+from pcode.claude_sdk.web import cli_tool_names
 from pcode.claude_sdk.workspace import CWD_SETTING
 
 PREFIX = "claude:"
@@ -71,16 +72,18 @@ KEEP_WARM_SETTING = "pcode_claude_keep_warm"
 class ClaudeModel(AnthropicModel):
     @cached_property
     def profile(self):
-        # The CLI forwards only MCP tools, so no Anthropic server tool reaches
-        # the model and web tools fall back to local ones. Like Meridian, wire
-        # tool deferral is off: hidden tools are withheld until found.
+        # No Anthropic server tool reaches the model through the CLI, but the
+        # CLI's own WebSearch and WebFetch stand in for those two (`web.py`).
+        # Like Meridian, wire tool deferral is off: hidden tools are withheld
+        # until found.
+        from pydantic_ai.native_tools import WebFetchTool, WebSearchTool
         from pydantic_ai.profiles import merge_profile
         from pydantic_ai.profiles.anthropic import AnthropicModelProfile
 
         return merge_profile(
             super().profile,
             AnthropicModelProfile(
-                supported_native_tools=frozenset(),
+                supported_native_tools=frozenset({WebSearchTool, WebFetchTool}),
                 tool_deferral_mode=None,
                 tool_addition_mode=None,
                 # The system prompt is fixed per process; mid-conversation
@@ -89,7 +92,7 @@ class ClaudeModel(AnthropicModel):
             ),
         )
 
-    def session_config(self, system, tools, settings) -> SessionConfig:
+    def session_config(self, system, tools, settings, native_tools=()) -> SessionConfig:
         if isinstance(system, str):
             prompt = system
         else:
@@ -114,6 +117,7 @@ class ClaudeModel(AnthropicModel):
             effort=effort if effort in EFFORTS else None,
             thinking=json.dumps(thinking, sort_keys=True) if isinstance(thinking, dict) else None,
             max_tokens=max_tokens if isinstance(max_tokens, int) and max_tokens > 0 else None,
+            web_tools=cli_tool_names(native_tools),
         )
 
     async def request(self, messages, model_settings, model_request_parameters):
@@ -140,7 +144,7 @@ class ClaudeModel(AnthropicModel):
         settings = dict(settings or {})
         system, mapped = await self._map_message(messages, parameters, settings)
         tools, _ = self._prepare_tools_and_tool_choice(settings, parameters)
-        config = self.session_config(system, tools, settings)
+        config = self.session_config(system, tools, settings, parameters.native_tools)
         mapped = normalize(mapped)
         chain = lineage(mapped)
         sessions = pool()

{pcode-0.1.3 → pcode-0.1.5}/src/pcode/claude_sdk/session.py

@@ -23,6 +23,7 @@ from pcode.claude_sdk.errors import (
 )
 from pcode.claude_sdk.messages import _blocks, _mcp_content, _result_ids
 from pcode.claude_sdk.resume import ForkPoint
+from pcode.claude_sdk.web import result_block, server_tool_use
 
 logger = logging.getLogger(__name__)
 
@@ -41,6 +42,9 @@ CALL_TIMEOUT_SECONDS = 10.0
 # that gap goes out with none (verified with 2.1.285), so wait for them.
 TOOLS_READY_TIMEOUT_SECONDS = 30.0
 TOOLS_READY_POLL_SECONDS = 0.02
+# The CLI can run its web tools before a pcode call made beside them, so that call
+# reaches pcode only once they finish. The CLI bounds each fetch and search itself.
+WEB_TOOLS_TIMEOUT_SECONDS = 300.0
 # Statuses for the CLI's error kinds when it reports no HTTP status itself.
 # `server_error` has none on purpose: without a status it is a connection failure
 # (`ClaudeConnectionError`), while a real 5xx or 529 always carries its status.
@@ -63,6 +67,8 @@ class SessionConfig:
     thinking: str | None = None  # canonical JSON of the thinking setting
     # pcode's output ceiling; the CLI clamps it to the model's own limit.
     max_tokens: int | None = None
+    # The CLI's own web tools to offer (`web.CLI_WEB_TOOLS`), which it runs itself.
+    web_tools: tuple[str, ...] = ()
 
     def options(self, server, resume: ForkPoint | None, stderr, prompt_file: str) -> Any:
         from claude_agent_sdk import ClaudeAgentOptions
@@ -71,13 +77,14 @@ class SessionConfig:
         if thinking is not None and thinking.get("type") != "disabled":
             thinking = {"display": "summarized", **thinking}
         return ClaudeAgentOptions(
-            # No built-in tools, settings, CLAUDE.md, plugins or other MCP
-            # servers: the model sees pcode's prompt and pcode's tools only.
-            tools=[],
+            # No settings, CLAUDE.md, plugins, other MCP servers or built-in
+            # tools beyond the web ones pcode asked for: the model sees pcode's
+            # prompt and pcode's tools only.
+            tools=list(self.web_tools),
             setting_sources=[],
             strict_mcp_config=True,
             mcp_servers={SERVER: {"type": "sdk", "name": SERVER, "instance": server}},
-            allowed_tools=[f"mcp__{SERVER}"],
+            allowed_tools=[f"mcp__{SERVER}", *self.web_tools],
             system_prompt={"type": "file", "path": prompt_file},
             include_partial_messages=True,
             model=self.model,
@@ -107,6 +114,29 @@ def _client_factory(options) -> Any:
     return ClaudeSDKClient(options)
 
 
+def _block_events(block: dict, index: int) -> list[dict]:
+    """A whole content block as the start and stop events that carry it."""
+    return [
+        {"type": "content_block_start", "index": index, "content_block": block},
+        {"type": "content_block_stop", "index": index},
+    ]
+
+
+def _sum(first: dict, second: dict) -> dict:
+    """Two messages' usage as one: counts add up, anything else is the latest."""
+    total = dict(first)
+    for key, value in second.items():
+        if isinstance(value, dict):
+            earlier = total.get(key)
+            total[key] = _sum(earlier if isinstance(earlier, dict) else {}, value)
+        elif isinstance(value, int) and not isinstance(value, bool):
+            earlier = total.get(key)
+            total[key] = value + (earlier if isinstance(earlier, int) else 0)
+        else:
+            total[key] = value
+    return total
+
+
 class _Diverged(ClaudeProcessError):
     """The CLI's transcript stopped matching pcode's history (it acted on its own)."""
 
@@ -145,6 +175,10 @@ class ClaudeSession:
         # a released handler, or sent as input). Any other result is its own.
         self._called: set[str] = set()
         self._answered: set[str] = set()
+        # Web tool calls the CLI is running itself (id -> name, input), until
+        # their results arrive; and the tool names in the message streaming now.
+        self._web_calls: dict[str, tuple[str, dict]] = {}
+        self._message_tools: list[str] = []
         # Pulsed on every change a waiter may be waiting for.
         self._changed = asyncio.Event()
         self._last_uuid: str | None = None
@@ -372,6 +406,8 @@ class ClaudeSession:
             raise _Diverged(self.config.model, "Claude Code did not end its turn.") from None
         self._ask()
         self._turn_done.clear()
+        # The last turn ended, so any web call still listed will never answer.
+        self._web_calls.clear()
         # A fork may start with results for the calls its transcript ends on.
         self._answered.update(b["tool_use_id"] for b in content if b.get("type") == "tool_result")
         await self._write(content)
@@ -384,9 +420,17 @@ class ClaudeSession:
         Input written before the results is already queued when they arrive, so
         the CLI sends both in one request (verified with 2.1.283).
         """
+
+        def reached() -> bool:
+            return bool(self._called & set(self.open_tool_ids)) or self.dead
+
         try:
+            # The CLI may run its web tools first; until they finish, a call
+            # not reaching pcode yet is no sign of a refusal.
+            async with asyncio.timeout(WEB_TOOLS_TIMEOUT_SECONDS):
+                await self._until(lambda: reached() or not self._web_calls)
             async with asyncio.timeout(CALL_TIMEOUT_SECONDS):
-                await self._until(lambda: bool(self._called & set(self.open_tool_ids)) or self.dead)
+                await self._until(reached)
         except TimeoutError:
             self._diverge("no tool call reached pcode")
         self._ask()
@@ -431,20 +475,36 @@ class ClaudeSession:
                     kind = event.get("type")
                     if kind == "message_start":
                         stop_reason = None
+                        self._message_tools = []
                         wanted, self._expecting = self._expecting, False
                         if not wanted:
                             # A request of its own (a nudge after a thinking-only
                             # reply, output-limit recovery, a retried tool call).
                             self._diverge("a message pcode did not ask for")
+                    elif kind == "content_block_start":
+                        block = event.get("content_block") or {}
+                        if block.get("type") == "tool_use":
+                            name = str(block.get("name", ""))
+                            self._message_tools.append(name)
+                            if name in self.config.web_tools:
+                                self._web_calls[block.get("id")] = (name, {})
                     elif kind == "message_delta":
                         stop_reason = (event.get("delta") or {}).get("stop_reason") or stop_reason
                     elif kind == "message_stop" and stop_reason != "tool_use":
                         # The turn ends here; absorb its result message.
                         self._final = True
+                    elif kind == "message_stop" and wanted and self._web_only():
+                        # The CLI runs its web tools and asks again: that next
+                        # message continues the response pcode asked for.
+                        self._expecting = True
                     if wanted:
                         self._queue.put_nowait(("event", event, self._last_uuid))
                 elif isinstance(message, AssistantMessage):
                     self._last_uuid = message.uuid or self._last_uuid
+                    for block in message.content:
+                        call = getattr(block, "id", None)
+                        if call in self._web_calls:
+                            self._web_calls[call] = (block.name, dict(block.input or {}))
                     if message.error:
                         text = " ".join(getattr(b, "text", "") for b in message.content)
                         self._api_error = (message.error, text.strip())
@@ -486,14 +546,41 @@ class ClaudeSession:
         content = message.content if isinstance(message.content, list) else []
         for block in content:
             tool_use_id = getattr(block, "tool_use_id", None)
-            if tool_use_id and tool_use_id not in self._answered and not self._closed:
+            if tool_use_id in self._web_calls:
+                # One of the CLI's own web calls: its result is part of the response.
+                name, args = self._web_calls.pop(tool_use_id)
+                result = result_block(name, tool_use_id, args, block.content, bool(block.is_error))
+                self._queue.put_nowait(("web_result", result, None))
+                self._changed.set()
+            elif tool_use_id and tool_use_id not in self._answered and not self._closed:
                 self._diverge(f"Claude Code answered tool call {tool_use_id} itself")
 
+    def _web_only(self) -> bool:
+        """Whether the message just streamed called the CLI's web tools and nothing else."""
+        return bool(self._message_tools) and all(
+            name in self.config.web_tools for name in self._message_tools
+        )
+
     async def response(self) -> AsyncIterator[dict]:
-        """Raw stream events of the CLI's next assistant message, through message_stop."""
+        """Raw stream events of the CLI's next assistant message, through message_stop.
+
+        A message whose only calls are the CLI's web tools is not the end: the
+        CLI runs them and sends another, which is folded into this one as an
+        Anthropic server tool loop would be. Block indices run on across the
+        messages, the web calls become server tool blocks with their results
+        inserted after them, and usage is the sum of every message folded in.
+        Results of web calls made beside a pcode call arrive after that
+        response ended, so they open the next one.
+        """
         tool_ids: list[str] = []
+        web_ids: list[str] = []
         stop_reason = None
         self.stray_call = False
+        started = False
+        early: list[dict] = []  # web results that came before this message did
+        shift = emitted = 0  # added to the current message's indices; blocks so far
+        folded: dict = {}  # usage of the messages already folded in
+        usage: dict = {}  # usage of the current message, as it accumulates
         while True:
             kind, value, uuid = await self._queue.get()
             if kind == "error":
@@ -502,18 +589,57 @@ class ClaudeSession:
             if kind == "result":
                 self.dead = True
                 raise self._result_error(value)
+            if kind == "web_result":
+                if not started:
+                    early.append(value)
+                    continue
+                for event in _block_events(value, emitted):
+                    yield event
+                emitted += 1
+                continue
             event_type = value.get("type")
+            if event_type == "message_start":
+                tool_ids, web_ids, stop_reason = [], [], None
+                usage = dict((value.get("message") or {}).get("usage") or {})
+                if started:
+                    # A continuation: its usage joins the response's, the rest is known.
+                    yield {"type": "message_delta", "delta": {}, "usage": _sum(folded, usage)}
+                else:
+                    started = True
+                    yield value
+                    for block in early:
+                        for event in _block_events(block, emitted):
+                            yield event
+                        emitted += 1
+                shift = emitted
+                continue
+            if isinstance(value.get("index"), int):
+                value = {**value, "index": value["index"] + shift}
+                emitted = max(emitted, value["index"] + 1)
             if event_type == "content_block_start":
                 block = value.get("content_block") or {}
-                if block.get("type") == "tool_use":
+                wire = str(block.get("name", ""))
+                if block.get("type") == "tool_use" and wire in self.config.web_tools:
+                    web_ids.append(block.get("id"))
+                    value = {**value, "content_block": server_tool_use(block)}
+                elif block.get("type") == "tool_use":
                     tool_ids.append(block.get("id"))
-                    wire = str(block.get("name", ""))
                     self.stray_call = self.stray_call or not wire.startswith(TOOL_PREFIX)
                     name = wire.removeprefix(TOOL_PREFIX)
                     value = {**value, "content_block": {**block, "name": name}}
             elif event_type == "message_delta":
                 stop_reason = (value.get("delta") or {}).get("stop_reason") or stop_reason
+                usage.update(value.get("usage") or {})
+                folding = stop_reason == "tool_use" and web_ids and not tool_ids
+                if folding or folded:
+                    delta = dict(value.get("delta") or {})
+                    if folding:
+                        delta.pop("stop_reason", None)  # the response goes on
+                    value = {**value, "delta": delta, "usage": _sum(folded, usage)}
             elif event_type == "message_stop":
+                if stop_reason == "tool_use" and web_ids and not tool_ids:
+                    folded = _sum(folded, usage)
+                    continue
                 # Settled before handing it over, in case the reader stops here.
                 self.open_tool_ids = tuple(tool_ids) if stop_reason == "tool_use" else ()
                 self.response_uuid = uuid

pcode-0.1.5/src/pcode/claude_sdk/web.py

@@ -0,0 +1,120 @@
+"""The CLI's own `WebSearch`/`WebFetch`, presented as Anthropic server tools.
+
+The CLI runs both itself, between two API messages of one turn. pcode shows
+them the way it shows Anthropic's native web tools: a `server_tool_use` block
+and a result block, built here in the shapes Pydantic AI parses.
+
+The blocks are pcode's record only; the model reads the CLI's own transcript.
+They are tagged with the `claude` provider, so no other model is ever sent
+them, and they are used just for display and for a fresh replay
+(`messages.replay`).
+
+What the CLI returns has no slot in Anthropic's shapes, so it rides in extra
+fields, which Pydantic AI keeps: a search's summary on its first hit
+(`summary`), and a failure's full text beside its code (`message`). Pydantic
+AI also serializes these blocks against the SDK types, so `error_code` must
+stay one of Anthropic's codes or every result logs a serializer warning.
+"""
+
+import json
+import logging
+import re
+from datetime import datetime, timezone
+
+logger = logging.getLogger(__name__)
+
+# CLI tool name -> Anthropic server tool name (also the native tool's `kind`).
+CLI_WEB_TOOLS = {"WebSearch": "web_search", "WebFetch": "web_fetch"}
+
+# The CLI's search result opens with its query, then this JSON list of hits,
+# then a summary its own sub-request wrote.
+_LINKS = re.compile(r"^Links: (\[.*\])$", re.MULTILINE)
+_QUERY = re.compile(r"\AWeb search results for query: .*$", re.MULTILINE)
+# The CLI's closing instruction to its model, not part of the summary.
+_REMINDER = re.compile(r"\n*REMINDER: You MUST include the sources.*\Z", re.DOTALL)
+
+
+def cli_tool_names(native_tools) -> tuple[str, ...]:
+    """The CLI tools that stand in for the native tools a request asks for."""
+    wanted = {tool.kind for tool in native_tools}
+    return tuple(sorted(cli for cli, server in CLI_WEB_TOOLS.items() if server in wanted))
+
+
+def server_tool_use(block: dict) -> dict:
+    """A CLI web `tool_use` block as the `server_tool_use` block it stands for."""
+    return {**block, "type": "server_tool_use", "name": CLI_WEB_TOOLS[block["name"]]}
+
+
+def _text(content: object) -> str:
+    if isinstance(content, str):
+        return content
+    if isinstance(content, list):
+        return "\n".join(str(item.get("text", "")) for item in content if isinstance(item, dict))
+    return ""
+
+
+def _hit(title: str, url: str) -> dict:
+    return {
+        "type": "web_search_result",
+        "title": title,
+        "url": url,
+        # Pydantic AI's result model requires both; the CLI has neither.
+        "encrypted_content": "",
+        "page_age": None,
+    }
+
+
+def _hits(text: str) -> list[dict]:
+    """The hits in the CLI's search text, the first carrying its summary.
+
+    Text with no parseable `Links:` line means the CLI changed its format (an
+    empty search still prints `Links: []`), so that is logged rather than
+    shown as a quiet "0 results"; the text is kept on a URL-less hit.
+    """
+    match = _LINKS.search(text)
+    try:
+        links = json.loads(match.group(1)) if match else None
+    except ValueError:
+        links = None
+    if links is None:
+        logger.warning("Claude Code's WebSearch result has no parseable Links line: %.200r", text)
+        summary = _QUERY.sub("", text)
+    else:
+        summary = text[match.end() :] if match else ""
+    summary = _REMINDER.sub("", summary).strip()
+    hits = [
+        _hit(str(link.get("title") or ""), str(link["url"]))
+        for link in links or []
+        if isinstance(link, dict) and link.get("url")
+    ]
+    if summary:
+        hits = hits or [_hit("", "")]
+        hits[0]["summary"] = summary
+    return hits
+
+
+def result_block(name: str, tool_use_id: str, args: dict, content: object, is_error: bool) -> dict:
+    """The CLI's result for a web tool call as the server tool's result block."""
+    server = CLI_WEB_TOOLS[name]
+    text = _text(content)
+    if is_error:
+        body: object = {
+            "type": f"{server}_tool_result_error",
+            "error_code": "unavailable",
+            "message": text.strip(),
+        }
+    elif server == "web_search":
+        body = _hits(text)
+    else:
+        body = {
+            "type": "web_fetch_result",
+            "url": str(args.get("url") or ""),
+            # When the CLI handed the answer over, which is when it fetched.
+            "retrieved_at": datetime.now(timezone.utc).isoformat(),
+            "content": {
+                "type": "document",
+                "source": {"type": "text", "media_type": "text/plain", "data": text},
+                "title": None,
+            },
+        }
+    return {"type": f"{server}_tool_result", "tool_use_id": tool_use_id, "content": body}