agentshim 0.6.1__tar.gz → 0.6.2__tar.gz

{agentshim-0.6.1 → agentshim-0.6.2}/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.6.2 (2026-09-26)
+
+- Add optional positive finite `tool_timeout_s` to stdio and HTTP MCP server
+  specs. Codex renders it as an invocation-scoped `tool_timeout_sec` config
+  override; providers that cannot represent it reject the request explicitly.
+
 ## 0.6.1 (2026-09-10)
 
 Additive only: every new field defaults, so a 0.6.0 consumer's existing

{agentshim-0.6.1 → agentshim-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: agentshim
-Version: 0.6.1
+Version: 0.6.2
 Summary: Provider-agnostic coding-agent CLI shims
 Requires-Python: >=3.10
 Provides-Extra: test

{agentshim-0.6.1 → agentshim-0.6.2}/agentshim/__init__.py

@@ -84,7 +84,7 @@ from .providers.copilot import CopilotProvider
 from .providers.gemini import GeminiProvider
 from .providers.opencode import OpencodeProvider
 
-__version__ = "0.6.0"
+__version__ = "0.6.2"
 
 __all__ = [
     "AgentEvent",

{agentshim-0.6.1 → agentshim-0.6.2}/agentshim/core/mcp.py

@@ -14,6 +14,7 @@ each concurrent turn its own workspace.
 from __future__ import annotations
 
 import json
+import math
 from dataclasses import dataclass, field
 from types import MappingProxyType
 from typing import TYPE_CHECKING, Any, Literal, cast
@@ -37,12 +38,18 @@ def _no_env() -> Mapping[str, str]:
 
 @dataclass(frozen=True)
 class StdioMcpServer:
-    """MCP server launched as a subprocess over stdio."""
+    """MCP server launched as a subprocess over stdio.
+
+    ``tool_timeout_s`` is the maximum time one tool call may run. Providers
+    that cannot express a per-server tool timeout reject a non-``None`` value
+    rather than silently dropping it.
+    """
 
     name: str
     command: str
     args: Sequence[str] = ()
     env: Mapping[str, str] = field(default_factory=_no_env)
+    tool_timeout_s: float | None = None
 
     def __post_init__(self) -> None:
         """Reject a spec the provider could never launch.
@@ -56,6 +63,7 @@ class StdioMcpServer:
         if not self.command:
             msg = f"MCP server {self.name!r} must declare a command"
             raise ValueError(msg)
+        _validate_tool_timeout(self.name, self.tool_timeout_s)
 
 
 #: The two remote MCP transports the CLIs distinguish.
@@ -79,6 +87,7 @@ class HttpMcpServer:
     url: str
     headers: Mapping[str, str] = field(default_factory=_no_env)
     transport: McpTransport = "http"
+    tool_timeout_s: float | None = None
 
     def __post_init__(self) -> None:
         """Reject a spec the provider could never reach.
@@ -95,6 +104,16 @@ class HttpMcpServer:
         if self.transport not in _TRANSPORTS:
             msg = f"MCP server {self.name!r} transport must be one of {_TRANSPORTS}"
             raise ValueError(msg)
+        _validate_tool_timeout(self.name, self.tool_timeout_s)
+
+
+def _validate_tool_timeout(name: str, timeout_s: float | None) -> None:
+    """Reject timeout values no provider can apply meaningfully."""
+    if timeout_s is None:
+        return
+    if isinstance(timeout_s, bool) or not math.isfinite(timeout_s) or timeout_s <= 0:
+        msg = f"MCP server {name!r} tool_timeout_s must be a positive finite number"
+        raise ValueError(msg)
 
 
 McpServer = StdioMcpServer | HttpMcpServer

{agentshim-0.6.1 → agentshim-0.6.2}/agentshim/providers/claude/provider.py

@@ -162,6 +162,9 @@ def _resumed_session_id(argv: Sequence[str]) -> str | None:
 
 def mcp_entry(server: McpServer) -> dict[str, Any]:
     """Render one server the way ``.mcp.json`` describes it."""
+    if server.tool_timeout_s is not None:
+        msg = "claude cannot configure a per-server MCP tool timeout"
+        raise ProviderCapabilityError(msg)
     if isinstance(server, HttpMcpServer):
         # Claude validates the config strictly and needs an explicit type; it
         # names the two remote transports exactly as the spec does.

{agentshim-0.6.1 → agentshim-0.6.2}/agentshim/providers/codex/provider.py

@@ -186,7 +186,8 @@ def _server_flags(server: McpServer) -> list[str]:
             raise ProviderCapabilityError(_HTTP_HEADERS_UNSUPPORTED)
         # A ``--config`` override carries the address and nothing else, so
         # Codex works the transport out from the endpoint itself.
-        return ["--config", f"{prefix}.url={_toml_str(server.url)}"]
+        flags = ["--config", f"{prefix}.url={_toml_str(server.url)}"]
+        return flags + _tool_timeout_flags(prefix, server.tool_timeout_s)
     flags = [
         "--config",
         f"{prefix}.command={_toml_str(server.command)}",
@@ -195,7 +196,14 @@ def _server_flags(server: McpServer) -> list[str]:
     ]
     for env_key, env_value in server.env.items():
         flags += ["--config", f"{prefix}.env.{env_key}={_toml_str(env_value)}"]
-    return flags
+    return flags + _tool_timeout_flags(prefix, server.tool_timeout_s)
+
+
+def _tool_timeout_flags(prefix: str, timeout_s: float | None) -> list[str]:
+    """Render Codex's per-server tool timeout as an invocation override."""
+    if timeout_s is None:
+        return []
+    return ["--config", f"{prefix}.tool_timeout_sec={timeout_s}"]
 
 
 def _toml_str(value: str) -> str:
@@ -267,6 +275,8 @@ def _apply_mcp_override(entry: dict[str, Any], field: str, raw_value: str) -> No
     elif field == "url":
         entry["url"] = _parse_toml_str(raw_value)
         entry["transport"] = "http"
+    elif field == "tool_timeout_sec":
+        entry["tool_timeout_s"] = float(raw_value)
     elif field.startswith("env."):
         entry.setdefault("env", {})[field.removeprefix("env.")] = _parse_toml_str(raw_value)
 

{agentshim-0.6.1 → agentshim-0.6.2}/agentshim/providers/copilot/provider.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import json
 from typing import TYPE_CHECKING, Any
 
+from agentshim.core.errors import ProviderCapabilityError
 from agentshim.core.mcp import FlagsInstallation, HttpMcpServer, NoopInstallation
 from agentshim.core.profile import McpMechanism, OutputSchemaStyle, ProviderProfile
 
@@ -134,6 +135,9 @@ class CopilotProvider:
 
 def mcp_entry(server: McpServer) -> dict[str, Any]:
     """Render one server the way ``--additional-mcp-config`` describes it."""
+    if server.tool_timeout_s is not None:
+        msg = "copilot cannot configure a per-server MCP tool timeout"
+        raise ProviderCapabilityError(msg)
     if isinstance(server, HttpMcpServer):
         # Copilot uses the spec's own transport names in ``type``.
         entry: dict[str, Any] = {"type": server.transport, "url": server.url}

{agentshim-0.6.1 → agentshim-0.6.2}/agentshim/providers/gemini/provider.py

@@ -154,6 +154,9 @@ def mcp_entry(server: McpServer) -> dict[str, Any]:
     ``trust: true`` skips Gemini's per-tool approval prompt for servers the
     caller installed on purpose.
     """
+    if server.tool_timeout_s is not None:
+        msg = "gemini cannot configure a per-server MCP tool timeout"
+        raise ProviderCapabilityError(msg)
     if isinstance(server, HttpMcpServer):
         # Gemini picks the transport by which key holds the address:
         # ``httpUrl`` is streamable HTTP, plain ``url`` is SSE.

{agentshim-0.6.1 → agentshim-0.6.2}/agentshim/providers/opencode/provider.py

@@ -159,6 +159,9 @@ def mcp_entry(server: McpServer) -> dict[str, Any]:
     non-interactive ``run`` mode auto-answers permission prompts, so no
     extra ``permission`` block is needed.
     """
+    if server.tool_timeout_s is not None:
+        msg = "opencode cannot configure a per-server MCP tool timeout"
+        raise ProviderCapabilityError(msg)
     if isinstance(server, HttpMcpServer):
         # opencode has one remote server type and negotiates the transport
         # itself, so ``transport`` has nothing to select here.

{agentshim-0.6.1 → agentshim-0.6.2}/agentshim/testing/__init__.py

@@ -215,7 +215,8 @@ def installed_mcp_servers(
     Each entry is a plain dict in a canonical shape, regardless of how the
     provider itself renders it: ``command``, ``args`` and ``env`` for a
     server started over stdio, ``url`` and ``transport`` for one reached over
-    HTTP.
+    HTTP. Either shape includes ``tool_timeout_s`` when the invocation set
+    one.
 
     Args:
         provider: A registered provider name.

{agentshim-0.6.1 → agentshim-0.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentshim"
-version = "0.6.1"
+version = "0.6.2"
 description = "Provider-agnostic coding-agent CLI shims"
 readme = "README.md"
 requires-python = ">=3.10"