ollama-coding-agent 0.2.0__tar.gz → 0.4.0__tar.gz

{ollama_coding_agent-0.2.0 → ollama_coding_agent-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ollama-coding-agent
-Version: 0.2.0
+Version: 0.4.0
 Summary: AI coding agent driving Qwen Coder (or any Ollama-compatible model) through a scoped toolset via MCP
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/HarryChen1995/coding_agent
@@ -82,31 +82,36 @@ in-process — the agent is an MCP *client* that talks to a tool server over
 stdio:
 
 ```
-┌───────────┐     ┌────────────┐     ┌──────────────┐
-│  CLI/REPL │ --> │ agent loop │ --> │ intent parser│
-└───────────┘     │ (call model│     │ (task ->     │
-                  │  approve,  │     │  structured  │
-                  │  execute,  │     │  intent)     │
-                  │  persist)  │     └──────────────┘
-                  └─────┬──────┘
-       ┌────────────────┼─────────────────┐
-       ▼                ▼                 ▼
-┌───────────────┐ ┌───────────────┐ ┌───────────────────┐
-│ model client  │ │  MCP client   │ │  session store    │
-│ (chat calls)  │ │ (MCP session) │ │  (SQLite history) │
-└───────────────┘ └───────┬───────┘ └───────────────────┘
-                          │ stdio subprocess
-                          ▼
-                   ┌───────────────┐
-                   │  MCP server   │
-                   └───────┬───────┘
-                           ▼
-                   ┌───────────────┐
-                   │     tools     │
-                   │ (read/write/  │
-                   │ edit/search/  │
-                   │    shell)     │
-                   └───────────────┘
++-----------------------------+
+|          CLI / REPL         |
++-----------------------------+
+               |
+               v
++-----------------------------+
+|          Agent loop         |
+|  parse intent, call model,  |
+|  approve, execute, persist  |
++-----------------------------+
+               |
+               v
++-----------------------------+
+|          MCP client         |
+|  built-in + custom servers  |
+|  merged into one tool list  |
++-----------------------------+
+               |
+ stdio / SSE / streamable-http
+               v
++-----------------------------+
+|        MCP server(s)        |
++-----------------------------+
+               |
+               v
++-----------------------------+
+|            Tools            |
+|    read / write / edit /    |
+|        search / shell       |
++-----------------------------+
 ```
 
 Because tools are exposed over MCP, any MCP-compatible client — Claude

{ollama_coding_agent-0.2.0 → ollama_coding_agent-0.4.0}/PYPI_README.md

@@ -61,31 +61,36 @@ in-process — the agent is an MCP *client* that talks to a tool server over
 stdio:
 
 ```
-┌───────────┐     ┌────────────┐     ┌──────────────┐
-│  CLI/REPL │ --> │ agent loop │ --> │ intent parser│
-└───────────┘     │ (call model│     │ (task ->     │
-                  │  approve,  │     │  structured  │
-                  │  execute,  │     │  intent)     │
-                  │  persist)  │     └──────────────┘
-                  └─────┬──────┘
-       ┌────────────────┼─────────────────┐
-       ▼                ▼                 ▼
-┌───────────────┐ ┌───────────────┐ ┌───────────────────┐
-│ model client  │ │  MCP client   │ │  session store    │
-│ (chat calls)  │ │ (MCP session) │ │  (SQLite history) │
-└───────────────┘ └───────┬───────┘ └───────────────────┘
-                          │ stdio subprocess
-                          ▼
-                   ┌───────────────┐
-                   │  MCP server   │
-                   └───────┬───────┘
-                           ▼
-                   ┌───────────────┐
-                   │     tools     │
-                   │ (read/write/  │
-                   │ edit/search/  │
-                   │    shell)     │
-                   └───────────────┘
++-----------------------------+
+|          CLI / REPL         |
++-----------------------------+
+               |
+               v
++-----------------------------+
+|          Agent loop         |
+|  parse intent, call model,  |
+|  approve, execute, persist  |
++-----------------------------+
+               |
+               v
++-----------------------------+
+|          MCP client         |
+|  built-in + custom servers  |
+|  merged into one tool list  |
++-----------------------------+
+               |
+ stdio / SSE / streamable-http
+               v
++-----------------------------+
+|        MCP server(s)        |
++-----------------------------+
+               |
+               v
++-----------------------------+
+|            Tools            |
+|    read / write / edit /    |
+|        search / shell       |
++-----------------------------+
 ```
 
 Because tools are exposed over MCP, any MCP-compatible client — Claude

{ollama_coding_agent-0.2.0 → ollama_coding_agent-0.4.0}/README.md

@@ -162,32 +162,42 @@ converts it to Ollama's function-calling schema, and calls tools through the
 MCP session instead of Python function calls directly.
 
 ```
-┌───────────┐     ┌────────────┐     ┌──────────────┐
-│  cli.py   │ --> │  agent.py  │ --> │  intent.py   │
-│ (Typer    │     │ (call model│     │ (task ->     │
-│  CLI/REPL)│     │  approve,  │     │  structured  │
-└───────────┘     │  execute,  │     │  intent)     │
-                   │  persist)  │     └──────────────┘
-                   └─────┬──────┘
-        ┌────────────────┼─────────────────┐
-        ▼                ▼                 ▼
-┌───────────────┐ ┌───────────────┐ ┌───────────────────┐
-│ollama_client.py│ │ mcp_client.py │ │ session_store.py  │
-│ (model calls) │ │ (MCP session) │ │ (SQLite history)  │
-└───────────────┘ └───────┬───────┘ └───────────────────┘
-                           │ stdio subprocess
-                           ▼
-                   ┌───────────────┐
-                   │ mcp_server.py │
-                   └───────┬───────┘
-                           ▼
-                   ┌───────────────┐
-                   │   tools.py    │
-                   │ (read/write/  │
-                   │  edit/shell,  │
-                   │  scoped to    │
-                   │ project root) │
-                   └───────────────┘
++------------------------------------------+
+|        cli.py  (Typer CLI / REPL)        |
++------------------------------------------+
+                     |
+                     v
++------------------------------------------+
+|                 agent.py                 |
+|    call model, parse intent, approve,    |
+|      execute tools, persist, repeat      |
++------------------------------------------+
+                     |
+                     v
++------------------------------------------+
+|      ollama_client.py (model calls)      |
+|    session_store.py (SQLite history)     |
++------------------------------------------+
+                     |
+                     v
++------------------------------------------+
+|              mcp_client.py               |
+|     built-in + custom servers merged     |
+|      into one namespaced tool list       |
++------------------------------------------+
+                     |
+       stdio / SSE / streamable-http
+                     v
++------------------------------------------+
+|  mcp_server.py  /  custom MCP server(s)  |
++------------------------------------------+
+                     |
+                     v
++------------------------------------------+
+|                 tools.py                 |
+|  read / write / edit / search / shell,   |
+|       each scoped to project_root        |
++------------------------------------------+
 ```
 
 What this buys you:

{ollama_coding_agent-0.2.0 → ollama_coding_agent-0.4.0}/coding_agent/mcp_client.py

@@ -40,6 +40,22 @@ def save_mcp_config(path: str, servers: dict) -> None:
         f.write("\n")
 
 
+def _split_command(s: str) -> list:
+    """Split a command string into tokens, Windows-path-safe. shlex.split()'s
+    default POSIX mode treats backslash as an escape character, which
+    silently eats every backslash in a Windows path (`C:\\Users\\...` becomes
+    `C:Users...`) — so split in non-POSIX mode instead (preserves backslashes
+    literally) and manually strip matching quotes non-POSIX mode leaves on
+    quoted tokens."""
+    tokens = shlex.split(s, posix=False)
+    cleaned = []
+    for t in tokens:
+        if len(t) >= 2 and t[0] == t[-1] and t[0] in ('"', "'"):
+            t = t[1:-1]
+        cleaned.append(t)
+    return cleaned
+
+
 def parse_mcp_server_specs(specs: list) -> dict:
     """Parse repeatable `--mcp-server` CLI values into the same shape
     load_mcp_config() returns, so both sources can be merged uniformly.
@@ -68,7 +84,7 @@ def parse_mcp_server_specs(specs: list) -> dict:
                 raise ValueError(f"Invalid --mcp-server transport {transport!r} for {name!r} — expected one of {_TRANSPORTS}")
             servers[name] = {"url": url, "transport": transport}
         else:
-            parts = shlex.split(rest)
+            parts = _split_command(rest)
             if not parts:
                 raise ValueError(f'Invalid --mcp-server value {spec!r} — expected "name=command args..."')
             servers[name] = {"command": parts[0], "args": parts[1:]}

{ollama_coding_agent-0.2.0 → ollama_coding_agent-0.4.0}/ollama_coding_agent.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ollama-coding-agent
-Version: 0.2.0
+Version: 0.4.0
 Summary: AI coding agent driving Qwen Coder (or any Ollama-compatible model) through a scoped toolset via MCP
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/HarryChen1995/coding_agent
@@ -82,31 +82,36 @@ in-process — the agent is an MCP *client* that talks to a tool server over
 stdio:
 
 ```
-┌───────────┐     ┌────────────┐     ┌──────────────┐
-│  CLI/REPL │ --> │ agent loop │ --> │ intent parser│
-└───────────┘     │ (call model│     │ (task ->     │
-                  │  approve,  │     │  structured  │
-                  │  execute,  │     │  intent)     │
-                  │  persist)  │     └──────────────┘
-                  └─────┬──────┘
-       ┌────────────────┼─────────────────┐
-       ▼                ▼                 ▼
-┌───────────────┐ ┌───────────────┐ ┌───────────────────┐
-│ model client  │ │  MCP client   │ │  session store    │
-│ (chat calls)  │ │ (MCP session) │ │  (SQLite history) │
-└───────────────┘ └───────┬───────┘ └───────────────────┘
-                          │ stdio subprocess
-                          ▼
-                   ┌───────────────┐
-                   │  MCP server   │
-                   └───────┬───────┘
-                           ▼
-                   ┌───────────────┐
-                   │     tools     │
-                   │ (read/write/  │
-                   │ edit/search/  │
-                   │    shell)     │
-                   └───────────────┘
++-----------------------------+
+|          CLI / REPL         |
++-----------------------------+
+               |
+               v
++-----------------------------+
+|          Agent loop         |
+|  parse intent, call model,  |
+|  approve, execute, persist  |
++-----------------------------+
+               |
+               v
++-----------------------------+
+|          MCP client         |
+|  built-in + custom servers  |
+|  merged into one tool list  |
++-----------------------------+
+               |
+ stdio / SSE / streamable-http
+               v
++-----------------------------+
+|        MCP server(s)        |
++-----------------------------+
+               |
+               v
++-----------------------------+
+|            Tools            |
+|    read / write / edit /    |
+|        search / shell       |
++-----------------------------+
 ```
 
 Because tools are exposed over MCP, any MCP-compatible client — Claude

{ollama_coding_agent-0.2.0 → ollama_coding_agent-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ollama-coding-agent"
-version = "0.2.0"
+version = "0.4.0"
 description = "AI coding agent driving Qwen Coder (or any Ollama-compatible model) through a scoped toolset via MCP"
 readme = "PYPI_README.md"
 requires-python = ">=3.10"