python-codex 0.4.6__py3-none-any.whl → 0.4.8__py3-none-any.whl

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))

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(

pycodex/context.py

@@ -244,6 +244,16 @@ class ContextManager:
     def set_model(self, model: "str") -> "None":
         self._config = replace(self._config, model=model)
 
+    def set_cwd(self, cwd: "typing.Union[str, Path]") -> "None":
+        path = Path(cwd).expanduser()
+        path = (self.cwd / path).resolve(strict=True)
+        if not path.is_dir():
+            raise NotADirectoryError(str(path))
+        self.cwd = path
+        self._config = replace(self._config, cwd=path)
+        self._workspace_metadata_turn_id = None
+        self._workspace_metadata_cache = None
+
     def resolve_auto_compact_token_limit(self) -> "typing.Union[int, None]":
         if self._config.model_auto_compact_token_limit is not None:
             return self._config.model_auto_compact_token_limit

pycodex/runtime.py

@@ -124,6 +124,7 @@ class AgentRuntime:
                 "help",
                 "history",
                 "title",
+                "cd",
                 "model",
                 "effort",
                 "resume",
@@ -139,6 +140,7 @@ class AgentRuntime:
         recorded_path = self.agent.recorded_session_file_path
         return {
             "session_id": self.agent.session_id,
+            "cwd": str(self.agent.context_manager.cwd),
             "rollout_path": str(rollout_path) if rollout_path is not None else None,
             "recorded_rollout_path": (
                 str(recorded_path) if recorded_path is not None else None
@@ -187,6 +189,11 @@ class AgentRuntime:
         self.agent.set_model(model)
         self.publish_state("model")
 
+    def set_cwd(self, cwd):
+        self.require_idle("change directory")
+        self.agent.set_cwd(cwd)
+        self.publish_state("cwd")
+
     def resume(self, path=None, title=""):
         self.require_idle("resume")
         resumed = self.agent.resume(path)
@@ -275,6 +282,10 @@ class AgentRuntime:
             return {"kind": "help", "commands": self.commands()}
         if command == "history":
             return {"kind": "history", "state": self.snapshot()}
+        if command == "cd":
+            if argument:
+                self.set_cwd(argument)
+            return {"kind": "cwd", "cwd": str(self.agent.context_manager.cwd)}
         if command == "title":
             if argument:
                 self.set_title(argument)

pycodex/tools/apply_patch_tool.py

@@ -92,20 +92,15 @@ class ApplyPatchTool(BaseTool):
     }
     supports_parallel = False
 
-    def __init__(
-        self, cwd: "typing.Union[typing.Union[str, Path], None]" = None
-    ) -> "None":
-        self._workspace_root = Path(cwd or Path.cwd()).resolve()
-
     async def run(self, context: "ToolContext", args: "JSONValue") -> "JSONValue":
-        del context
+        cwd = context.cwd
         patch_text = str(args)
         logger.debug(
-            "apply_patch workspace={} bytes={}", self._workspace_root, len(patch_text)
+            "apply_patch workspace={} bytes={}", cwd, len(patch_text)
         )
         try:
             operations = self._parse_patch(patch_text)
-            return self._format_result(self._apply_operations(operations), exit_code=0)
+            return self._format_result(self._apply_operations(operations, cwd), exit_code=0)
         except ApplyPatchError as exc:
             return self._format_result(str(exc), exit_code=1)
 
@@ -239,52 +234,54 @@ class ApplyPatchTool(BaseTool):
     def _apply_operations(
         self,
         operations: "typing.List[typing.Union[typing.Union[_AddFileOp, _DeleteFileOp], _UpdateFileOp]]",
+        cwd: "Path",
     ) -> "str":
         preview: "typing.Dict[Path, typing.Union[str, None]]" = {}
         summaries: "typing.Dict[Path, str]" = {}
 
         for operation in operations:
             if isinstance(operation, _AddFileOp):
-                path = self._resolve_workspace_path(operation.path)
+                path = self._resolve_workspace_path(operation.path, cwd)
                 preview[path] = operation.content
                 summaries[path] = "A"
                 continue
 
             if isinstance(operation, _DeleteFileOp):
-                path = self._resolve_workspace_path(operation.path)
-                self._read_preview_file(path, preview)
+                path = self._resolve_workspace_path(operation.path, cwd)
+                self._read_preview_file(path, preview, cwd)
                 preview[path] = None
                 summaries[path] = "D"
                 continue
 
-            path = self._resolve_workspace_path(operation.path)
-            original = self._read_preview_file(path, preview)
-            updated = self._apply_update(path, original, operation.sections)
+            path = self._resolve_workspace_path(operation.path, cwd)
+            original = self._read_preview_file(path, preview, cwd)
+            updated = self._apply_update(path, original, operation.sections, cwd)
             destination = path
             if operation.move_to is not None:
-                destination = self._resolve_workspace_path(operation.move_to)
+                destination = self._resolve_workspace_path(operation.move_to, cwd)
                 preview[path] = None
                 summaries.pop(path, None)
             preview[destination] = updated
             summaries[destination] = "M"
 
         self._write_preview(preview)
-        return self._format_success(summaries)
+        return self._format_success(summaries, cwd)
 
     def _read_preview_file(
-        self, path: "Path", preview: "typing.Dict[Path, typing.Union[str, None]]"
+        self, path: "Path", preview: "typing.Dict[Path, typing.Union[str, None]]",
+        cwd: "Path",
     ) -> "str":
         if path in preview:
             content = preview[path]
             if content is None:
                 raise ApplyPatchError(
-                    f"apply_patch verification failed: Failed to read {self._display_path(path)}"
+                    f"apply_patch verification failed: Failed to read {self._display_path(path, cwd)}"
                 )
             return content
 
         if not path.exists() or not path.is_file():
             raise ApplyPatchError(
-                f"apply_patch verification failed: Failed to read {self._display_path(path)}"
+                f"apply_patch verification failed: Failed to read {self._display_path(path, cwd)}"
             )
         return path.read_text(encoding="utf-8", errors="replace")
 
@@ -293,6 +290,7 @@ class ApplyPatchTool(BaseTool):
         path: "Path",
         original_text: "str",
         sections: "typing.Tuple[_UpdateSection, ...]",
+        cwd: "Path",
     ) -> "str":
         lines = original_text.splitlines()
         cursor = 0
@@ -308,7 +306,7 @@ class ApplyPatchTool(BaseTool):
             if match_index is None:
                 raise ApplyPatchError(
                     "apply_patch verification failed: Failed to find expected lines in "
-                    f"{self._display_path(path)}"
+                    f"{self._display_path(path, cwd)}"
                 )
             lines[match_index : match_index + len(old_block)] = new_block
             cursor = match_index + len(new_block)
@@ -350,10 +348,10 @@ class ApplyPatchTool(BaseTool):
             path.parent.mkdir(parents=True, exist_ok=True)
             path.write_text(content, encoding="utf-8")
 
-    def _format_success(self, summaries: "typing.Dict[Path, str]") -> "str":
+    def _format_success(self, summaries: "typing.Dict[Path, str]", cwd: "Path") -> "str":
         buckets = {"A": [], "M": [], "D": []}
         for path, status in summaries.items():
-            buckets[status].append(self._display_path(path))
+            buckets[status].append(self._display_path(path, cwd))
         lines = ["Success:"]
         for status in ("A", "M", "D"):
             for rel_path in sorted(buckets[status]):
@@ -365,14 +363,14 @@ class ApplyPatchTool(BaseTool):
             f"Exit code: {exit_code}\n" "Wall time: 0 seconds\n" "Output:\n" f"{output}"
         )
 
-    def _resolve_workspace_path(self, path_text: "str") -> "Path":
+    def _resolve_workspace_path(self, path_text: "str", cwd: "Path") -> "Path":
         path = Path(path_text).expanduser()
-        resolved = path if path.is_absolute() else self._workspace_root / path
+        resolved = path if path.is_absolute() else cwd / path
         return resolved.resolve()
 
-    def _display_path(self, path: "Path") -> "str":
+    def _display_path(self, path: "Path", cwd: "Path") -> "str":
         try:
-            return path.relative_to(self._workspace_root).as_posix()
+            return path.relative_to(cwd).as_posix()
         except ValueError:
             return str(path)
 

pycodex/tools/base_tool.py

@@ -16,6 +16,7 @@ import traceback
 import typing
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
+from pathlib import Path
 
 from ..events import Event
 from ..protocol import (
@@ -40,6 +41,10 @@ if typing.TYPE_CHECKING:
 class ToolContext:
     turn_id: "str"
     history: "typing.Tuple[ConversationItem, ...]"
+    cwd: "Path"
+
+    def resolve_path(self, path=None) -> "Path":
+        return (self.cwd / Path("." if path is None else path).expanduser()).resolve()
 
 
 class StructuredToolOutput:

pycodex/tools/code_mode_manager.py

@@ -60,13 +60,8 @@ class ParsedExecSource:
 
 
 class CodeModeManager:
-    def __init__(
-        self,
-        registry: "ToolRegistry",
-        cwd: "typing.Union[typing.Union[str, Path], None]" = None,
-    ) -> "None":
+    def __init__(self, registry: "ToolRegistry") -> "None":
         self._registry = registry
-        self._default_cwd = Path(cwd or Path.cwd()).resolve()
         self._runtime_script = Path(__file__).with_name("exec_runtime.js")
         self._stored_values: "typing.Dict[str, JSONValue]" = {}
         self._cells: "typing.Dict[str, ExecCell]" = {}
@@ -130,7 +125,7 @@ class CodeModeManager:
         process = await asyncio.create_subprocess_exec(
             "node",
             str(self._runtime_script),
-            cwd=str(self._default_cwd),
+            cwd=str(context.cwd),
             stdin=asyncio.subprocess.PIPE,
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE,
@@ -153,7 +148,7 @@ class CodeModeManager:
                 "tools": self.enabled_tools(),
             },
         )
-        logger.debug("exec start cell_id={} cwd={}", cell_id, self._default_cwd)
+        logger.debug("exec start cell_id={} cwd={}", cell_id, context.cwd)
         return cell
 
     async def _read_stdout(self, cell: "ExecCell", context: "ToolContext") -> "None":
@@ -278,7 +273,7 @@ class CodeModeManager:
                 arguments=message.get("arguments"),
                 tool_type=tool.tool_type,
             ),
-            ToolContext(turn_id=context.turn_id, history=context.history),
+            context,
         )
         if result.is_error:
             payload = {

pycodex/tools/exec_command_tool.py

@@ -87,14 +87,13 @@ class ExecCommandTool(BaseTool):
         return self._manager.running_session_count()
 
     async def run(self, context: "ToolContext", args: "JSONDict") -> "JSONValue":
-        del context
         cmd = str(args.get("cmd", "")).strip()
         if not cmd:
             return "Error: `cmd` is required."
 
         return await self._manager.exec_command(
             cmd=cmd,
-            workdir=self._optional_string(args, "workdir"),
+            cwd=context.resolve_path(args.get("workdir")),
             shell=self._optional_string(args, "shell"),
             login=bool(args.get("login", DEFAULT_LOGIN)),
             tty=bool(args.get("tty", DEFAULT_TTY)),

pycodex/tools/grep_files_tool.py

@@ -53,18 +53,12 @@ class GrepFilesTool(BaseTool):
         "additionalProperties": False,
     }
 
-    def __init__(
-        self, cwd: "typing.Union[typing.Union[str, Path], None]" = None
-    ) -> "None":
-        self._working_directory = Path(cwd or Path.cwd()).resolve()
-
     async def run(self, context: "ToolContext", args: "JSONDict") -> "JSONValue":
-        del context
         pattern = str(args.get("pattern", "")).strip()
         include = str(args.get("include", "")).strip() or None
         limit = min(int(args.get("limit", DEFAULT_LIMIT)), MAX_LIMIT)
         path_arg = args.get("path")
-        search_path = self._resolve_path(path_arg)
+        search_path = context.resolve_path(path_arg)
 
         if not pattern:
             return "Error: `pattern` must not be empty."
@@ -88,7 +82,7 @@ class GrepFilesTool(BaseTool):
         try:
             process = await asyncio.create_subprocess_exec(
                 *command,
-                cwd=str(self._working_directory),
+                cwd=str(context.cwd),
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE,
             )
@@ -154,11 +148,3 @@ class GrepFilesTool(BaseTool):
 
         matches.sort(key=lambda path: path.stat().st_mtime, reverse=True)
         return [str(path) for path in matches[:limit]]
-
-    def _resolve_path(self, path_arg) -> "Path":
-        if path_arg in (None, ""):
-            return self._working_directory
-        path = Path(str(path_arg))
-        if not path.is_absolute():
-            path = self._working_directory / path
-        return path.resolve()

pycodex/tools/shell_command_tool.py

@@ -12,8 +12,6 @@ Expected behavior:
 """
 
 import asyncio
-import typing
-from pathlib import Path
 
 from ..protocol import JSONDict, JSONValue
 from .base_tool import BaseTool, ToolContext
@@ -54,13 +52,7 @@ class ShellCommandTool(BaseTool):
     }
     supports_parallel = False
 
-    def __init__(
-        self, cwd: "typing.Union[typing.Union[str, Path], None]" = None
-    ) -> "None":
-        self._working_directory = Path(cwd or Path.cwd()).resolve()
-
     async def run(self, context: "ToolContext", args: "JSONDict") -> "JSONValue":
-        del context
         command = str(args.get("command", "")).strip()
         timeout_ms = int(args.get("timeout_ms", DEFAULT_SHELL_TIMEOUT_MS))
         if not command:
@@ -68,7 +60,7 @@ class ShellCommandTool(BaseTool):
 
         login = bool(args.get("login", True))
         workdir_arg = args.get("workdir")
-        working_directory = self._resolve_workdir(workdir_arg)
+        working_directory = context.resolve_path(workdir_arg)
         shell_args = ["bash", "-lc" if login else "-c", command]
 
         process = await asyncio.create_subprocess_exec(
@@ -111,14 +103,6 @@ class ShellCommandTool(BaseTool):
 
         return "\n".join(pieces)
 
-    def _resolve_workdir(self, workdir_arg) -> "Path":
-        if workdir_arg in (None, ""):
-            return self._working_directory
-        workdir = Path(str(workdir_arg))
-        if not workdir.is_absolute():
-            workdir = self._working_directory / workdir
-        return workdir.resolve()
-
     def _clip_output(self, text: "str") -> "str":
         if len(text) <= MAX_OUTPUT_CHARS:
             return text

pycodex/tools/shell_tool.py

@@ -12,8 +12,6 @@ Expected behavior:
 """
 
 import asyncio
-import typing
-from pathlib import Path
 
 from ..protocol import JSONDict, JSONValue
 from .base_tool import BaseTool, ToolContext
@@ -51,13 +49,7 @@ class ShellTool(BaseTool):
     }
     supports_parallel = False
 
-    def __init__(
-        self, cwd: "typing.Union[typing.Union[str, Path], None]" = None
-    ) -> "None":
-        self._working_directory = Path(cwd or Path.cwd()).resolve()
-
     async def run(self, context: "ToolContext", args: "JSONDict") -> "JSONValue":
-        del context
         command = args.get("command")
         timeout_ms = int(args.get("timeout_ms", DEFAULT_SHELL_TIMEOUT_MS))
         if not isinstance(command, list) or not command:
@@ -66,7 +58,7 @@ class ShellTool(BaseTool):
             return "Error: each `command` entry must be a non-empty string."
 
         workdir_arg = args.get("workdir")
-        working_directory = self._resolve_workdir(workdir_arg)
+        working_directory = context.resolve_path(workdir_arg)
 
         process = await asyncio.create_subprocess_exec(
             *command,
@@ -108,14 +100,6 @@ class ShellTool(BaseTool):
 
         return "\n".join(pieces)
 
-    def _resolve_workdir(self, workdir_arg) -> "Path":
-        if workdir_arg in (None, ""):
-            return self._working_directory
-        workdir = Path(str(workdir_arg))
-        if not workdir.is_absolute():
-            workdir = self._working_directory / workdir
-        return workdir.resolve()
-
     def _clip_output(self, text: "str") -> "str":
         if len(text) <= MAX_OUTPUT_CHARS:
             return text

pycodex/tools/unified_exec_manager.py

@@ -121,10 +121,7 @@ class UnifiedExecSession:
 
 
 class UnifiedExecManager:
-    def __init__(
-        self, cwd: "typing.Union[typing.Union[str, Path], None]" = None
-    ) -> "None":
-        self._default_cwd = Path(cwd or Path.cwd()).resolve()
+    def __init__(self) -> "None":
         self._next_session_id = DEFAULT_SESSION_ID_START
         self._sessions: "typing.Dict[int, UnifiedExecSession]" = {}
         self._lock = threading.Lock()
@@ -146,7 +143,7 @@ class UnifiedExecManager:
     async def exec_command(
         self,
         cmd: "str",
-        workdir: "typing.Union[str, None]" = None,
+        cwd: "Path",
         shell: "typing.Union[str, None]" = None,
         login: "bool" = DEFAULT_LOGIN,
         tty: "bool" = DEFAULT_TTY,
@@ -155,7 +152,6 @@ class UnifiedExecManager:
     ) -> "str":
         session_id = await self._allocate_session_id()
         command = self._build_shell_command(cmd, shell, login)
-        cwd = self._resolve_workdir(workdir)
         logger.debug(
             "exec_command start session_id={} shell_command={} cwd={}",
             session_id,
@@ -381,14 +377,6 @@ class UnifiedExecManager:
                 }
             )
 
-    def _resolve_workdir(self, workdir: "typing.Union[str, None]") -> "Path":
-        if not workdir:
-            return self._default_cwd
-        path = Path(workdir)
-        if not path.is_absolute():
-            path = self._default_cwd / path
-        return path.resolve()
-
     def _build_shell_command(
         self,
         cmd: "str",

pycodex/tools/view_image_tool.py

@@ -15,9 +15,7 @@ Expected behavior:
   item that Codex uses when feeding image tool output back to the model.
 """
 
-import typing
 from importlib.util import find_spec
-from pathlib import Path
 
 from ..protocol import JSONDict, JSONValue
 from ..utils.image_utils import ImageProcessingError, load_image_data_url
@@ -65,13 +63,7 @@ class ViewImageTool(BaseTool):
     }
     output_schema = VIEW_IMAGE_OUTPUT_SCHEMA
 
-    def __init__(
-        self, cwd: "typing.Union[typing.Union[str, Path], None]" = None
-    ) -> "None":
-        self._workspace_root = Path(cwd or Path.cwd()).resolve()
-
     async def run(self, context: "ToolContext", args: "JSONDict") -> "JSONValue":
-        del context
         path_value = str(args.get("path", "")).strip()
         if not path_value:
             return "Error: `path` is required."
@@ -88,10 +80,7 @@ class ViewImageTool(BaseTool):
                 f"`{detail_value}`."
             )
 
-        path = Path(path_value)
-        if not path.is_absolute():
-            path = self._workspace_root / path
-        path = path.resolve()
+        path = context.resolve_path(path_value)
         if not path.exists():
             return f"Error: unable to locate image at `{path}`."
         if not path.is_file():

pycodex/utils/event_helpers.py

@@ -26,6 +26,8 @@ def format_command_result(result: "typing.Dict[str, object]") -> "str":
         return "Extra commands: " + ", ".join("/" + name for name in result["commands"])
     if kind in {"title", "title_changed"}:
         return "Session: " + (result["title"] or "untitled")
+    if kind == "cwd":
+        return "Current directory: " + result["cwd"]
     if kind == "models":
         return (
             "Current model: "

pycodex/utils/session_persist.py

@@ -163,6 +163,7 @@ class SessionRolloutRecorder:
 def list_resumable_sessions(
     codex_home: "Path",
     limit: "int" = 20,
+    session_id: "typing.Union[str, None]" = None,
 ) -> "typing.Tuple[typing.Dict[str, str], ...]":
     latest_rollouts_by_id: "typing.Dict[str, Path]" = {}
     for dirname in ROLLUP_SESSION_DIRNAMES:
@@ -173,6 +174,8 @@ def list_resumable_sessions(
             thread_id = _thread_id_from_rollout_path(path)
             if thread_id is None:
                 continue
+            if session_id is not None and thread_id.lower() != session_id.lower():
+                continue
             previous = latest_rollouts_by_id.get(thread_id)
             if previous is None or path.stat().st_mtime > previous.stat().st_mtime:
                 latest_rollouts_by_id[thread_id] = path
@@ -202,11 +205,16 @@ def list_resumable_sessions(
 
 def select_resumable_session(
     codex_home: "Path",
-    resume_index_text: "str",
+    resume_target: "str",
 ) -> "typing.Dict[str, str]":
-    normalized_target = resume_index_text.strip()
+    normalized_target = resume_target.strip()
+    if UUID_PATTERN.fullmatch(normalized_target):
+        sessions = list_resumable_sessions(codex_home, 1, normalized_target)
+        if not sessions:
+            raise ValueError(f"Session not found: {normalized_target}")
+        return sessions[0]
     if not normalized_target.isdigit():
-        raise ValueError("Usage: /resume <number>")
+        raise ValueError("Usage: /resume <number|session_id>")
 
     sessions = list_resumable_sessions(codex_home)
     resume_index = int(normalized_target)

{python_codex-0.4.6.dist-info → python_codex-0.4.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-codex
-Version: 0.4.6
+Version: 0.4.8
 Summary: A minimal Python extraction of Codex's main agent loop
 License-File: LICENSE
 Requires-Python: >=3.6.2
@@ -378,17 +378,22 @@ Current behavior:
   tool execution and model follow-up after tool results
 - startup shows a welcome, model, effort, endpoint and available commands.
 - assistant text is printed from streaming deltas directly
-- interactive mode supports `/history`, `/title`, `/model`, `/effort`, `/resume`,
+- interactive mode supports `/history`, `/title`, `/cd`, `/model`, `/effort`, `/resume`,
   `/compact`, and `/fork`
 - `/model <name>` switches the model used by later turns in the current
   interactive session; `/model` shows the current model and available choices
+- `/cd <directory>` changes the current session's working directory while idle;
+  `/cd` shows it. Relative paths and `~` are supported; paths containing spaces
+  can be entered directly without quotes. Later tools and context use the new directory.
 - `/effort low` switches effort while idle; `/effort` shows the current value,
   and `/effort default` restores the model default. Frontend labels show
   `model:effort`.
 - `/resume` with no argument lists the currently resumable sessions by their
   first user-message preview; `/resume 1` resumes the first listed session
-- `/resume <number>` replaces the in-memory history with the selected recorded
-  Codex rollout from `CODEX_HOME/sessions`. Tool calls without recorded results
+- `/resume <session_id>` accepts a full session UUID, including sessions older
+  than the displayed list. Both forms search `CODEX_HOME/sessions` and
+  `CODEX_HOME/archived_sessions` and replace the in-memory history with the
+  selected recorded Codex rollout. Tool calls without recorded results
   are omitted during restore; later saved messages and completed tools remain
   available, and the source file is left intact.
 - `/compact` synthesizes a local handoff summary, replaces the in-memory
@@ -452,6 +457,11 @@ Current behavior:
   original state paths and are saved in the new format. See the
   [workspace configuration example](packages/pycodex-ws/README.md).
   Add/delete actions and later session-state saves refresh the JSON file.
+  Each session starts in `work_dir` and can switch independently with `/cd`.
+  A small folder indicator appears inside the composer only when the session
+  directory differs from `work_dir`; hover for the full path. Directories persist
+  across workspace restarts, including for empty sessions. Relative chat/Canvas file links use the selected
+  session's directory; Canvas and workspace state files stay at their configured paths.
   Board HTML can reference local
   images beside the board (including nested paths) with relative URLs; only
   `image/*` files contained by the board directory are served.
@@ -811,6 +821,9 @@ event JSON format.
   uses `agent.tool_registry.runtime_environment`, not a forwarding Agent property.
   The global `get_agent_runtime_environment()` and
   separate `Agent(..., runtime_environment=...)` entry points are removed.
+- Configure cwd once with `ContextConfig(cwd=...)` or `build_agent(cwd=...)`.
+  Tools use the required `ToolContext.cwd` for each call; tool constructors
+  and `get_tools` do not take a separate default directory.
 - Each sub-agent gets its own context manager and runtime services. The sub-agent
   service retains terminal event status and queues one notification per terminal
   event. The parent consumes these notifications before its next normal model

{python_codex-0.4.6.dist-info → python_codex-0.4.8.dist-info}/RECORD

@@ -1,13 +1,13 @@
 pycodex/__init__.py,sha256=fHEyhylULeRo-5xEnl-UxT5ZpBzbFzRW7vLwdy_7oxU,2660
 pycodex/__main__.py,sha256=MHKZ_ae3fSLGTLUUMOx15fWdeOnJSHhq-zslRP5F5Lc,79
-pycodex/agent.py,sha256=GF-mNTnxHW8qw-72QEXfGGvExZzl8c3m6emZBux6ddw,21418
-pycodex/bootstrap.py,sha256=U1X5kwORpS5JnPk9HhIiOVWPQzDLlk_ro_cY2knwL8I,12421
+pycodex/agent.py,sha256=4YtHLDL0lKpU_KWnbKTNyI5UEfBPgkI4f8lndn8yjGA,21807
+pycodex/bootstrap.py,sha256=wUNipqvIPzJlcP3PTY0cCyPH_QTeIbSR8xtyw4AEP6Y,12282
 pycodex/cli.py,sha256=uCrRARI2IypIU-1aC0Y2DLzhzYGWQta1f7zYWsyaNnU,12797
-pycodex/context.py,sha256=yfNY2alT3caQQwhay47pSSrGUbgEAcLKhTVaZqtQ4yU,26610
+pycodex/context.py,sha256=8P3fBXbwzTKmoXGDdkzTsAghfOkAZstJnMTqr-cxHyI,27019
 pycodex/events.py,sha256=L7RkZ3EtFQOfWg1FIG2Y0mLpDKTKV6HGmXMy9HCoWX0,29794
 pycodex/model.py,sha256=VwPN9GEdoL8N8V4hFdMmJ1rGxL_tom3Nq7ZBonCum2k,45648
 pycodex/protocol.py,sha256=uzUz_06iA4m9vAoqZeCGiJ4SocKZDzOfCJUU4Bpt5dI,12033
-pycodex/runtime.py,sha256=M_gvWDvsZBivELjNkuhmwiZVRmlaQmzKZK1ZQ5-kLLE,24271
+pycodex/runtime.py,sha256=kEW4dLGcTX0nRArDpWhwm62c1il_1O-AgRHvsQqSYBY,24661
 pycodex/portable/__init__.py,sha256=FmspRPmblYuZIVXMpXaxE1uosCaz2hZDpkpOzxDJQic,1084
 pycodex/portable/client.py,sha256=DOxzZljVfN1ynmhqrChX7NsT1IFSFVKzEn1J3wvV3XQ,16038
 pycodex/portable/server.py,sha256=w4YD71Sxb7MD5q57GPuIgx7AoicTv0R9xzX2kAaibPA,7503
@@ -23,15 +23,15 @@ pycodex/prompts/permissions/sandbox_mode/read_only.md,sha256=2rAPEXsBYCcuttI5j3e
 pycodex/prompts/permissions/sandbox_mode/workspace_write.md,sha256=lVN-LwrBbHqlv5yVjcd_mU8tzZW8jfKpTatJKIZu9HI,277
 pycodex/tools/__init__.py,sha256=UYwmsX_Ckw_YaYQ6TYhUU6w5pxi2qzZoTrq6BAgNErM,1857
 pycodex/tools/agent_tool_schemas.py,sha256=8cL9ml4So0H6IIeK0ZzjAo9bk3VeprDOSYPpIamOqEU,2048
-pycodex/tools/apply_patch_tool.py,sha256=t8XFCGZ7q-s9C1Ty6qkReBRk-QD3ONvcKXLAz9djKRY,13956
-pycodex/tools/base_tool.py,sha256=Oqe-0RgH3mz70YckgBFD-tdvNJ9TQXrb0tuMbdy3bfc,6477
+pycodex/tools/apply_patch_tool.py,sha256=n30M-ofZlOkDCC18nX10MPF5FLROiURACFLG1hd4FK8,13906
+pycodex/tools/base_tool.py,sha256=NtzDTCudWIdwjhfgk6kd98C5KVl3PrruymOOURLApSA,6655
 pycodex/tools/clock_tool.py,sha256=2_RYbBEw4V9_f1L-qZl3hhJ6XNPM_gBDmOlCh1cCAjo,6575
 pycodex/tools/close_agent_tool.py,sha256=uIbCjsQx9MLkjVYheS8ZVf5VVPbC6Iviwox4pneJpmI,2030
-pycodex/tools/code_mode_manager.py,sha256=HUgtXxj3hGj2i4_tsToHLr8mGTV8uIob9vtYAZeLnQc,19166
-pycodex/tools/exec_command_tool.py,sha256=iqRiKaaX-AjG6LjATAMOakHIP0gpCWCj2o8af_8eAiQ,4464
+pycodex/tools/code_mode_manager.py,sha256=oEzYkebFdgX993NBC0A4R0mthg4qdhJ-dD0fgeE3III,18948
+pycodex/tools/exec_command_tool.py,sha256=EvlV355-i9trrKTAXDFiZyYMviTxL_FehhKlQmjuDpw,4443
 pycodex/tools/exec_runtime.js,sha256=DR1uocKailTqNWAcJNFJuQgFFMSUzTpT_uQsRaneg2s,3643
 pycodex/tools/exec_tool.py,sha256=tuC21rlhP8CPSYml4XnSDSRV0UPGkQ6aHj0DLIoOOvM,2274
-pycodex/tools/grep_files_tool.py,sha256=Ysw68VKI9OEvUH5haYx8FWuthkHykc1wskbuzjj8gTk,5293
+pycodex/tools/grep_files_tool.py,sha256=KCBVNaSTU45ND-iAhh14YawMyjQnMRZnGI1NGKL3zgg,4809
 pycodex/tools/list_dir_tool.py,sha256=_U6ouRcVbGHT5mChVyUsiMgDGrFK7EFMFaspPLAHtH8,5337
 pycodex/tools/read_file_tool.py,sha256=YK__uhIVldBjAQega5S_ZuZU5jgP_kLOwr-YhjAmRo4,9735
 pycodex/tools/request_permissions_tool.py,sha256=nEt3_uw3lmFXyydqcN3PxuKwrEvaRPtfjA_U8nikCtU,3978
@@ -39,12 +39,12 @@ pycodex/tools/request_user_input_tool.py,sha256=_7siHF2p3KiNDFwsTqKKIUw2kPCXMzLa
 pycodex/tools/resume_agent_tool.py,sha256=bZvXEUNdc1RVD2N5Msjv63Rni62FQk4gj9LAXK1Vsy8,1613
 pycodex/tools/runtime_services.py,sha256=KPLtB1e7jmqEN9rhXV70rUMlhYNFsXja4CypIunzXLU,15962
 pycodex/tools/send_input_tool.py,sha256=w63SKM05_e3oXvdaBtL-hk941TvkWKuTUDEqTSyWEMQ,3761
-pycodex/tools/shell_command_tool.py,sha256=US63I5xiV5zfO1Oox2yHUg7F6XoKzmyxtohfaQIsmrw,4216
-pycodex/tools/shell_tool.py,sha256=lqFH2XosfBg7yQKhpB7i4vLGz9sNQtEZihD0rjsmBCQ,4068
+pycodex/tools/shell_command_tool.py,sha256=bJKlTdIs2i28vH5f4GZfpunezr6JNicRzsL_6Vc3HvU,3675
+pycodex/tools/shell_tool.py,sha256=I6lYLABSmLddRrNmpk0Li83AV55MI8x0bckWaRkFGI0,3527
 pycodex/tools/spawn_agent_tool.py,sha256=Jx5jYpxsH_CQ3BLkXYPZuIINW5deO_zY8tyw8kZpreY,6208
-pycodex/tools/unified_exec_manager.py,sha256=XPN6PgBnjZ5WFZATNIqpWKUAuw8HMMD7mlfHJQjJQZM,14544
+pycodex/tools/unified_exec_manager.py,sha256=n6N9Sf125Tt4Vdl8C0lqng8tQbS7Dj04uZnDVqgGkxw,14056
 pycodex/tools/update_plan_tool.py,sha256=xwrSrerw5qfkbFc9Ltx1OZEmD__CWtryOy3UhL0-Jp4,3198
-pycodex/tools/view_image_tool.py,sha256=SCoiIHaQ51oYjYX69MRxjAK9b1P6_wOCIuZqzsC2rj8,4082
+pycodex/tools/view_image_tool.py,sha256=H7OP-QZEU5Gf-E4YnQbXfu2hDkL5-dJ3Apla2YYjErQ,3754
 pycodex/tools/wait_agent_tool.py,sha256=pLsnk9TxSt4v7krC7s7vxi91pLisSNU0lATt9s-P_3E,3134
 pycodex/tools/wait_tool.py,sha256=0_OO_DvMsBhG3oDKZePTOjZTBq1lmWntXAzqIqvebdA,3206
 pycodex/tools/web_search_tool.py,sha256=3ao1IvJw7MwcP35UKLbqrM-nlm5Z-UUFVdEzkJYOV1o,988
@@ -57,12 +57,12 @@ pycodex/utils/crypto.py,sha256=HRCXF26Ft3S8CG2X0YpZwa8GMU9YJ0Loo8Q9PMPMcNw,1249
 pycodex/utils/debug.py,sha256=5XMpWpwFSm6woyx6RGXvN2qL0afRtTQbwlOAv-LotTw,913
 pycodex/utils/doctor.py,sha256=fI66oQqB5zNL7aEpFbiHnzhELyp9XydwMyAGznw5YSE,10616
 pycodex/utils/dotenv.py,sha256=h7ZgvqpEswetqjhtwfiaHyokAHwNKPakizTAHPHz5Ds,1865
-pycodex/utils/event_helpers.py,sha256=EJToMDBcoxSYN71IUyZu_OEb0T0yXU4InYrowYon-OQ,6442
+pycodex/utils/event_helpers.py,sha256=ar4WoIkpiShoayN_GZlnDijy74CC2Z8_5p76EryduNk,6517
 pycodex/utils/get_env.py,sha256=L4S8h84tkgxZKvrxY7ezTgePbXepG-yIigUTKeY6uuE,6094
 pycodex/utils/image_utils.py,sha256=OUzUs0Cow4L8Z2np0EBeEUotAqqsCmRmhrV8AxZUXRw,2460
 pycodex/utils/model_metadata.py,sha256=uK3iI4yC7Ge7yN4I1_gQYalQ4MYKddz2qMwsmQb-P80,1337
 pycodex/utils/random_ids.py,sha256=jLTxZZ0MBbRdQOFDFWGVRjWzIo6FKSQ5ADXbQSLPp1s,379
-pycodex/utils/session_persist.py,sha256=_7Lz1jO7D0Qf16UVuZBKU_Si-k_cUVinnLMlsd1jVj4,23600
+pycodex/utils/session_persist.py,sha256=P-tsYdb1r0Ca_mVgTcK24bZM09zR-tNFgoFXlVIn5Q0,24012
 pycodex/utils/truncation.py,sha256=5D6vAorT8EgXgjd7ASwtraAyIZdlCR-w5jKZqJxDzho,5446
 pycodex/utils/_aes_gcm/LICENSE,sha256=KvdHagY3sYIK34GldJaRi34sNnGwMVJIIoDhbC9MRu8,2805
 pycodex/utils/_aes_gcm/README.md,sha256=D9XGeewCgU2PVqJCO6WusUs0Mw2FbMnABCqaVktqCnE,3045
@@ -83,8 +83,8 @@ responses_server/trajectory_dump.py,sha256=5_Wy6tslszrqx3j1JeP_boyTbzIicKy8No84P
 responses_server/tools/__init__.py,sha256=ivsBSEy0SBUhY-Uea5v1XMLXShkwHdCVl0id-1FwdZg,150
 responses_server/tools/custom_adapter.py,sha256=SnIiNUdomff3APtTriURAC9YCeEdhCDjzGMEYusfUdk,8340
 responses_server/tools/web_search.py,sha256=pnKH9JyTScRehWpZS3HpXRvjWsQvC0QZqxjEOCT4ndg,8936
-python_codex-0.4.6.dist-info/METADATA,sha256=uC7ydz7Y3S65w0jugBRDWho_eH7-zTfD_wWjt93qG90,47911
-python_codex-0.4.6.dist-info/WHEEL,sha256=KGYbc1zXlYddvwxnNty23BeaKzh7YuoSIvIMO4jEhvw,87
-python_codex-0.4.6.dist-info/entry_points.txt,sha256=sNUVakoVuTrzJH505ZgRTQxmtRRPUHV_EH0i6EbYTyM,45
-python_codex-0.4.6.dist-info/licenses/LICENSE,sha256=0X8ifk312hYAORM4hlzg8wVSEXYKNmiPgWlB1YIy2Nw,10926
-python_codex-0.4.6.dist-info/RECORD,,
+python_codex-0.4.8.dist-info/METADATA,sha256=OXHvFKPrz7ORC-G8Z-2VkiAzoiSFAyzgvE5ifGVO67E,48951
+python_codex-0.4.8.dist-info/WHEEL,sha256=KGYbc1zXlYddvwxnNty23BeaKzh7YuoSIvIMO4jEhvw,87
+python_codex-0.4.8.dist-info/entry_points.txt,sha256=sNUVakoVuTrzJH505ZgRTQxmtRRPUHV_EH0i6EbYTyM,45
+python_codex-0.4.8.dist-info/licenses/LICENSE,sha256=0X8ifk312hYAORM4hlzg8wVSEXYKNmiPgWlB1YIy2Nw,10926
+python_codex-0.4.8.dist-info/RECORD,,