optio-codex 0.4.1__tar.gz → 0.4.2__tar.gz

{optio_codex-0.4.1 → optio_codex-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: optio-codex
-Version: 0.4.1
+Version: 0.4.2
 Summary: Run OpenAI Codex as an optio task; local subprocess; ttyd-served TUI iframe.
 Author-email: Kristof Csillag <kristof.csillag@deai-labs.com>
 License-Expression: Apache-2.0

{optio_codex-0.4.1 → optio_codex-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "optio-codex"
-version = "0.4.1"
+version = "0.4.2"
 description = "Run OpenAI Codex as an optio task; local subprocess; ttyd-served TUI iframe."
 readme = "README.md"
 license = "Apache-2.0"

{optio_codex-0.4.1 → optio_codex-0.4.2}/src/optio_codex/conversation.py

@@ -496,7 +496,9 @@ class CodexConversation:
 
     # -- Conversation protocol surface --------------------------------------
 
-    async def send(self, text: str) -> None:
+    async def send(self, text: str, *, uuid: str | None = None) -> None:
+        """``uuid`` is an advisory message id (Fix 13a/Fix 23): this backend
+        has no message identity of its own, so it is accepted and ignored."""
         if self._closed.is_set():
             raise ConversationClosed(self._close_reason or "conversation closed")
         if self.thread_id is None:

optio_codex-0.4.2/src/optio_codex/prompt.py

@@ -0,0 +1,48 @@
+"""AGENTS.md composition for optio-codex: the profile, plus a thin wrapper over
+the shared composer (``optio_agents.prompt.compose_instructions_file``), which
+owns all of the text. The exclude list is resolved with the same function the
+snapshot archive uses, so the section's preservation claims never drift."""
+
+from optio_agents.prompt import AgentPromptProfile, compose_instructions_file
+
+from optio_codex.snapshots import effective_workdir_exclude
+
+__all__ = ["PROFILE", "compose_agents_md"]
+
+PROFILE = AgentPromptProfile(
+    state_dir="home/.codex/",
+    state_dir_contents=(
+        "the codex session store (rollout files under `home/.codex/sessions`, "
+        "auth, config)"
+    ),
+)
+
+
+def compose_agents_md(
+    consumer_instructions: str,
+    *,
+    workdir_exclude: list[str] | None = None,
+    documentation: str | None = None,
+    supports_resume: bool = True,
+    host_protocol: bool = True,
+    omit_task_framing: bool = False,
+    fs_isolation_dirs: list[tuple[str, str]] | None = None,
+    file_download: bool = False,
+    check_resume_log_every_message: bool = True,
+) -> str:
+    """Render <workdir>/AGENTS.md for an optio-codex task.
+
+    ``workdir_exclude=None`` means the codex defaults
+    (``snapshots.effective_workdir_exclude``), not the bare framework ones."""
+    return compose_instructions_file(
+        consumer_instructions,
+        profile=PROFILE,
+        workdir_exclude=effective_workdir_exclude(workdir_exclude),
+        documentation=documentation,
+        supports_resume=supports_resume,
+        host_protocol=host_protocol,
+        omit_task_framing=omit_task_framing,
+        fs_isolation_dirs=fs_isolation_dirs,
+        file_download=file_download,
+        check_resume_log_every_message=check_resume_log_every_message,
+    )

{optio_codex-0.4.1 → optio_codex-0.4.2}/src/optio_codex/session.py

@@ -16,6 +16,7 @@ from optio_core.models import BasicAuth, TaskInstance
 
 from optio_agents import HookContext, RESUME_NOTICE, SYSTEM_MESSAGE_PREFIX, get_protocol
 from optio_agents import seeds as _seeds
+from optio_agents.fs_grants import fs_isolation_dirs
 from optio_agents.input_listener import serialized, start_input_listener
 from optio_agents.protocol.session import _SessionFailed, run_log_protocol_session
 from optio_agents.account import EMPTY, accounts_to_metadata
@@ -303,6 +304,7 @@ async def run_codex_session(ctx: ProcessContext, config: CodexTaskConfig) -> Non
                     workdir_exclude=config.workdir_exclude,
                     supports_resume=config.supports_resume,
                     file_download=config.file_download,
+                    fs_isolation_dirs=fs_isolation_dirs(config, host.workdir),
                 ),
             )
         else:
@@ -891,6 +893,7 @@ async def _maybe_refresh_on_resume(
         workdir_exclude=new_config.workdir_exclude,
         supports_resume=new_config.supports_resume,
         file_download=new_config.file_download,
+        fs_isolation_dirs=fs_isolation_dirs(new_config, host.workdir),
     )
     try:
         existing = await hook_ctx.read_text_from_host("AGENTS.md", silent=True)

{optio_codex-0.4.1 → optio_codex-0.4.2}/src/optio_codex.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: optio-codex
-Version: 0.4.1
+Version: 0.4.2
 Summary: Run OpenAI Codex as an optio task; local subprocess; ttyd-served TUI iframe.
 Author-email: Kristof Csillag <kristof.csillag@deai-labs.com>
 License-Expression: Apache-2.0

{optio_codex-0.4.1 → optio_codex-0.4.2}/tests/test_config_hooks.py

@@ -16,6 +16,7 @@ from unittest.mock import AsyncMock, MagicMock
 import pytest
 
 from optio_agents import get_protocol
+from optio_agents.fs_grants import fs_isolation_dirs
 from optio_codex.prompt import compose_agents_md
 from optio_codex.types import CodexTaskConfig
 
@@ -239,7 +240,7 @@ async def test_restore_workdir_blob_decrypts(monkeypatch):
 # --- P2 unit: _maybe_refresh_on_resume -------------------------------------
 
 
-def _resume_fakes(existing_agents_md: str):
+def _resume_fakes(existing_agents_md: str, workdir: str = "/workdir"):
     """Build (host, hook_ctx) fakes whose read returns ``existing_agents_md``
     and whose write records the rewritten body."""
     written: dict[str, str] = {}
@@ -249,6 +250,7 @@ def _resume_fakes(existing_agents_md: str):
 
     fake_host = MagicMock()
     fake_host.write_text = _write_text
+    fake_host.workdir = workdir
 
     fake_hook = MagicMock()
     fake_hook.read_text_from_host = AsyncMock(return_value=existing_agents_md)
@@ -260,6 +262,7 @@ async def test_maybe_refresh_identity_unchanged_is_noop():
 
     protocol = get_protocol(browser="redirect")
     cfg = _cfg(consumer_instructions="orig")
+    workdir = "/workdir"
     existing = compose_agents_md(
         cfg.consumer_instructions,
         documentation=protocol.documentation if cfg.host_protocol else None,
@@ -267,8 +270,9 @@ async def test_maybe_refresh_identity_unchanged_is_noop():
         workdir_exclude=cfg.workdir_exclude,
         supports_resume=cfg.supports_resume,
         file_download=cfg.file_download,
+        fs_isolation_dirs=fs_isolation_dirs(cfg, workdir),
     )
-    host, hook, written = _resume_fakes(existing)
+    host, hook, written = _resume_fakes(existing, workdir=workdir)
 
     refreshed = await _maybe_refresh_on_resume(host, hook, cfg, protocol)
     assert refreshed == []
@@ -285,12 +289,14 @@ async def test_maybe_refresh_mutating_hook_rewrites_agents_md():
         return dataclasses.replace(c, consumer_instructions="UPDATED INSTRUCTIONS")
 
     cfg = _cfg(consumer_instructions="orig", on_resume_refresh=_bump)
+    workdir = "/workdir"
     stale = compose_agents_md(
         "orig",
         documentation=protocol.documentation,
         host_protocol=True,
+        fs_isolation_dirs=fs_isolation_dirs(cfg, workdir),
     )
-    host, hook, written = _resume_fakes(stale)
+    host, hook, written = _resume_fakes(stale, workdir=workdir)
 
     refreshed = await _maybe_refresh_on_resume(host, hook, cfg, protocol)
     assert refreshed == ["AGENTS.md"]

{optio_codex-0.4.1 → optio_codex-0.4.2}/tests/test_prompt.py

@@ -84,3 +84,13 @@ def test_host_protocol_false_keeps_resume_section_and_explainer():
     # passing; same caveat as test_host_protocol_false_adds_system_explainer.)
     assert get_protocol(browser="redirect").documentation not in md
     assert "## Log channel" not in md
+
+
+def test_sandbox_note_and_no_prompt_text_of_its_own():
+    import inspect
+    import optio_codex.prompt as m
+    out = compose_agents_md("x", fs_isolation_dirs=[("/wd", "rwx")])
+    assert "**Filesystem access:**" in out
+    src = inspect.getsource(m)
+    assert "This harness may pause your session" not in src
+    assert "originate from the harness" not in src

optio_codex-0.4.1/src/optio_codex/prompt.py

@@ -1,184 +0,0 @@
-"""AGENTS.md composition for optio-codex.
-
-Codex reads an ``AGENTS.md`` file in its workdir. The shared framing and
-the keyword-protocol documentation are owned by ``optio-agents`` (the
-prompt SSOT); this module threads codex's protocol mode through and owns
-the codex-specific resume-awareness section (Stage 2), rendered from the
-EFFECTIVE snapshot exclude list so its preservation claims never drift
-from what the snapshot actually keeps.
-"""
-
-from optio_agents.prompt import compose_agents_md as _compose_agents_md_host
-from optio_agents.prompt import downloadables_block
-from optio_agents.protocol import ProtocolFeatures, build_log_channel_prompt
-
-from optio_codex.snapshots import effective_workdir_exclude
-
-
-# Self-contained System: explainer for sessions without the keyword-protocol
-# docs (which normally explain the convention). Per-wrapper copy is the
-# established pattern (claudecode/opencode/grok each carry their own).
-_SYSTEM_PREFIX_EXPLAINER = """\
-(Messages prefixed `System:` on your input channel originate from the
-harness coordinating this session, not from the human user.)
-"""
-
-
-RESUME_SECTION_TEMPLATE = """## Resumes
-
-This harness may pause your session, save your context to a database,
-terminate the underlying process, and later rehydrate it. From your
-point of view the conversation is fully continuous — you keep your
-prior context and will not "notice" the resume.
-
-**A resume can happen at any point, not only at the start.** The host
-environment may have changed across a resume — different host,
-different running processes, files outside this workdir gone — even
-though your context remembers everything as alive and well.
-
-**The workdir (this directory) is preserved across resumes, with two
-caveats:**
-
-- {excludes_clause}
-- **Anything outside the workdir is not preserved.**
-
-- **Your `home/.codex/` directory — the codex session store (rollout
-  files under `home/.codex/sessions`, auth, config) — IS preserved
-  across resumes** (minus the excluded paths above), so your history
-  travels with you even when the underlying process and host change.
-
-{outside_clause}
-
-### Detecting a resume: `resume.log`
-
-Each session start (fresh or resumed) appends one line to
-`./resume.log`. Line format:
-
-```
-<ISO 8601 UTC timestamp>[ REFRESHED:<comma-separated filenames>]
-```
-
-The very first line is the original launch timestamp; each subsequent
-line is a resume. The optional `REFRESHED:` suffix signals that the
-harness rewrote the listed files on that resume (e.g.
-`2026-05-28T13:15:42Z REFRESHED:AGENTS.md`) — your in-memory copy of
-those files is stale and must be re-read before continuing.
-
-**At the start of every new incoming user message, read
-`./resume.log` first.** Compare the latest line to the value you
-remembered last time you checked. If a new line has appeared, treat
-the situation as a resume:
-
-- Verify any tools, processes, or files you previously gathered
-  outside the workdir are still where you left them.
-- Re-establish anything that's gone (re-launch a server, re-fetch a
-  file, etc.) before continuing.
-- **If the latest line carries a `REFRESHED:` suffix, re-read each
-  listed file** (e.g. `cat ./AGENTS.md`) — the harness updated it
-  since your last context snapshot and the version you remember is
-  out of date.
-- Then resume the work you were doing.
-
-If a resume slips past unnoticed, a failing tool call is the
-next-best signal — re-check `./resume.log` then.
-
-You may also be notified of a resume by a `System:` message on your input
-channel; when you see one, follow the `resume.log` procedure above.
-"""
-
-
-def _render_resume_section(workdir_exclude: list[str] | None) -> str:
-    """Render RESUME_SECTION_TEMPLATE with the EFFECTIVE exclude list.
-
-    ``effective_workdir_exclude`` is the same resolver the snapshot archive
-    uses (``None`` → the codex defaults), so what this section claims is
-    preserved is exactly what the snapshot preserves.
-    """
-    effective = effective_workdir_exclude(workdir_exclude)
-    if not effective:
-        excludes_clause = (
-            "**No paths are excluded** — every file in the workdir is preserved."
-        )
-        outside_clause = (
-            "If you need to stash large data, place it outside the workdir "
-            "(e.g. `/tmp/`) — but remember it may be missing when you next look."
-        )
-    else:
-        excludes_str = ", ".join(f"`{p}`" for p in effective)
-        excludes_clause = (
-            f"**Paths matching the snapshot exclude list are NOT preserved**, "
-            f"even inside the workdir. The current exclude list is: {excludes_str}."
-        )
-        outside_clause = (
-            "If you need to stash large data, place it outside the workdir "
-            "(e.g. `/tmp/`) or inside an excluded subdirectory — but remember "
-            "any such location may be missing when you next look."
-        )
-    return RESUME_SECTION_TEMPLATE.format(
-        excludes_clause=excludes_clause,
-        outside_clause=outside_clause,
-    )
-
-
-def compose_agents_md(
-    consumer_instructions: str,
-    *,
-    documentation: str | None = None,
-    host_protocol: bool = True,
-    workdir_exclude: list[str] | None = None,
-    supports_resume: bool = True,
-    file_download: bool = False,
-) -> str:
-    """Build the full AGENTS.md body.
-
-    ``documentation`` is the keyword-protocol block; the session passes
-    ``get_protocol(browser="redirect").documentation``. Defaults (for unit
-    tests / standalone callers) to codex's ``redirect`` docs. It must
-    always come from the session's ``Protocol`` where one exists — never
-    rebuild features at a second site.
-
-    ``host_protocol=False`` omits the keyword-protocol documentation and
-    instead includes a self-contained ``System:`` message explainer
-    (guide Part 2D); iframe mode always runs with ``host_protocol=True``
-    (validated in ``CodexTaskConfig``), the False branch serves
-    conversation mode in a later stage.
-
-    ``supports_resume=True`` (default) appends the resume-awareness section
-    so the agent watches ``resume.log`` and knows ``home/.codex`` (minus
-    ``workdir_exclude``) survives across resumes. ``workdir_exclude`` is
-    this task's snapshot exclude list (None → the codex defaults), used to
-    keep the section's claims in sync with what is actually preserved.
-
-    ``file_download=True`` appends the downloadables instruction block so
-    codex offers files to the human via the ``optio-file:`` sentinel link
-    (conversation_ui file-download feature); the wording is comparative when
-    the keyword protocol is active (``host_protocol``).
-    """
-    if file_download:
-        consumer_instructions = (
-            consumer_instructions.rstrip()
-            + downloadables_block(comparative=host_protocol)
-        )
-    if host_protocol:
-        if documentation is None:
-            documentation = build_log_channel_prompt(
-                ProtocolFeatures(browser="redirect")
-            )
-    else:
-        documentation = None
-    resume_section: str | None = (
-        _render_resume_section(workdir_exclude) if supports_resume else None
-    )
-    if not host_protocol:
-        # The protocol docs normally explain the `System:` convention;
-        # without them the composed prompt carries its own explainer.
-        resume_section = (
-            resume_section + _SYSTEM_PREFIX_EXPLAINER
-            if resume_section
-            else _SYSTEM_PREFIX_EXPLAINER
-        )
-    return _compose_agents_md_host(
-        consumer_instructions,
-        documentation=documentation,
-        resume_section=resume_section,
-    )