gdmcode 0.1.9__tar.gz → 0.1.11__tar.gz

{gdmcode-0.1.9 → gdmcode-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gdmcode
-Version: 0.1.9
+Version: 0.1.11
 Summary: gdm: AI coding agent for professional developers
 Project-URL: Homepage, https://github.com/guidegdm/gdmcode
 Project-URL: Repository, https://github.com/guidegdm/gdmcode

gdmcode-0.1.11/gdmcode/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.11"

{gdmcode-0.1.9 → gdmcode-0.1.11}/gdmcode/agent/loop.py

@@ -50,33 +50,33 @@ try:
     _analytics: "_UsageAnalytics | None" = _UsageAnalytics()
 except Exception:  # noqa: BLE001
     _analytics = None
-
-try:
-    from gdmcode.agent.risk_scorer import score_patch, RiskTier
-    _risk_scorer_available = True
-except Exception:  # noqa: BLE001
-    _risk_scorer_available = False
-
-
-def _check_patch_risk(diff, file_paths=None, autonomy_level=2):
-    """Score a patch diff and enforce risk gates based on autonomy level.
-
-    - CRITICAL (score >= block_threshold) and autonomy_level < 4: raises RuntimeError.
-    - HIGH tier and autonomy_level < 3: logs a warning (non-blocking).
-    - Always returns the PatchRiskResult (or None if scorer unavailable).
-    """
-    if not _risk_scorer_available:
-        return None
-    result = score_patch(diff, file_paths)
-    log.info("patch_risk score=%.3f tier=%s blocked=%s", result.score, result.tier, result.blocked)
-    if result.triggered_signals:
-        log.debug("patch_risk rationale:\n%s", result.rationale)
-    if result.blocked and autonomy_level < 4:
-        raise RuntimeError(f"Patch blocked: {result.rationale}")
-    if result.tier == RiskTier.HIGH and autonomy_level < 3:
-        log.warning("High-risk patch detected (score=%.3f). Review before applying:\n%s",
-                    result.score, result.rationale)
-    return result
+
+try:
+    from gdmcode.agent.risk_scorer import score_patch, RiskTier
+    _risk_scorer_available = True
+except Exception:  # noqa: BLE001
+    _risk_scorer_available = False
+
+
+def _check_patch_risk(diff, file_paths=None, autonomy_level=2):
+    """Score a patch diff and enforce risk gates based on autonomy level.
+
+    - CRITICAL (score >= block_threshold) and autonomy_level < 4: raises RuntimeError.
+    - HIGH tier and autonomy_level < 3: logs a warning (non-blocking).
+    - Always returns the PatchRiskResult (or None if scorer unavailable).
+    """
+    if not _risk_scorer_available:
+        return None
+    result = score_patch(diff, file_paths)
+    log.info("patch_risk score=%.3f tier=%s blocked=%s", result.score, result.tier, result.blocked)
+    if result.triggered_signals:
+        log.debug("patch_risk rationale:\n%s", result.rationale)
+    if result.blocked and autonomy_level < 4:
+        raise RuntimeError(f"Patch blocked: {result.rationale}")
+    if result.tier == RiskTier.HIGH and autonomy_level < 3:
+        log.warning("High-risk patch detected (score=%.3f). Review before applying:\n%s",
+                    result.score, result.rationale)
+    return result
 
 def _record_usage(
     session_id: str,
@@ -505,6 +505,11 @@ class AgentLoop:
             self._model = get_model(tier, self._cfg.provider)
             self._model_id = self._model.id
             self._gdm_client = self._make_client()
+            yield AgentEvent(
+                EventType.THINKING,
+                content=f"Using {self._model_id} for this turn.",
+                turn=0,
+            )
             log.debug(
                 "ModelRouter selected tier=%s mode=%s for prompt=%r",
                 tier,
@@ -587,6 +592,14 @@ class AgentLoop:
                     log.warning("BTW queue drain failed: %s", _btw_exc)
 
             tools = self._build_tool_specs()
+            yield AgentEvent(
+                EventType.THINKING,
+                content=(
+                    "Asking the model to choose the next step"
+                    + (f" with {len(tools)} available tools." if tools else ".")
+                ),
+                turn=turn_num,
+            )
             try:
                 response = self._gdm_client.complete(
                     self._transcript.to_messages(),
@@ -686,6 +699,13 @@ class AgentLoop:
 
             # Execute tool calls
             if raw_tool_calls:
+                tool_names = ", ".join(str(tc.get("function", {}).get("name", "tool")) for tc in raw_tool_calls[:3])
+                extra = "" if len(raw_tool_calls) <= 3 else f" (+{len(raw_tool_calls) - 3} more)"
+                yield AgentEvent(
+                    EventType.THINKING,
+                    content=f"Model selected tool step: {tool_names}{extra}.",
+                    turn=turn_num,
+                )
                 # Guard: finish_reason=tool_calls with empty list → infinite loop
                 if not msg.tool_calls:
                     yield AgentEvent(EventType.ERROR, turn=turn_num,
@@ -694,6 +714,11 @@ class AgentLoop:
                     return
 
                 yield from self._execute_tool_calls(msg.tool_calls, turn_num)
+                yield AgentEvent(
+                    EventType.THINKING,
+                    content="Feeding tool results back to the model.",
+                    turn=turn_num,
+                )
                 continue  # loop back to model with tool results
 
             # Natural completion
@@ -1407,4 +1432,3 @@ def write_autonomy_audit(
         (session_id, time.time(), level, action, json.dumps(details), checkpoint_id),
     )
     db_conn.commit()
-

{gdmcode-0.1.9 → gdmcode-0.1.11}/gdmcode/cli.py

@@ -29,6 +29,7 @@ import shutil
 import httpx
 import typer
 from rich.console import Console
+from rich.markup import escape
 
 from gdmcode import __version__
 from gdmcode.config import load_config
@@ -1301,7 +1302,14 @@ def _run_one_shot(cfg: object, prompt: str, *, yes: bool, model_override: str |
     had_error = False
     try:
         for event in loop.run(prompt):  # type: ignore[union-attr]
-            if event.type == EventType.RESPONSE:
+            if event.type == EventType.THINKING:
+                status.stop()
+                snippet = str(event.content or "")[:120]
+                if snippet:
+                    console.print(f"[dim cyan]… {snippet}[/dim cyan]")
+                status.start()
+                status.update("[cyan]Working...[/cyan]")
+            elif event.type == EventType.RESPONSE:
                 status.stop()
                 console.print(event.content)
             elif event.type == EventType.ERROR:

{gdmcode-0.1.9 → gdmcode-0.1.11}/gdmcode/integrations/mcp_server.py

@@ -51,7 +51,7 @@ _INTERNAL_ERROR   = -32603
 class MCPServer:
     """Minimal MCP server with stdio transport."""
 
-    def __init__(self, name: str = "gdmcode", version: str = "0.1.9") -> None:
+    def __init__(self, name: str = "gdmcode", version: str = "0.1.11") -> None:
         self._name = name
         self._version = version
         self._tools: dict[str, MCPTool] = {}

{gdmcode-0.1.9 → gdmcode-0.1.11}/gdmcode/permissions.py

@@ -14,6 +14,7 @@ Decision hierarchy (first match wins):
 from __future__ import annotations
 
 import logging
+import sys
 from dataclasses import dataclass, field
 from enum import StrEnum
 from typing import TYPE_CHECKING
@@ -61,6 +62,40 @@ log = logging.getLogger(__name__)
 _active_bridge: "PermissionBridge | None" = None
 
 
+def _read_permission_choice() -> str:
+    """Read a permission choice using plain stdin/stdout.
+
+    Rich/Prompt.ask can interact poorly with active terminal renderers on some
+    Windows shells. A simple flushed line prompt keeps the approval input
+    editable and visible.
+    """
+    valid = {
+        "": "y",
+        "y": "y",
+        "yes": "y",
+        "n": "n",
+        "no": "n",
+        "s": "session",
+        "session": "session",
+        "a": "always",
+        "always": "always",
+        "v": "never",
+        "never": "never",
+    }
+    prompt = "Allow? type y/n/session/always/never and press Enter [y]: "
+    while True:
+        sys.stdout.write(prompt)
+        sys.stdout.flush()
+        line = sys.stdin.readline()
+        if line == "":
+            return "n"
+        choice = valid.get(line.strip().lower())
+        if choice is not None:
+            return choice
+        sys.stdout.write("Please enter y, n, session, always, or never.\n")
+        sys.stdout.flush()
+
+
 def set_permission_bridge(bridge: "PermissionBridge") -> None:
     """Activate a PermissionBridge so _prompt_user() delegates to it."""
     global _active_bridge
@@ -250,9 +285,9 @@ class PermissionContext:
             self._session_allow = self._session_allow | {tool}
             return Decision.ALLOW_SESSION
 
-        # Rich prompt — imported lazily to avoid circular dep at module init
+        # Rich output only; use plain stdin for the actual answer so terminal
+        # input remains editable even after prompt_toolkit/status rendering.
         from rich.console import Console
-        from rich.prompt import Prompt
 
         console = Console()
         console.print(f"\n[bold yellow]⚠  Permission request[/bold yellow]")
@@ -261,11 +296,7 @@ class PermissionContext:
             import json
             console.print(f"Args: [dim]{json.dumps(args, indent=2)[:400]}[/dim]")
 
-        choice = Prompt.ask(
-            "Allow?",
-            choices=["y", "n", "always", "session", "never"],
-            default="y",
-        )
+        choice = _read_permission_choice()
 
         decision_map = {
             "y": Decision.ALLOW_SESSION,

{gdmcode-0.1.9 → gdmcode-0.1.11}/gdmcode/repl.py

@@ -177,8 +177,11 @@ def _render_event(event: object, status: Status, console: Console) -> bool:
     match ev.type:  # type: ignore[union-attr]
         case EventType.THINKING:
             snippet = str(ev.content or "")[:100]  # type: ignore[union-attr]
-            label = f"[dim cyan]Thinking... {snippet}[/dim cyan]"
-            status.update(label)
+            status.stop()
+            if snippet:
+                console.print(f"[dim cyan]… {escape(snippet)}[/dim cyan]")
+            status.start()
+            status.update("[cyan]Working...[/cyan]")
         case EventType.TOOL_CALL:
             status.stop()
             console.print(f"[yellow][tool] {ev.tool_name}({_fmt_args(ev.args)})[/yellow]")  # type: ignore[union-attr]

{gdmcode-0.1.9 → gdmcode-0.1.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "gdmcode"
-version = "0.1.9"
+version = "0.1.11"
 description = "gdm: AI coding agent for professional developers"
 readme = "README.md"
 license = { text = "MIT" }

{gdmcode-0.1.9 → gdmcode-0.1.11}/tests/test_loop.py

@@ -268,6 +268,10 @@ class TestAgentLoop:
 
         mock_orchestrator.execute.assert_called_once_with("bash", {"command": "ls"}, model_id=loop._model.id)
         event_types = [e.type for e in events]
+        thinking = [e.content for e in events if e.type == EventType.THINKING]
+        assert any("Asking the model" in content for content in thinking)
+        assert any("Model selected tool step: bash" in content for content in thinking)
+        assert any("Feeding tool results back" in content for content in thinking)
         assert EventType.TOOL_CALL in event_types
         assert EventType.TOOL_RESULT in event_types
         assert EventType.DONE in event_types

{gdmcode-0.1.9 → gdmcode-0.1.11}/tests/test_permissions.py

@@ -104,3 +104,25 @@ def test_non_interactive_denies_unknown(mock_db):
     with pytest.raises(ToolPermissionError) as exc_info:
         ctx_ni.check("some_tool", {})
     assert "non-interactive" in str(exc_info.value).lower()
+
+
+def test_plain_permission_prompt_accepts_yes(ctx, monkeypatch):
+    monkeypatch.setattr("sys.stdin.readline", lambda: "y\n")
+
+    assert ctx.check("bash", {"command": "ls -F"}) == Decision.ALLOW_SESSION
+
+
+def test_plain_permission_prompt_denies_no(ctx, monkeypatch):
+    monkeypatch.setattr("sys.stdin.readline", lambda: "n\n")
+
+    with pytest.raises(ToolPermissionError) as exc_info:
+        ctx.check("bash", {"command": "ls -F"})
+
+    assert "denied by user" in str(exc_info.value).lower()
+
+
+def test_plain_permission_prompt_reprompts_invalid_choice(ctx, monkeypatch):
+    choices = iter(["maybe\n", "always\n"])
+    monkeypatch.setattr("sys.stdin.readline", lambda: next(choices))
+
+    assert ctx.check("bash", {"command": "ls -F"}) == Decision.ALLOW_ALWAYS

gdmcode-0.1.9/gdmcode/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.9"