agentirc-cli 4.3.6__tar.gz → 4.3.7__tar.gz

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 
 Format follows [Keep a Changelog](https://keepachangelog.com/).
 
+## [4.3.7] - 2026-04-07
+
+
+### Fixed
+
+- Extract duplicate string constants (S1192, #85)
+- Remove redundant exception classes in except clauses (S5713, #86)
+- Clean up unused variables and function parameters (S1481/S1172, #88)
+- Remove f-strings without replacement fields (S3457, #89)
+- Address hardcoded credential warnings with test constants (S2068, #90)
+- Fix miscellaneous code quality issues: asyncio.timeout, nested ternaries, empty methods, CSS contrast (S7483/S3358/S1186/S7924, #91)
+
 ## [4.3.6] - 2026-04-07
 
 

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentirc-cli
-Version: 4.3.6
+Version: 4.3.7
 Summary: Legacy alias for culture — install culture instead
 Project-URL: Homepage, https://github.com/OriNachum/culture
 Author: Ori Nachum

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/bots/bot_manager.py

@@ -6,15 +6,19 @@ import logging
 from typing import TYPE_CHECKING
 
 from culture.bots.bot import Bot
-from culture.bots.config import BOTS_DIR, BotConfig, load_bot_config, save_bot_config
+from culture.bots.config import (
+    BOT_CONFIG_FILE,
+    BOTS_DIR,
+    BotConfig,
+    load_bot_config,
+    save_bot_config,
+)
 
 if TYPE_CHECKING:
     from culture.server.ircd import IRCd
 
 logger = logging.getLogger(__name__)
 
-BOT_CONFIG_FILE = "bot.yaml"
-
 
 class BotManager:
     """Loads, starts, stops, and dispatches webhooks to bots."""

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/bots/config.py

@@ -10,6 +10,7 @@ from pathlib import Path
 import yaml
 
 BOTS_DIR = Path(os.path.expanduser("~/.culture/bots"))
+BOT_CONFIG_FILE = "bot.yaml"
 
 
 @dataclass

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/cli/agent.py

@@ -399,7 +399,7 @@ def _probe_server_connection(host: str, port: int, server_name: str) -> None:
     try:
         with _socket.create_connection((host, port), timeout=2):
             pass
-    except (ConnectionRefusedError, OSError):
+    except OSError:
         hint = ""
         server_pid = read_pid(f"server-{server_name}")
         if not server_pid or not is_process_alive(server_pid):

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/cli/channel.py

@@ -55,7 +55,7 @@ def dispatch(args: argparse.Namespace) -> None:
         sys.exit(1)
     try:
         handler(args)
-    except (ConnectionError, ConnectionRefusedError, TimeoutError, OSError) as exc:
+    except (TimeoutError, OSError) as exc:
         msg = str(exc)
         if (
             "Timed out" in msg

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/cli/mesh.py

@@ -15,7 +15,6 @@ from culture.clients.claude.config import (
     load_config,
     load_config_or_default,
 )
-from culture.pidfile import is_process_alive, read_pid
 
 from .shared.constants import AGENTS_YAML, CULTURE_DIR, DEFAULT_CONFIG
 from .shared.mesh import build_server_start_cmd, generate_mesh_from_agents
@@ -469,7 +468,7 @@ def _wait_for_server_port(port: int, retries: int = 50, interval: float = 0.1) -
         try:
             with _socket.create_connection(("localhost", port), timeout=1):
                 return
-        except (ConnectionRefusedError, OSError):
+        except OSError:
             time.sleep(interval)
 
 

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/cli/shared/constants.py

@@ -2,6 +2,8 @@
 
 import os
 
+from culture.bots.config import BOT_CONFIG_FILE  # noqa: F401
+
 DEFAULT_CONFIG = os.path.expanduser("~/.culture/agents.yaml")
 LOG_DIR = os.path.expanduser("~/.culture/logs")
 
@@ -9,7 +11,6 @@ _CONFIG_HELP = "Config file path"
 _SERVER_NAME_HELP = "Server name"
 _BOT_NAME_HELP = "Bot name"
 
-BOT_CONFIG_FILE = "bot.yaml"
 DEFAULT_CHANNEL = "#general"
 NO_AGENTS_MSG = "No agents configured"
 CULTURE_DIR = ".culture"

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/cli/shared/ipc.py

@@ -24,7 +24,7 @@ async def ipc_request(socket_path: str, msg_type: str, **kwargs) -> dict | None:
             asyncio.open_unix_connection(socket_path),
             timeout=3.0,
         )
-    except (ConnectionRefusedError, FileNotFoundError, OSError):
+    except OSError:
         return None
     try:
         req = make_request(msg_type, **kwargs)
@@ -40,13 +40,13 @@ async def ipc_request(socket_path: str, msg_type: str, **kwargs) -> dict | None:
             msg = decode_message(data)
             if msg and msg.get("type") == "response":
                 return msg
-    except (asyncio.TimeoutError, ConnectionError, BrokenPipeError, OSError):
+    except OSError:
         return None
     finally:
         writer.close()
         try:
             await writer.wait_closed()
-        except (ConnectionError, BrokenPipeError, OSError):
+        except OSError:
             pass
 
 

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/clients/acp/agent_runner.py

@@ -151,7 +151,8 @@ class ACPAgentRunner:
             return
         try:
             self._process.terminate()
-            await asyncio.wait_for(self._process.wait(), timeout=5)
+            async with asyncio.timeout(5):
+                await self._process.wait()
         except (asyncio.TimeoutError, ProcessLookupError):
             try:
                 self._process.kill()
@@ -209,7 +210,8 @@ class ACPAgentRunner:
         await self._process.stdin.drain()
 
         try:
-            return await asyncio.wait_for(future, timeout=timeout)
+            async with asyncio.timeout(timeout):
+                return await future
         except (asyncio.TimeoutError, asyncio.CancelledError):
             self._pending.pop(req_id, None)
             if not future.done():
@@ -244,14 +246,16 @@ class ACPAgentRunner:
         if not self._process:
             return -1
         try:
-            return await asyncio.wait_for(self._process.wait(), timeout=5)
+            async with asyncio.timeout(5):
+                return await self._process.wait()
         except asyncio.TimeoutError:
             try:
                 self._process.kill()
             except ProcessLookupError:
                 pass
             try:
-                return await asyncio.wait_for(self._process.wait(), timeout=1)
+                async with asyncio.timeout(1):
+                    return await self._process.wait()
             except asyncio.TimeoutError:
                 return -1
 

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/clients/acp/daemon.py

@@ -31,6 +31,8 @@ logger = logging.getLogger(__name__)
 
 # IPC validation error messages
 _ERR_MISSING_CHANNEL = "Missing 'channel'"
+_ERR_MISSING_CHANNEL_THREAD = "Missing 'channel' or 'thread'"
+_ERR_MISSING_CHANNEL_THREAD_MSG = "Missing 'channel', 'thread', or 'message'"
 
 MAX_CRASH_COUNT = 3
 CRASH_WINDOW_SECONDS = 300
@@ -304,7 +306,7 @@ class ACPDaemon:
         prompt = (
             f"[IRC Channel Poll: {channel}] Recent unread messages:\n"
             f"{lines}\n\n"
-            f"Respond naturally if any messages need your attention."
+            "Respond naturally if any messages need your attention."
         )
         self._mention_targets.append(channel)
         task = asyncio.create_task(self._agent_runner.send_prompt(prompt))
@@ -485,10 +487,10 @@ class ACPDaemon:
             return self.agent.system_prompt
         return (
             f"You are {self.agent.nick}, an AI agent on the culture IRC network.\n"
-            f"You have IRC tools available via the irc skill. Use them to communicate.\n"
+            "You have IRC tools available via the irc skill. Use them to communicate.\n"
             f"Your working directory is {self.agent.directory}.\n"
-            f"Check IRC channels periodically with irc_read() for new messages.\n"
-            f"When you finish a task, share results in the appropriate channel with irc_send()."
+            "Check IRC channels periodically with irc_read() for new messages.\n"
+            "When you finish a task, share results in the appropriate channel with irc_send()."
         )
 
     async def _record_crash_time(self, exit_code: int) -> None:
@@ -642,6 +644,13 @@ class ACPDaemon:
         if query and running and not self._paused:
             description = await self._query_agent_status()
 
+        if self._paused:
+            activity = "paused"
+        elif running:
+            activity = "working"
+        else:
+            activity = "idle"
+
         return make_response(
             req_id,
             ok=True,
@@ -650,7 +659,7 @@ class ACPDaemon:
                 "paused": self._paused,
                 "turn_count": turn_count,
                 "last_activation": self._last_activation,
-                "activity": "paused" if self._paused else ("working" if running else "idle"),
+                "activity": activity,
                 "description": description,
             },
         )
@@ -687,7 +696,8 @@ class ACPDaemon:
                 "[SYSTEM] Briefly describe what you are currently working on "
                 "in one sentence. Reply with just the description, no preamble."
             )
-            await asyncio.wait_for(self._status_query_event.wait(), timeout=10.0)
+            async with asyncio.timeout(10.0):
+                await self._status_query_event.wait()
             return self._truncate_first_line(self._status_query_response) or "nothing"
         except asyncio.TimeoutError:
             return "busy (no response)"
@@ -744,9 +754,7 @@ class ACPDaemon:
         thread_name = msg.get("thread", "")
         text = msg.get("message", "")
         if not channel or not thread_name or not text:
-            return make_response(
-                req_id, ok=False, error="Missing 'channel', 'thread', or 'message'"
-            )
+            return make_response(req_id, ok=False, error=_ERR_MISSING_CHANNEL_THREAD_MSG)
         assert self._transport is not None
         await self._transport.send_thread_create(channel, thread_name, text)
         return make_response(req_id, ok=True)
@@ -756,9 +764,7 @@ class ACPDaemon:
         thread_name = msg.get("thread", "")
         text = msg.get("message", "")
         if not channel or not thread_name or not text:
-            return make_response(
-                req_id, ok=False, error="Missing 'channel', 'thread', or 'message'"
-            )
+            return make_response(req_id, ok=False, error=_ERR_MISSING_CHANNEL_THREAD_MSG)
         assert self._transport is not None
         await self._transport.send_thread_reply(channel, thread_name, text)
         return make_response(req_id, ok=True)
@@ -776,7 +782,7 @@ class ACPDaemon:
         thread_name = msg.get("thread", "")
         summary = msg.get("summary", "")
         if not channel or not thread_name:
-            return make_response(req_id, ok=False, error="Missing 'channel' or 'thread'")
+            return make_response(req_id, ok=False, error=_ERR_MISSING_CHANNEL_THREAD)
         assert self._transport is not None
         await self._transport.send_thread_close(channel, thread_name, summary)
         return make_response(req_id, ok=True)
@@ -786,7 +792,7 @@ class ACPDaemon:
         thread_name = msg.get("thread", "")
         limit = int(msg.get("limit", 50))
         if not channel or not thread_name:
-            return make_response(req_id, ok=False, error="Missing 'channel' or 'thread'")
+            return make_response(req_id, ok=False, error=_ERR_MISSING_CHANNEL_THREAD)
         assert self._buffer is not None
         messages = self._buffer.read_thread(channel, thread_name, limit=limit)
         return make_response(

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/clients/acp/irc_transport.py

@@ -60,7 +60,7 @@ class IRCTransport:
     async def _do_connect(self) -> None:
         try:
             self._reader, self._writer = await asyncio.open_connection(self.host, self.port)
-        except (ConnectionRefusedError, OSError) as exc:
+        except OSError as exc:
             raise ConnectionError(
                 f"Cannot connect to IRC server at {self.host}:{self.port} "
                 f"- is the server running?"
@@ -77,12 +77,12 @@ class IRCTransport:
         if self._writer:
             try:
                 await self._send_raw("QUIT :daemon shutdown")
-            except (ConnectionError, OSError):
+            except OSError:
                 pass
             self._writer.close()
             try:
                 await self._writer.wait_closed()
-            except (ConnectionError, BrokenPipeError):
+            except ConnectionError:
                 pass
         self.connected = False
 
@@ -139,7 +139,7 @@ class IRCTransport:
                         await self._handle(msg)
         except asyncio.CancelledError:
             raise
-        except (ConnectionError, OSError):
+        except OSError:
             logger.warning("IRC connection lost")
         finally:
             self.connected = False
@@ -159,7 +159,7 @@ class IRCTransport:
                 logger.info("Reconnected to IRC")
                 self._reconnecting = False
                 return
-            except (ConnectionError, OSError):
+            except OSError:
                 delay = min(delay * 2, 60)
 
     async def _handle(self, msg: Message) -> None:

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/clients/acp/skill/irc_client.py

@@ -56,7 +56,7 @@ class SkillClient:
             self._writer.close()
             try:
                 await self._writer.wait_closed()
-            except (ConnectionError, BrokenPipeError, OSError):
+            except OSError:
                 pass
             self._writer = None
         self._reader = None
@@ -91,7 +91,7 @@ class SkillClient:
                 if msg is None:
                     continue
                 self._dispatch_message(msg)
-        except (asyncio.IncompleteReadError, ConnectionError, OSError):
+        except (asyncio.IncompleteReadError, OSError):
             pass
         finally:
             self._fail_pending("Connection lost")

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/clients/acp/socket_server.py

@@ -32,7 +32,7 @@ class SocketServer:
             try:
                 writer.close()
                 await writer.wait_closed()
-            except (ConnectionError, BrokenPipeError, OSError):
+            except OSError:
                 pass
         self._clients.clear()
         if self._server:
@@ -52,7 +52,7 @@ class SocketServer:
                 try:
                     writer.write(data)
                     await writer.drain()
-                except (ConnectionError, BrokenPipeError, OSError):
+                except OSError:
                     self._clients.remove(writer)
         else:
             await self._whisper_queue.put(data)
@@ -76,7 +76,7 @@ class SocketServer:
                 await writer.drain()
             except asyncio.QueueEmpty:
                 break
-            except (ConnectionError, BrokenPipeError, OSError):
+            except OSError:
                 break
 
     async def _process_client_messages(
@@ -112,7 +112,7 @@ class SocketServer:
             writer.write(encode_message(err_resp))
             await writer.drain()
             return True
-        except (ConnectionError, BrokenPipeError, OSError):
+        except OSError:
             return False
 
     def _cleanup_client(self, writer: asyncio.StreamWriter) -> None:

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/clients/claude/agent_runner.py

@@ -81,7 +81,8 @@ class AgentRunner:
         self._prompt_queue.put_nowait("")
         if self._task and not self._task.done():
             try:
-                await asyncio.wait_for(asyncio.shield(self._task), timeout=5.0)
+                async with asyncio.timeout(5.0):
+                    await asyncio.shield(self._task)
             except (asyncio.TimeoutError, asyncio.CancelledError):
                 self._task.cancel()
                 await asyncio.gather(self._task, return_exceptions=True)

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/clients/claude/daemon.py

@@ -25,6 +25,8 @@ CRASH_RESTART_DELAY = 5
 
 # IPC validation error messages
 _ERR_MISSING_CHANNEL = "Missing 'channel'"
+_ERR_MISSING_CHANNEL_THREAD = "Missing 'channel' or 'thread'"
+_ERR_MISSING_CHANNEL_THREAD_MSG = "Missing 'channel', 'thread', or 'message'"
 
 
 class AgentDaemon:
@@ -260,7 +262,7 @@ class AgentDaemon:
                     prompt = (
                         f"[IRC Channel Poll: {channel}] Recent unread messages:\n"
                         f"{lines}\n\n"
-                        f"Respond naturally if any messages need your attention."
+                        "Respond naturally if any messages need your attention."
                     )
                     task = asyncio.create_task(self._agent_runner.send_prompt(prompt))
                     self._background_tasks.add(task)
@@ -398,10 +400,10 @@ class AgentDaemon:
             return self.agent.system_prompt
         return (
             f"You are {self.agent.nick}, an AI agent on the culture IRC network.\n"
-            f"You have IRC tools available via the irc skill. Use them to communicate.\n"
+            "You have IRC tools available via the irc skill. Use them to communicate.\n"
             f"Your working directory is {self.agent.directory}.\n"
-            f"Check IRC channels periodically with irc_read() for new messages.\n"
-            f"When you finish a task, share results in the appropriate channel with irc_send()."
+            "Check IRC channels periodically with irc_read() for new messages.\n"
+            "When you finish a task, share results in the appropriate channel with irc_send()."
         )
 
     async def _record_crash_time(self, exit_code: int) -> None:
@@ -563,6 +565,13 @@ class AgentDaemon:
         if query and running and not self._paused:
             description = await self._query_agent_status()
 
+        if self._paused:
+            activity = "paused"
+        elif running:
+            activity = "working"
+        else:
+            activity = "idle"
+
         return make_response(
             req_id,
             ok=True,
@@ -571,7 +580,7 @@ class AgentDaemon:
                 "paused": self._paused,
                 "turn_count": turn_count,
                 "last_activation": self._last_activation,
-                "activity": "paused" if self._paused else ("working" if running else "idle"),
+                "activity": activity,
                 "description": description,
             },
         )
@@ -605,7 +614,8 @@ class AgentDaemon:
                 "[SYSTEM] Briefly describe what you are currently working on "
                 "in one sentence. Reply with just the description, no preamble."
             )
-            await asyncio.wait_for(self._status_query_event.wait(), timeout=10.0)
+            async with asyncio.timeout(10.0):
+                await self._status_query_event.wait()
             return self._truncate_first_line(self._status_query_response) or "nothing"
         except asyncio.TimeoutError:
             return "busy (no response)"
@@ -662,9 +672,7 @@ class AgentDaemon:
         thread_name = msg.get("thread", "")
         text = msg.get("message", "")
         if not channel or not thread_name or not text:
-            return make_response(
-                req_id, ok=False, error="Missing 'channel', 'thread', or 'message'"
-            )
+            return make_response(req_id, ok=False, error=_ERR_MISSING_CHANNEL_THREAD_MSG)
         assert self._transport is not None
         await self._transport.send_thread_create(channel, thread_name, text)
         return make_response(req_id, ok=True)
@@ -674,9 +682,7 @@ class AgentDaemon:
         thread_name = msg.get("thread", "")
         text = msg.get("message", "")
         if not channel or not thread_name or not text:
-            return make_response(
-                req_id, ok=False, error="Missing 'channel', 'thread', or 'message'"
-            )
+            return make_response(req_id, ok=False, error=_ERR_MISSING_CHANNEL_THREAD_MSG)
         assert self._transport is not None
         await self._transport.send_thread_reply(channel, thread_name, text)
         return make_response(req_id, ok=True)
@@ -694,7 +700,7 @@ class AgentDaemon:
         thread_name = msg.get("thread", "")
         summary = msg.get("summary", "")
         if not channel or not thread_name:
-            return make_response(req_id, ok=False, error="Missing 'channel' or 'thread'")
+            return make_response(req_id, ok=False, error=_ERR_MISSING_CHANNEL_THREAD)
         assert self._transport is not None
         await self._transport.send_thread_close(channel, thread_name, summary)
         return make_response(req_id, ok=True)
@@ -704,7 +710,7 @@ class AgentDaemon:
         thread_name = msg.get("thread", "")
         limit = int(msg.get("limit", 50))
         if not channel or not thread_name:
-            return make_response(req_id, ok=False, error="Missing 'channel' or 'thread'")
+            return make_response(req_id, ok=False, error=_ERR_MISSING_CHANNEL_THREAD)
         assert self._buffer is not None
         messages = self._buffer.read_thread(channel, thread_name, limit=limit)
         return make_response(

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/clients/claude/irc_transport.py

@@ -60,7 +60,7 @@ class IRCTransport:
     async def _do_connect(self) -> None:
         try:
             self._reader, self._writer = await asyncio.open_connection(self.host, self.port)
-        except (ConnectionRefusedError, OSError) as exc:
+        except OSError as exc:
             raise ConnectionError(
                 f"Cannot connect to IRC server at {self.host}:{self.port} "
                 f"- is the server running?"
@@ -77,12 +77,12 @@ class IRCTransport:
         if self._writer:
             try:
                 await self._send_raw("QUIT :daemon shutdown")
-            except (ConnectionError, OSError):
+            except OSError:
                 pass
             self._writer.close()
             try:
                 await self._writer.wait_closed()
-            except (ConnectionError, BrokenPipeError):
+            except ConnectionError:
                 pass
         self.connected = False
 
@@ -139,7 +139,7 @@ class IRCTransport:
                         await self._handle(msg)
         except asyncio.CancelledError:
             raise
-        except (ConnectionError, OSError):
+        except OSError:
             logger.warning("IRC connection lost")
         finally:
             self.connected = False
@@ -159,7 +159,7 @@ class IRCTransport:
                 logger.info("Reconnected to IRC")
                 self._reconnecting = False
                 return
-            except (ConnectionError, OSError):
+            except OSError:
                 delay = min(delay * 2, 60)
 
     async def _handle(self, msg: Message) -> None:

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/clients/claude/skill/irc_client.py

@@ -56,7 +56,7 @@ class SkillClient:
             self._writer.close()
             try:
                 await self._writer.wait_closed()
-            except (ConnectionError, BrokenPipeError, OSError):
+            except OSError:
                 pass
             self._writer = None
         self._reader = None
@@ -84,7 +84,7 @@ class SkillClient:
                 if msg is None:
                     continue
                 self._dispatch_message(msg)
-        except (asyncio.IncompleteReadError, ConnectionError, OSError):
+        except (asyncio.IncompleteReadError, OSError):
             pass
         finally:
             # Resolve any still-pending futures with an error

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/clients/claude/socket_server.py

@@ -32,7 +32,7 @@ class SocketServer:
             try:
                 writer.close()
                 await writer.wait_closed()
-            except (ConnectionError, BrokenPipeError, OSError):
+            except OSError:
                 pass
         self._clients.clear()
         if self._server:
@@ -55,7 +55,7 @@ class SocketServer:
                 try:
                     writer.write(data)
                     await writer.drain()
-                except (ConnectionError, BrokenPipeError, OSError):
+                except OSError:
                     self._clients.remove(writer)
         else:
             # No clients yet — queue for delivery when one connects.
@@ -80,7 +80,7 @@ class SocketServer:
                 await writer.drain()
             except asyncio.QueueEmpty:
                 break
-            except (ConnectionError, BrokenPipeError, OSError):
+            except OSError:
                 break
 
     async def _process_client_messages(
@@ -116,7 +116,7 @@ class SocketServer:
             writer.write(encode_message(err_resp))
             await writer.drain()
             return True
-        except (ConnectionError, BrokenPipeError, OSError):
+        except OSError:
             return False
 
     def _cleanup_client(self, writer: asyncio.StreamWriter) -> None:

{agentirc_cli-4.3.6 → agentirc_cli-4.3.7}/culture/clients/codex/agent_runner.py

@@ -128,7 +128,8 @@ class CodexAgentRunner:
             return
         try:
             self._process.terminate()
-            await asyncio.wait_for(self._process.wait(), timeout=5)
+            async with asyncio.timeout(5):
+                await self._process.wait()
         except (asyncio.TimeoutError, ProcessLookupError):
             try:
                 self._process.kill()
@@ -185,7 +186,8 @@ class CodexAgentRunner:
         await self._process.stdin.drain()
 
         try:
-            return await asyncio.wait_for(future, timeout=30)
+            async with asyncio.timeout(30):
+                return await future
         except (asyncio.TimeoutError, asyncio.CancelledError):
             self._pending.pop(req_id, None)
             if not future.done():
@@ -220,14 +222,16 @@ class CodexAgentRunner:
         if not self._process:
             return -1
         try:
-            return await asyncio.wait_for(self._process.wait(), timeout=5)
+            async with asyncio.timeout(5):
+                return await self._process.wait()
         except asyncio.TimeoutError:
             try:
                 self._process.kill()
             except ProcessLookupError:
                 pass
             try:
-                return await asyncio.wait_for(self._process.wait(), timeout=1)
+                async with asyncio.timeout(1):
+                    return await self._process.wait()
             except asyncio.TimeoutError:
                 return -1