python-codex 0.4.7__tar.gz → 0.5.0__tar.gz

python_codex-0.5.0/PKG-INFO

@@ -0,0 +1,193 @@
+Metadata-Version: 2.1
+Name: python-codex
+Version: 0.5.0
+Summary: A minimal Python extraction of Codex's main agent loop
+License-File: LICENSE
+Requires-Python: >=3.6.2
+Requires-Dist: dataclasses>=0.8; python_version < '3.7'
+Requires-Dist: importlib-metadata>=4.8.3; python_version < '3.8'
+Requires-Dist: loguru>=0.7.3
+Requires-Dist: prompt-toolkit>=3.0.36
+Requires-Dist: pyyaml>=6.0
+Requires-Dist: requests>=2.27.1
+Requires-Dist: starlette<0.20,>=0.19.1; python_version < '3.7'
+Requires-Dist: starlette>=0.19.1; python_version >= '3.7'
+Requires-Dist: tomli<2,>=1.2.3; python_version < '3.11'
+Requires-Dist: typing-extensions>=4.1.1; python_version < '3.8'
+Requires-Dist: uvicorn<0.17,>=0.16.0; python_version < '3.7'
+Requires-Dist: uvicorn>=0.16.0; python_version >= '3.7'
+Description-Content-Type: text/markdown
+
+# pycodex
+
+[中文](README_ZH.md)
+
+pycodex brings the [Codex](https://github.com/openai/codex) agent loop to Python,
+with a CLI, reusable Agent API and browser workspace. It aims to follow upstream
+behavior; supported features and deliberate differences are documented in
+[Alignment](docs/ALIGNMENT.md).
+
+| Package | Provides | Python |
+| --- | --- | --- |
+| `python-codex` | Agent, runtime, CLI, tools, Responses compatibility server and portable storage | 3.6.2+ |
+| `pycodex-ws` | Browser workspace, Canvas, file/diff viewers and optional Feishu integration | 3.7+ |
+
+The workspace package installs the matching core version. Python imports use
+`pycodex`; the commands are `pycodex` and `pycodex-ws`.
+
+## Install and run
+
+Install the core CLI:
+
+```bash
+python3 -m pip install python-codex
+pycodex
+```
+
+Or install the browser workspace, which includes core:
+
+```bash
+python3 -m pip install pycodex-ws
+pycodex-ws --help
+```
+
+Use `python3 -m pip install --upgrade pycodex-ws` to upgrade both packages
+together. If a command is missing from `PATH`, use `python3 -m pycodex` or
+`python3 -m workspace_server` with the interpreter used for installation.
+
+## Model configuration
+
+pycodex reads `~/.codex/config.toml` and the adjacent `.env`. Configure `model`,
+`model_provider`, and the provider's `base_url` and `env_key` as needed.
+The built-in `openai` provider uses `OPENAI_API_KEY`. Authentication uses API
+keys; ChatGPT sign-in credentials from `auth.json` or the OS keychain are not
+loaded.
+
+```bash
+pycodex --profile my_profile "Summarize this repository."
+pycodex --config /path/to/config.toml
+pycodex doctor
+```
+
+Models use the streaming Responses API. For a Chat Completions backend, set
+`use_chat_completion = true` in its provider table. Other backend options include:
+
+```bash
+pycodex --vllm-endpoint http://127.0.0.1:18000
+pycodex --profile my_profile --use-messages
+```
+
+See [context and configuration](docs/CONTEXT.md) and the
+[Responses compatibility server](docs/responses_server/README.md).
+
+## CLI
+
+Run `pycodex` without a prompt for an interactive session, or supply a prompt
+for a single turn:
+
+```bash
+pycodex "Summarize this repository in one sentence."
+printf 'Reply with exactly OK.' | pycodex
+pycodex --json "Reply with exactly OK."
+```
+
+| Command | Purpose |
+| --- | --- |
+| `/model`, `/effort` | Show or change the model and reasoning effort |
+| `/cd <directory>` | Change the session's working directory while idle |
+| `/title`, `/history` | Manage the title and inspect conversation history |
+| `/resume` | List saved sessions; pass an index or session UUID to resume |
+| `/compact` | Summarize history to free context |
+| `/fork` | Continue the current history under a new session ID |
+| `/queue <message>` | Wait for the active turn to finish before submitting |
+
+Ordinary input during a turn steers at the next safe sampling boundary.
+Sessions are saved under `CODEX_HOME/sessions`. Set
+`model_auto_compact_token_limit` in the configuration to compact automatically.
+
+Ctrl+D or Ctrl+C closes the CLI after accepted work finishes. A second Ctrl+C
+during closing exits immediately. Use `pycodex --help` for startup options.
+
+## Browser workspace
+
+Create `workspaces.json`:
+
+```json
+{
+  "workspaces": [
+    {"id": "demo", "work_dir": ".", "state_path": "demo", "enable_board": true}
+  ]
+}
+```
+
+```bash
+pycodex-ws --listen 127.0.0.1:6007 --workspace-config workspaces.json
+```
+
+Open `http://127.0.0.1:6007`. The workspace combines conversations with a live
+HTML Canvas and read-only file/diff viewers. Click file links in replies to open
+them, and use **Insert into chat** to add selected code to an editable draft.
+Keep the server's stdin open: EOF initiates shutdown.
+The gear button starts an Agent conversation for customizing the interface
+through files in `~/.pycodex/frontend/`.
+
+See the [workspace guide](packages/pycodex-ws/README.md) for session controls,
+storage and Feishu setup. The separately distributed
+[VS Code extension](packages/pycodex-ws/extensions/vscode/README.md) uses the same
+workspace backend, including on Remote SSH hosts.
+
+## Python API
+
+Use the standard model and tool setup from Python:
+
+```python
+from pycodex.bootstrap import build_agent, build_model
+
+agent = build_agent(build_model())
+try:
+    result = agent.ask("Summarize this repository in one sentence.")
+    print(result.output_text)
+finally:
+    agent.shutdown()
+```
+
+For custom integrations, `Agent` accepts a model client, `ToolRegistry` and
+`ContextConfig`. `await agent.run_turn([...])` runs an asynchronous turn;
+`AgentRuntime` adds input queues, commands and frontend subscriptions.
+See [runtime contracts and examples](docs/RUNTIME.md).
+
+## Portable configuration
+
+Portable mode transfers an encrypted bundle of your configuration, instructions
+and skills to another machine. Start a storage service in a separate terminal:
+
+```bash
+python3 -m pycodex.portable.server --root .tmp/pycodex_storage --host 127.0.0.1 --port 5577
+```
+
+Upload the default Codex home, or specify another directory:
+
+```bash
+pycodex --put @127.0.0.1:5577
+pycodex --put /path/to/.codex/@127.0.0.1:5577
+```
+
+After verifying a download round trip, the command prints a reusable
+`pycodex --call ...` command. Run it on the target machine using a storage
+address reachable from that machine.
+
+## Development and reference
+
+```bash
+uv sync --dev
+uv run pycodex
+uv run --dev pytest
+```
+
+- [Test environments and coverage](tests/TESTS.md)
+- [Architecture, package layout and runtime contracts](docs/RUNTIME.md)
+- [Prompts, configuration and context](docs/CONTEXT.md)
+- [Upstream alignment](docs/ALIGNMENT.md)
+- [Responses compatibility server](docs/responses_server/README.md)
+
+Release notes and implementation details live in `docs/`.

python_codex-0.5.0/README.md

@@ -0,0 +1,173 @@
+# pycodex
+
+[中文](README_ZH.md)
+
+pycodex brings the [Codex](https://github.com/openai/codex) agent loop to Python,
+with a CLI, reusable Agent API and browser workspace. It aims to follow upstream
+behavior; supported features and deliberate differences are documented in
+[Alignment](docs/ALIGNMENT.md).
+
+| Package | Provides | Python |
+| --- | --- | --- |
+| `python-codex` | Agent, runtime, CLI, tools, Responses compatibility server and portable storage | 3.6.2+ |
+| `pycodex-ws` | Browser workspace, Canvas, file/diff viewers and optional Feishu integration | 3.7+ |
+
+The workspace package installs the matching core version. Python imports use
+`pycodex`; the commands are `pycodex` and `pycodex-ws`.
+
+## Install and run
+
+Install the core CLI:
+
+```bash
+python3 -m pip install python-codex
+pycodex
+```
+
+Or install the browser workspace, which includes core:
+
+```bash
+python3 -m pip install pycodex-ws
+pycodex-ws --help
+```
+
+Use `python3 -m pip install --upgrade pycodex-ws` to upgrade both packages
+together. If a command is missing from `PATH`, use `python3 -m pycodex` or
+`python3 -m workspace_server` with the interpreter used for installation.
+
+## Model configuration
+
+pycodex reads `~/.codex/config.toml` and the adjacent `.env`. Configure `model`,
+`model_provider`, and the provider's `base_url` and `env_key` as needed.
+The built-in `openai` provider uses `OPENAI_API_KEY`. Authentication uses API
+keys; ChatGPT sign-in credentials from `auth.json` or the OS keychain are not
+loaded.
+
+```bash
+pycodex --profile my_profile "Summarize this repository."
+pycodex --config /path/to/config.toml
+pycodex doctor
+```
+
+Models use the streaming Responses API. For a Chat Completions backend, set
+`use_chat_completion = true` in its provider table. Other backend options include:
+
+```bash
+pycodex --vllm-endpoint http://127.0.0.1:18000
+pycodex --profile my_profile --use-messages
+```
+
+See [context and configuration](docs/CONTEXT.md) and the
+[Responses compatibility server](docs/responses_server/README.md).
+
+## CLI
+
+Run `pycodex` without a prompt for an interactive session, or supply a prompt
+for a single turn:
+
+```bash
+pycodex "Summarize this repository in one sentence."
+printf 'Reply with exactly OK.' | pycodex
+pycodex --json "Reply with exactly OK."
+```
+
+| Command | Purpose |
+| --- | --- |
+| `/model`, `/effort` | Show or change the model and reasoning effort |
+| `/cd <directory>` | Change the session's working directory while idle |
+| `/title`, `/history` | Manage the title and inspect conversation history |
+| `/resume` | List saved sessions; pass an index or session UUID to resume |
+| `/compact` | Summarize history to free context |
+| `/fork` | Continue the current history under a new session ID |
+| `/queue <message>` | Wait for the active turn to finish before submitting |
+
+Ordinary input during a turn steers at the next safe sampling boundary.
+Sessions are saved under `CODEX_HOME/sessions`. Set
+`model_auto_compact_token_limit` in the configuration to compact automatically.
+
+Ctrl+D or Ctrl+C closes the CLI after accepted work finishes. A second Ctrl+C
+during closing exits immediately. Use `pycodex --help` for startup options.
+
+## Browser workspace
+
+Create `workspaces.json`:
+
+```json
+{
+  "workspaces": [
+    {"id": "demo", "work_dir": ".", "state_path": "demo", "enable_board": true}
+  ]
+}
+```
+
+```bash
+pycodex-ws --listen 127.0.0.1:6007 --workspace-config workspaces.json
+```
+
+Open `http://127.0.0.1:6007`. The workspace combines conversations with a live
+HTML Canvas and read-only file/diff viewers. Click file links in replies to open
+them, and use **Insert into chat** to add selected code to an editable draft.
+Keep the server's stdin open: EOF initiates shutdown.
+The gear button starts an Agent conversation for customizing the interface
+through files in `~/.pycodex/frontend/`.
+
+See the [workspace guide](packages/pycodex-ws/README.md) for session controls,
+storage and Feishu setup. The separately distributed
+[VS Code extension](packages/pycodex-ws/extensions/vscode/README.md) uses the same
+workspace backend, including on Remote SSH hosts.
+
+## Python API
+
+Use the standard model and tool setup from Python:
+
+```python
+from pycodex.bootstrap import build_agent, build_model
+
+agent = build_agent(build_model())
+try:
+    result = agent.ask("Summarize this repository in one sentence.")
+    print(result.output_text)
+finally:
+    agent.shutdown()
+```
+
+For custom integrations, `Agent` accepts a model client, `ToolRegistry` and
+`ContextConfig`. `await agent.run_turn([...])` runs an asynchronous turn;
+`AgentRuntime` adds input queues, commands and frontend subscriptions.
+See [runtime contracts and examples](docs/RUNTIME.md).
+
+## Portable configuration
+
+Portable mode transfers an encrypted bundle of your configuration, instructions
+and skills to another machine. Start a storage service in a separate terminal:
+
+```bash
+python3 -m pycodex.portable.server --root .tmp/pycodex_storage --host 127.0.0.1 --port 5577
+```
+
+Upload the default Codex home, or specify another directory:
+
+```bash
+pycodex --put @127.0.0.1:5577
+pycodex --put /path/to/.codex/@127.0.0.1:5577
+```
+
+After verifying a download round trip, the command prints a reusable
+`pycodex --call ...` command. Run it on the target machine using a storage
+address reachable from that machine.
+
+## Development and reference
+
+```bash
+uv sync --dev
+uv run pycodex
+uv run --dev pytest
+```
+
+- [Test environments and coverage](tests/TESTS.md)
+- [Architecture, package layout and runtime contracts](docs/RUNTIME.md)
+- [Prompts, configuration and context](docs/CONTEXT.md)
+- [Upstream alignment](docs/ALIGNMENT.md)
+- [Responses compatibility server](docs/responses_server/README.md)
+
+Release notes and implementation details live in `docs/`.

python_codex-0.5.0/README_ZH.md

@@ -0,0 +1,164 @@
+# pycodex
+
+[English](README.md)
+
+pycodex 用 Python 实现 [Codex](https://github.com/openai/codex) 的 Agent 主循环，
+提供 CLI、可复用的 Agent API 和浏览器工作区。项目以对齐上游行为为目标；
+支持范围和刻意保留的差异见[对齐文档](docs/ALIGNMENT.md)。
+
+| 包 | 内容 | Python |
+| --- | --- | --- |
+| `python-codex` | Agent、Runtime、CLI、工具、Responses 兼容服务和 portable 存储 | 3.6.2+ |
+| `pycodex-ws` | 浏览器工作区、Canvas、文件/diff 查看器和可选飞书集成 | 3.7+ |
+
+workspace 包会安装匹配版本的 core。Python 导入路径为 `pycodex`，
+命令为 `pycodex` 和 `pycodex-ws`。
+
+## 安装与启动
+
+安装核心 CLI：
+
+```bash
+python3 -m pip install python-codex
+pycodex
+```
+
+也可以安装包含 core 的浏览器工作区：
+
+```bash
+python3 -m pip install pycodex-ws
+pycodex-ws --help
+```
+
+使用 `python3 -m pip install --upgrade pycodex-ws` 一起升级两个包。
+如果命令不在 `PATH` 中，用安装时的解释器运行 `python3 -m pycodex`
+或 `python3 -m workspace_server`。
+
+## 模型配置
+
+默认读取 `~/.codex/config.toml` 和同目录的 `.env`。根据需要配置 `model`、
+`model_provider` 及 provider 的 `base_url`、`env_key`。
+内置 `openai` provider 使用 `OPENAI_API_KEY`。认证使用 API key，
+不读取 `auth.json` 或系统钥匙串中的 ChatGPT 登录凭据。
+
+```bash
+pycodex --profile my_profile "概括这个仓库。"
+pycodex --config /path/to/config.toml
+pycodex doctor
+```
+
+默认使用流式 Responses API。接入 Chat Completions 后端时，在对应 provider
+配置中设置 `use_chat_completion = true`。其他后端入口包括：
+
+```bash
+pycodex --vllm-endpoint http://127.0.0.1:18000
+pycodex --profile my_profile --use-messages
+```
+
+详见[配置与上下文](docs/CONTEXT.md)和
+[Responses 兼容服务](docs/responses_server/README.md)。
+
+## CLI
+
+不带 prompt 时进入交互会话，也可以直接运行单轮任务：
+
+```bash
+pycodex "用一句话概括这个仓库。"
+printf 'Reply with exactly OK.' | pycodex
+pycodex --json "Reply with exactly OK."
+```
+
+| 命令 | 用途 |
+| --- | --- |
+| `/model`、`/effort` | 查看或切换模型及推理强度 |
+| `/cd <directory>` | 空闲时切换当前会话的工作目录 |
+| `/title`、`/history` | 管理标题、查看历史 |
+| `/resume` | 列出已保存会话；传入序号或 UUID 恢复 |
+| `/compact` | 压缩历史，释放上下文空间 |
+| `/fork` | 保留当前历史，以新会话 ID 继续 |
+| `/queue <message>` | 等当前 turn 完成后再执行 |
+
+运行中提交普通输入，会在下一个安全采样边界插入。会话保存在
+`CODEX_HOME/sessions`；配置 `model_auto_compact_token_limit` 可启用自动压缩。
+
+Ctrl+D 或 Ctrl+C 发起退出，等待已接收任务完成；关闭等待期间再次 Ctrl+C
+立即退出。完整启动参数见 `pycodex --help`。
+
+## 浏览器工作区
+
+创建 `workspaces.json`：
+
+```json
+{
+  "workspaces": [
+    {"id": "demo", "work_dir": ".", "state_path": "demo", "enable_board": true}
+  ]
+}
+```
+
+```bash
+pycodex-ws --listen 127.0.0.1:6007 --workspace-config workspaces.json
+```
+
+访问 `http://127.0.0.1:6007`。工作区同时提供对话、实时 HTML Canvas 和只读
+文件/diff 查看器。点击回复中的文件链接打开视图，通过 **Insert into chat**
+把选中的代码插入可编辑草稿。运行期间保持服务器 stdin 打开，EOF 会触发关闭。
+点击齿轮按钮可开启界面定制会话，让 Agent 修改 `~/.pycodex/frontend/` 中的文件。
+
+会话操作、存储和飞书配置见[工作区说明](packages/pycodex-ws/README.md)。
+独立分发的 [VS Code 扩展](packages/pycodex-ws/extensions/vscode/README.md)
+复用同一后端，支持 Remote SSH 工作区。
+
+## Python API
+
+在 Python 中复用标准模型和工具装配：
+
+```python
+from pycodex.bootstrap import build_agent, build_model
+
+agent = build_agent(build_model())
+try:
+    result = agent.ask("用一句话概括这个仓库。")
+    print(result.output_text)
+finally:
+    agent.shutdown()
+```
+
+自定义集成时，`Agent` 接收 model client、`ToolRegistry` 和 `ContextConfig`。
+通过 `await agent.run_turn([...])` 异步运行 turn；`AgentRuntime` 提供输入队列、
+会话命令和前端订阅。详见[运行时契约与示例](docs/RUNTIME.md)。
+
+## Portable 配置
+
+Portable mode 将配置、指令和 skills 加密打包，供其他机器恢复使用。
+先在单独的终端启动存储服务：
+
+```bash
+python3 -m pycodex.portable.server --root .tmp/pycodex_storage --host 127.0.0.1 --port 5577
+```
+
+上传默认 Codex home，或指定其他目录：
+
+```bash
+pycodex --put @127.0.0.1:5577
+pycodex --put /path/to/.codex/@127.0.0.1:5577
+```
+
+上传并验证下载成功后，命令会打印可复用的 `pycodex --call ...` 启动命令。
+在目标机器运行时，使用该机器能够访问的存储服务地址。
+
+## 开发与参考
+
+```bash
+uv sync --dev
+uv run pycodex
+uv run --dev pytest
+```
+
+- [测试环境与覆盖范围](tests/TESTS.md)
+- [架构、包布局与运行时契约](docs/RUNTIME.md)
+- [提示、配置与上下文](docs/CONTEXT.md)
+- [上游对齐](docs/ALIGNMENT.md)
+- [Responses 兼容服务](docs/responses_server/README.md)
+
+发布记录和实现细节放在 `docs/`。

{python_codex-0.4.7 → python_codex-0.5.0}/pycodex/agent.py

@@ -152,6 +152,13 @@ class Agent:
         self.context_manager.set_model(model)
         self._last_total_usage_tokens = None
 
+    def set_cwd(self, cwd: "typing.Union[str, Path]") -> "None":
+        if self.is_running:
+            raise RuntimeError("cannot change directory while agent is running")
+        if not self.accepts_input:
+            raise RuntimeError("cannot change directory while agent is closing or closed")
+        self.context_manager.set_cwd(cwd)
+
     def resume(
         self, session_file_path: "typing.Union[str, Path, None]" = None
     ) -> "typing.Union[typing.Dict[str, object], None]":
@@ -400,6 +407,7 @@ class Agent:
             context = ToolContext(
                 turn_id=turn_id,
                 history=self.history,
+                cwd=self.context_manager.cwd,
             )
             if len(batch) == 1:
                 results.append(await self._run_single_tool(turn_id, batch[0], context))

{python_codex-0.4.7 → python_codex-0.5.0}/pycodex/bootstrap.py

@@ -86,7 +86,6 @@ def configure_loguru() -> "None":
 def get_tools(
     runtime_environment: "typing.Union[AgentRuntimeEnvironment, None]" = None,
     exec_mode: "bool" = False,
-    cwd: "typing.Union[str, Path, None]" = None,
     toolset: "typing.Union[typing.Iterable[str], None]" = None,
 ):
     from .tools import (
@@ -119,8 +118,8 @@ def get_tools(
 
     runtime_environment = runtime_environment or create_agent_runtime_environment()
     registry = Registry(runtime_environment)
-    code_mode_manager = CodeModeManager(registry, cwd=cwd)
-    unified_exec_manager = UnifiedExecManager(cwd=cwd)
+    code_mode_manager = CodeModeManager(registry)
+    unified_exec_manager = UnifiedExecManager()
     clock_manager = ClockManager()
     exec_tool = ExecTool(code_mode_manager)
     wait_tool = WaitTool(code_mode_manager)
@@ -135,16 +134,16 @@ def get_tools(
     resume_agent_tool = ResumeAgentTool(runtime_environment.subagent_manager)
     wait_agent_tool = WaitAgentTool(runtime_environment.subagent_manager)
     close_agent_tool = CloseAgentTool(runtime_environment.subagent_manager)
-    apply_patch_tool = ApplyPatchTool(cwd=cwd)
-    shell_tool = ShellTool(cwd=cwd)
-    shell_command_tool = ShellCommandTool(cwd=cwd)
+    apply_patch_tool = ApplyPatchTool()
+    shell_tool = ShellTool()
+    shell_command_tool = ShellCommandTool()
     exec_command_tool = ExecCommandTool(unified_exec_manager)
     write_stdin_tool = WriteStdinTool(unified_exec_manager)
     clock_tool = ClockTool(clock_manager)
-    grep_files_tool = GrepFilesTool(cwd=cwd)
+    grep_files_tool = GrepFilesTool()
     read_file_tool = ReadFileTool()
     list_dir_tool = ListDirTool()
-    view_image_tool = ViewImageTool(cwd=cwd)
+    view_image_tool = ViewImageTool()
     tools = (
         shell_tool,
         shell_command_tool,
@@ -200,7 +199,6 @@ def get_tools(
 
 def get_subagent_tools(
     runtime_environment: "typing.Union[AgentRuntimeEnvironment, None]" = None,
-    cwd: "typing.Union[str, Path, None]" = None,
 ):
     from .tools import (
         ApplyPatchTool,
@@ -215,13 +213,13 @@ def get_subagent_tools(
 
     runtime_environment = runtime_environment or create_agent_runtime_environment()
     registry = Registry(runtime_environment)
-    unified_exec_manager = UnifiedExecManager(cwd=cwd)
+    unified_exec_manager = UnifiedExecManager()
     registry.register(ExecCommandTool(unified_exec_manager))
     registry.register(WriteStdinTool(unified_exec_manager))
     registry.register(UpdatePlanTool(runtime_environment.plan_store))
-    registry.register(ApplyPatchTool(cwd=cwd))
+    registry.register(ApplyPatchTool())
     registry.register(WebSearchTool())
-    registry.register(ViewImageTool(cwd=cwd))
+    registry.register(ViewImageTool())
     return registry
 
 
@@ -244,46 +242,41 @@ def build_agent(
     )
     runtime_environment = create_agent_runtime_environment()
 
-    def make_subagent_runtime_builder(base_client):
+    def make_subagent_runtime_builder(parent_agent):
         def build_subagent_runtime(
             model_override: "typing.Union[str, None]",
             reasoning_effort_override: "typing.Union[str, None]",
             initial_history=(),
             session_id: "typing.Union[str, None]" = None,
         ) -> "AgentRuntime":
-            nested_client = base_client.with_overrides(
+            nested_client = parent_agent.model_client.with_overrides(
                 model_override,
                 reasoning_effort_override,
                 session_id=session_id,
                 openai_subagent="collab_spawn",
             )
             subagent_agent_runtime_environment = create_agent_runtime_environment()
-            subagent_agent_runtime_environment.subagent_manager.set_runtime_builder(
-                make_subagent_runtime_builder(nested_client)
-            )
+            inherited_cwd = parent_agent.context_manager.cwd
             sub_agent = Agent(
                 nested_client,
-                get_subagent_tools(
-                    subagent_agent_runtime_environment, cwd=resolved_cwd
-                ),
-                context_config,
+                get_subagent_tools(subagent_agent_runtime_environment),
+                replace(context_config, cwd=inherited_cwd),
                 initial_history=tuple(initial_history),
                 session_id=session_id,
             )
+            subagent_agent_runtime_environment.subagent_manager.set_runtime_builder(
+                make_subagent_runtime_builder(sub_agent)
+            )
             return AgentRuntime(sub_agent)
 
         return build_subagent_runtime
 
-    runtime_environment.subagent_manager.set_runtime_builder(
-        make_subagent_runtime_builder(client)
-    )
     session_id = uuid7_string()
-    return Agent(
+    agent = Agent(
         client,
         get_tools(
             runtime_environment,
             exec_mode=True,
-            cwd=resolved_cwd,
             toolset=toolset,
         ),
         context_config,
@@ -292,6 +285,10 @@ def build_agent(
         ),
         session_id=session_id,
     )
+    runtime_environment.subagent_manager.set_runtime_builder(
+        make_subagent_runtime_builder(agent)
+    )
+    return agent
 
 
 def build_model(