agentshim 0.6.3__tar.gz → 0.6.4__tar.gz

{agentshim-0.6.3 → agentshim-0.6.4}/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.6.4 (2026-09-27)
+
+- Add optional positive finite `startup_timeout_s` to stdio and HTTP MCP
+  server specs. Codex renders it as an invocation-scoped
+  `startup_timeout_sec` override, so slow-starting servers can initialize
+  without modifying the user's config file.
+
 ## 0.6.3 (2026-09-26)
 
 - Narrow Codex `auth_files` to `.codex/auth.json`. User `config.toml` is not

{agentshim-0.6.3 → agentshim-0.6.4}/PKG-INFO

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

{agentshim-0.6.3 → agentshim-0.6.4}/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.3"
+__version__ = "0.6.4"
 
 __all__ = [
     "AgentEvent",

{agentshim-0.6.3 → agentshim-0.6.4}/agentshim/core/mcp.py

@@ -40,15 +40,16 @@ def _no_env() -> Mapping[str, str]:
 class StdioMcpServer:
     """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.
+    ``startup_timeout_s`` bounds initialization and the first tool listing;
+    ``tool_timeout_s`` bounds one tool call. Providers that cannot express a
+    requested per-server timeout reject it rather than silently dropping it.
     """
 
     name: str
     command: str
     args: Sequence[str] = ()
     env: Mapping[str, str] = field(default_factory=_no_env)
+    startup_timeout_s: float | None = None
     tool_timeout_s: float | None = None
 
     def __post_init__(self) -> None:
@@ -63,7 +64,8 @@ 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)
+        _validate_timeout(self.name, "startup_timeout_s", self.startup_timeout_s)
+        _validate_timeout(self.name, "tool_timeout_s", self.tool_timeout_s)
 
 
 #: The two remote MCP transports the CLIs distinguish.
@@ -87,6 +89,7 @@ class HttpMcpServer:
     url: str
     headers: Mapping[str, str] = field(default_factory=_no_env)
     transport: McpTransport = "http"
+    startup_timeout_s: float | None = None
     tool_timeout_s: float | None = None
 
     def __post_init__(self) -> None:
@@ -104,15 +107,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)
+        _validate_timeout(self.name, "startup_timeout_s", self.startup_timeout_s)
+        _validate_timeout(self.name, "tool_timeout_s", self.tool_timeout_s)
 
 
-def _validate_tool_timeout(name: str, timeout_s: float | None) -> None:
+def _validate_timeout(name: str, field_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"
+        msg = f"MCP server {name!r} {field_name} must be a positive finite number"
         raise ValueError(msg)
 
 

{agentshim-0.6.3 → agentshim-0.6.4}/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.startup_timeout_s is not None:
+        msg = "claude cannot configure a per-server MCP startup timeout"
+        raise ProviderCapabilityError(msg)
     if server.tool_timeout_s is not None:
         msg = "claude cannot configure a per-server MCP tool timeout"
         raise ProviderCapabilityError(msg)

{agentshim-0.6.3 → agentshim-0.6.4}/agentshim/providers/codex/provider.py

@@ -190,7 +190,7 @@ def _server_flags(server: McpServer) -> list[str]:
         # A ``--config`` override carries the address and nothing else, so
         # Codex works the transport out from the endpoint itself.
         flags = ["--config", f"{prefix}.url={_toml_str(server.url)}"]
-        return flags + _tool_timeout_flags(prefix, server.tool_timeout_s)
+        return flags + _timeout_flags(prefix, server)
     flags = [
         "--config",
         f"{prefix}.command={_toml_str(server.command)}",
@@ -199,14 +199,17 @@ 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 + _tool_timeout_flags(prefix, server.tool_timeout_s)
+    return flags + _timeout_flags(prefix, server)
 
 
-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 _timeout_flags(prefix: str, server: McpServer) -> list[str]:
+    """Render Codex's per-server timeouts as invocation overrides."""
+    flags: list[str] = []
+    if server.startup_timeout_s is not None:
+        flags += ["--config", f"{prefix}.startup_timeout_sec={server.startup_timeout_s}"]
+    if server.tool_timeout_s is not None:
+        flags += ["--config", f"{prefix}.tool_timeout_sec={server.tool_timeout_s}"]
+    return flags
 
 
 def _toml_str(value: str) -> str:
@@ -280,6 +283,8 @@ def _apply_mcp_override(entry: dict[str, Any], field: str, raw_value: str) -> No
         entry["transport"] = "http"
     elif field == "tool_timeout_sec":
         entry["tool_timeout_s"] = float(raw_value)
+    elif field == "startup_timeout_sec":
+        entry["startup_timeout_s"] = float(raw_value)
     elif field.startswith("env."):
         entry.setdefault("env", {})[field.removeprefix("env.")] = _parse_toml_str(raw_value)
 

{agentshim-0.6.3 → agentshim-0.6.4}/agentshim/providers/copilot/provider.py

@@ -135,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.startup_timeout_s is not None:
+        msg = "copilot cannot configure a per-server MCP startup timeout"
+        raise ProviderCapabilityError(msg)
     if server.tool_timeout_s is not None:
         msg = "copilot cannot configure a per-server MCP tool timeout"
         raise ProviderCapabilityError(msg)

{agentshim-0.6.3 → agentshim-0.6.4}/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.startup_timeout_s is not None:
+        msg = "gemini cannot configure a per-server MCP startup timeout"
+        raise ProviderCapabilityError(msg)
     if server.tool_timeout_s is not None:
         msg = "gemini cannot configure a per-server MCP tool timeout"
         raise ProviderCapabilityError(msg)

{agentshim-0.6.3 → agentshim-0.6.4}/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.startup_timeout_s is not None:
+        msg = "opencode cannot configure a per-server MCP startup timeout"
+        raise ProviderCapabilityError(msg)
     if server.tool_timeout_s is not None:
         msg = "opencode cannot configure a per-server MCP tool timeout"
         raise ProviderCapabilityError(msg)

{agentshim-0.6.3 → agentshim-0.6.4}/pyproject.toml

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