revert: keep current_deps and tool_result in agent/runtime.py

This reverts commit 8742907, so files shared across implementations stay identical.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>

Author: zimeg

AGENTS.md

@@ -55,7 +55,7 @@ The flow: a mention or direct message outside a code channel runs a small routin
 Implementations share structure, not code, so these parts are kept the same by copying them and changing them everywhere at once:
 
 - **The seam between `listeners/` and `agent/`.** Listeners import only from the `agent` package, never from the agent framework, so `listeners/` is the same in every implementation. `agent/__init__.py` provides `answer_request`, `find_session`, `run_turn`, `resume_turn`, `stop_turn`, and `end_session`.
-- **Framework-free files.** `agent/turns.py`, `agent/context.py`, `agent/approvals.py`, `agent/sessions.py`, `agent/workspace.py`, `agent/outcome.py`, and `agent/prompts.py` don't import the agent framework. The framework lives in `agent/agent.py`, `agent/guardrails.py`, and `agent/tools/`. The Claude Agent SDK's `agent/sessions.py` also holds `current_deps`, for the deps its tools can't be passed, so keep it there when copying changes to that file. `turns.py` calls only `run_request(prompt, deps)`, which returns the reply text, and `start_run(history, text, deps)` and `resume_run(paused, approved, deps)`, which return the `RunOutcome` in `agent/outcome.py`. The paused run is a handle `turns.py` passes back without looking inside, so each framework's way of pausing fits behind it.
+- **Framework-free files.** `agent/turns.py`, `agent/context.py`, `agent/approvals.py`, `agent/sessions.py`, `agent/workspace.py`, `agent/outcome.py`, and `agent/prompts.py` don't import the agent framework. The framework lives in `agent/agent.py`, `agent/guardrails.py`, and `agent/tools/`, and the Claude Agent SDK adds `agent/runtime.py` for the deps its tools can't be passed. `turns.py` calls only `run_request(prompt, deps)`, which returns the reply text, and `start_run(history, text, deps)` and `resume_run(paused, approved, deps)`, which return the `RunOutcome` in `agent/outcome.py`. The paused run is a handle `turns.py` passes back without looking inside, so each framework's way of pausing fits behind it.
 - **What the framework side keeps true.** `turns.py` relies on these, so every implementation keeps them: `create_code_channel` sets `deps.code_channel_id`, and `archive_channel` sets `session.archived`. Every code channel tool skips its call once `session.stopped` is set. `turns.py` can drop a paused run without resuming it, since the session's history then shows its pending command as not run: the history already records it that way, or the next run answers it that way before anything else. Beyond that, `turns.py` only checks whether `history` is empty, to know a turn is the first.
 - **Prompts.** `agent/prompts.py` is the same word for word in every implementation.
 - **Tools.** Every implementation offers the same tools with the same names, arguments, and descriptions, written with its framework's tool decorator. File tools stay inside the clone and can't write into `.git`.

claude-agent-sdk/AGENTS.md

@@ -6,7 +6,7 @@ Guidance for coding agents working in this directory. Refer to the root `../AGEN
 
 **Agents (`agent/agent.py`)** are two sets of `ClaudeAgentOptions` with pinned models: a routing agent (`claude-haiku-4-5`) whose only tool is `create_code_channel`, and the coding agent (`claude-sonnet-5-5`) with every other tool. Tools are async `@tool` functions, one per file under `agent/tools/`, each with a JSON Schema for its arguments. They're served in-process by `create_sdk_mcp_server()`, so the model sees each as `mcp__coding-agent__<name>`. Both agents set `tools=[]`, `setting_sources=[]`, and `strict_mcp_config=True`, so they get none of Claude Code's built-in tools and none of the settings, `CLAUDE.md` files, or MCP servers on the machine. `verbatim_prompts=True` keeps an `@path` in a Slack message from reading a local file.
 
-**Deps** reach the tools and hooks through `current_deps` in `agent/sessions.py`, a `ContextVar`, since the SDK calls a tool with only its arguments. `_run` in `agent/agent.py` sets it before the client starts, so the tasks the client starts see it.
+**Deps** reach the tools and hooks through `current_deps` in `agent/runtime.py`, a `ContextVar`, since the SDK calls a tool with only its arguments. `_run` in `agent/agent.py` sets it before the client starts, so the tasks the client starts see it.
 
 **Runs** use a `ClaudeSDKClient` per run from async Bolt listeners, which runs the Claude Code CLI bundled with the SDK. Coding turns allow `MAX_TURNS` model calls, and a turn that uses them all (`error_max_turns`) ends with a message, keeping its history. A `PostToolUse` hook returns `continue_: False` to end the run early once there's nothing left to do: after `create_code_channel` succeeds for the routing agent, and after `archive_channel` for the coding agent. A result with `is_error` raises, so the turn posts a warning.
 

claude-agent-sdk/README.md

@@ -338,10 +338,12 @@ The `context.py` file reads the thread or direct message a request came from, so
 
 The `guardrails.py` file holds the SDK hooks that gate tool calls: the approval check for `run_command`, which defers a command that needs approval, and the check that skips every tool call once the session is stopped.
 
-The `sessions.py` file keeps each code channel's session in memory: its working directory, plan canvas, conversation history, and messages waiting for the next turn. It also defines the `AgentDeps` and `RequestDeps` dataclasses passed to the agents at runtime, providing access to the Slack client and the session or request, and `current_deps`, which hands them to the tools and hooks since the SDK can't pass them to a tool.
+The `sessions.py` file keeps each code channel's session in memory: its working directory, plan canvas, conversation history, and messages waiting for the next turn. It also defines the `AgentDeps` and `RequestDeps` dataclasses passed to the agents at runtime, providing access to the Slack client and the session or request.
 
 The `approvals.py` file decides which commands need approval and holds runs paused on one.
 
+The `runtime.py` file holds what the tools and hooks share during a run: its deps, which the SDK can't pass to a tool, and the shape of a tool's reply.
+
 The `workspace.py` file runs commands in the clone without the app's secrets, and keeps file tools inside it.
 
-The `tools` directory contains one file per tool the agents can call, and `tool_result` in its `__init__.py` for the shape of a tool's reply.
+The `tools` directory contains one file per tool the agents can call.

claude-agent-sdk/agent/agent.py

@@ -22,7 +22,8 @@
 from agent.guardrails import answer_unanswered, gate_tool_calls
 from agent.outcome import RunOutcome
 from agent.prompts import REQUEST_PROMPT, SYSTEM_PROMPT
-from agent.sessions import AgentDeps, RequestDeps, current_deps
+from agent.runtime import current_deps
+from agent.sessions import AgentDeps, RequestDeps
 from agent.tools import (
     archive_channel,
     clone_repo,

claude-agent-sdk/agent/guardrails.py

@@ -25,7 +25,7 @@
 )
 
 from agent.approvals import command_needs_approval
-from agent.sessions import current_deps
+from agent.runtime import current_deps
 
 logger = getLogger(__name__)
 

claude-agent-sdk/agent/runtime.py

@@ -0,0 +1,17 @@
+"""What the tools and hooks share during a run: its deps, and the shape of a tool result.
+
+The Claude Agent SDK calls a tool with only its arguments, so `agent/agent.py`
+sets the run's deps here before each run starts, and the tools and the hooks in
+`agent/guardrails.py` read them back.
+"""
+
+from contextvars import ContextVar
+
+from agent.sessions import AgentDeps, RequestDeps
+
+current_deps: ContextVar[AgentDeps | RequestDeps] = ContextVar("current_deps")
+
+
+def tool_result(text: str) -> dict:
+    """A tool's reply to the model."""
+    return {"content": [{"type": "text", "text": text}]}

claude-agent-sdk/agent/sessions.py

@@ -7,15 +7,11 @@
 when its channel is archived.
 
 The deps passed to each agent run live here too: `AgentDeps` for a turn in a
-code channel, and `RequestDeps` for a request outside one. The Claude Agent SDK
-calls a tool with only its arguments, so `agent/agent.py` sets the run's deps in
-`current_deps` before each run starts, and the tools and the hooks in
-`agent/guardrails.py` read them back.
+code channel, and `RequestDeps` for a request outside one.
 """
 
 import asyncio
 import shutil
-from contextvars import ContextVar
 from dataclasses import dataclass, field
 
 from slack_sdk.web.async_client import AsyncWebClient
@@ -83,9 +79,6 @@ class RequestDeps:
     code_channel_id: str | None = None
 
 
-current_deps: ContextVar[AgentDeps | RequestDeps] = ContextVar("current_deps")
-
-
 class CodeChannelSessionStore:
     """In-memory store of active code channel sessions."""
 

claude-agent-sdk/agent/tools/__init__.py

@@ -1,9 +1,3 @@
-# Defined before the tool imports below, since each tool imports it from here.
-def tool_result(text: str) -> dict:
-    """A tool's reply to the model."""
-    return {"content": [{"type": "text", "text": text}]}
-
-
 from .archive_channel import archive_channel
 from .clone_repo import clone_repo
 from .create_code_channel import create_code_channel

claude-agent-sdk/agent/tools/archive_channel.py

@@ -1,8 +1,7 @@
 from claude_agent_sdk import tool
 from slack_sdk.errors import SlackApiError
 
-from agent.sessions import current_deps
-from agent.tools import tool_result
+from agent.runtime import current_deps, tool_result
 
 DESCRIPTION = """\
 Post a final summary and archive the code channel.

claude-agent-sdk/agent/tools/clone_repo.py

@@ -5,8 +5,7 @@
 
 from claude_agent_sdk import tool
 
-from agent.sessions import current_deps
-from agent.tools import tool_result
+from agent.runtime import current_deps, tool_result
 from agent.workspace import run
 
 # Cap the clone so an unreachable or huge repository can't wedge the session.