Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
ae1d4be
feat(agents): agents follow the env's clock the way computers do (FD-…
williamloo-scale Nov 16, 2026
eea933c
refactor(agents): leave the Claude Code image to its own PR; agents s…
williamloo-scale Nov 17, 2026
608a93d
Merge origin/main
williamloo-scale Nov 17, 2026
182cef0
feat(agents): the Claude Code image follows the env's clock (FD-5916)
williamloo-scale Nov 17, 2026
bce00d4
fix(agents): agent clock review: new config's status, one clock per a…
williamloo-scale Nov 17, 2026
84381b8
fix(agents): keep each agent's clock record on a key of its own; a re…
williamloo-scale Nov 17, 2026
56dac45
fix(agents): agent clock keys can't collide; one clock env per agent;…
williamloo-scale Nov 17, 2026
c726743
chore: drop test run output committed by mistake
williamloo-scale Nov 17, 2026
5e8c756
Merge #714
williamloo-scale Nov 17, 2026
3b6f499
test(agents): the Claude Code image follows the env's clock end to en…
williamloo-scale Nov 17, 2026
cecc686
fix(agents): a failed agent sync retires its follower; the task's zon…
williamloo-scale Nov 17, 2026
afe55b4
Merge origin/main
williamloo-scale Nov 17, 2026
d523a6e
Merge #714
williamloo-scale Nov 17, 2026
ac0a39e
fix(agents): libfaketime's init can't deadlock the CLI; the CLI goes …
williamloo-scale Nov 17, 2026
c8ed6e1
fix(agents): a later clock sync leaves agents teardown_sandboxes took…
williamloo-scale Nov 17, 2026
b5d3b4b
fix(ci): the agent clock e2e skips as a declared capability gap; the …
williamloo-scale Nov 17, 2026
25af21a
chore: drop test-run output committed again, and ignore where the pro…
williamloo-scale Nov 17, 2026
7216c7c
fix(agents): route the CLI through egress by the clock page's armed f…
williamloo-scale Nov 17, 2026
fc3134b
Merge #714
williamloo-scale Nov 17, 2026
f8bd9ff
feat(a2a-agent): validate clock/v1 by the time the agent's own comman…
earakely-scale Nov 17, 2026
f9af1b6
refactor(a2a-agent): name the clock validation's timeouts and error l…
williamloo-scale Nov 17, 2026
43fdb97
fix(gateway): get_time says the machine's clock may not be synchroniz…
earakely-scale Nov 18, 2026
8bf8e4c
refactor(a2a-agent): move agent_clock to a2a_agent/clock.py, beside t…
earakely-scale Nov 18, 2026
810f42e
Merge #714
williamloo-scale Nov 18, 2026
686fdf1
test(agents): the agent clock e2e imports FOLLOWING_KEY from a2a_agen…
williamloo-scale Nov 18, 2026
9d7d6c0
Merge origin/main (#714 merged)
williamloo-scale Nov 18, 2026
1ff90bd
fix(agents): the Claude Code image installs protocol 0.1.575, the fir…
earakely-scale Nov 18, 2026
ca97b37
fix(computers): the clock follower follows a changed config while its…
earakely-scale Nov 18, 2026
0875e06
fix(agents): an armed clock keeps the agent's own NO_PROXY hosts dire…
williamloo-scale Nov 18, 2026
bb4f07f
test(agents): the agent clock checks run over every clocked agent ima…
williamloo-scale Nov 18, 2026
f228c9e
feat(agents): the Codex image follows the env's clock (FD-5916)
williamloo-scale Nov 18, 2026
a3f9e34
Merge main into #726: the clock and egress proxy now live in utils (#…
earakely-scale Nov 18, 2026
3c60fda
refactor(agents): the Claude Code image takes the clock and egress pr…
earakely-scale Nov 18, 2026
dd8de29
Merge #726: the clock and egress proxy come from utils
williamloo-scale Nov 18, 2026
150c563
test(agents): Claude Code's contract test takes the folders shared_so…
williamloo-scale Nov 18, 2026
cc3ff73
refactor(agents): the image takes the clock and egress proxy from uti…
williamloo-scale Nov 18, 2026
655614e
Merge #726
williamloo-scale Nov 18, 2026
84ca228
test(agents): the contract test takes the folders shared_sources.toml…
williamloo-scale Nov 18, 2026
aed27ee
fix(agents): a private HTTPS model endpoint is reached directly on an…
williamloo-scale Nov 18, 2026
2cea6f9
fix(agents): a private HTTPS model endpoint is reached directly on an…
williamloo-scale Nov 18, 2026
1837705
Merge #726
williamloo-scale Nov 18, 2026
b605046
test(agents): the clock test's HTTPS model hosts resolve publicly wit…
williamloo-scale Nov 18, 2026
a6f3720
fix(agents): the model host's lookup is bounded and kept, so a slow r…
williamloo-scale Nov 18, 2026
b47867b
fix(agents): the model host's lookup is bounded and kept, as #726's is
williamloo-scale Nov 18, 2026
9eff419
Merge #726
williamloo-scale Nov 18, 2026
ff48a8f
Merge main (#726 merged)
williamloo-scale Nov 18, 2026
155ef84
refactor(agents): follow the merged Claude Code image (#726): the pro…
williamloo-scale Nov 18, 2026
ef0d8de
fix(agents): keep a provider's CA bundle trusted, and send HTTPS MCP …
williamloo-scale Nov 18, 2026
716f5fc
Merge main: the control token (#780, #784)
williamloo-scale Nov 19, 2026
96ad61c
fix(egress): leaves start at the Unix epoch, which rustls accepts
williamloo-scale Nov 19, 2026
158f548
Merge remote-tracking branch 'origin/main' into wloo/codex-clock-image
williamloo-scale Nov 19, 2026
0a90ec9
Merge remote-tracking branch 'origin/main' into wloo/codex-clock-image
williamloo-scale Nov 19, 2026
d864a99
refactor(codex): take the shared egress rule (#818)
williamloo-scale Nov 19, 2026
764a13c
fix(codex): mcp-remote reaches the env's MCP servers through the egre…
williamloo-scale Nov 19, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 42 additions & 4 deletions src/agent_env/agents/agents/codex/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# The env's clock: the egress proxy, one static Go binary, and agent-env's libfaketime and its TLS shim, taken from
# agent-env's sources as clock/ and egress/ (shared_sources.toml) and built for this image's libc (Debian bookworm) in
# stages of their own, so no toolchain is left in the image.
FROM public.ecr.aws/docker/library/golang:1.26.11-bookworm@sha256:dc40a13b61304647ed7e5d581d246b86413dfc29d63c6d018310feb93cd98fc0 AS egress
COPY egress/ /egress/
RUN cd /egress && go vet ./... && go test -count=1 ./... \
&& CGO_ENABLED=0 GOFLAGS=-mod=readonly go build -trimpath -ldflags=-s -o /out/egress .

FROM public.ecr.aws/docker/library/python:3.11-slim@sha256:c20888b6acdd1e63e1c433a185bf3ad162c0288fe484616ce062e0d28add2900 AS clock
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
build-essential patch curl ca-certificates
COPY clock/ /clock/
RUN sh /clock/build.sh /out

FROM public.ecr.aws/docker/library/python:3.11-slim@sha256:c20888b6acdd1e63e1c433a185bf3ad162c0288fe484616ce062e0d28add2900
# Node for the Codex CLI's launcher and mcp-remote, checked against its published checksum; install.sh brings the same.
ARG NODE_VERSION=22.23.3
Expand All @@ -22,12 +36,36 @@ COPY requirements.txt model-requirements.txt ./
RUN pip install --no-cache-dir -r requirements.txt -r model-requirements.txt
# install.sh and run.sh are install/v1's: in the image, so they stay in its build context.
COPY a2a_server.py codex_bridge.py codex_config.py codex_kit.py entrypoint.sh install.sh run.sh ./
# The CLI's cwd, /app, and its state, fixed so neither follows the uid: Modal runs the image as root.
# Every clocked agent's egress rule, which the bridge imports, and the clock page's format it reads (shared_sources.toml).
COPY agent_clock/agent_egress.py clock/clockpage.py ./
# The CLI's cwd, /app, and its state, fixed so neither follows the uid.
RUN useradd --create-home --uid 10001 agent && mkdir -p /app /home/agent/.codex \
&& chown agent:agent /app /home/agent/.codex && chmod 0755 entrypoint.sh
# The env's clock: the follower and the egress proxy, each as its own user, under root's supervisord (root.conf), and
# agent-env's libfaketime and its TLS shim preloaded into every process, faking only the agent's (clock.conf). The
# follower's config is the agent's user's to write (agentenv_protocol.a2a_agent.clock) and the follower's to read.
RUN pip install --no-cache-dir supervisor==4.2.5 \
&& useradd --system --no-create-home --home-dir /nonexistent --shell /usr/sbin/nologin agentenv-clock \
&& useradd --system --no-create-home --home-dir /nonexistent --shell /usr/sbin/nologin agentenv-egress \
&& mkdir -p /usr/local/lib/agentenv-clock /usr/local/lib/agentenv-egress /etc/agentenv \
&& install -d -o agent -g agentenv-clock -m 2750 /etc/agentenv/clock \
&& touch /etc/agentenv/ca.pem \
&& cp /etc/ssl/certs/ca-certificates.crt /etc/agentenv/ca-bundle.pem \
&& cp /etc/ssl/certs/ca-certificates.crt /usr/local/lib/agentenv-egress/roots.pem
COPY --from=clock /out/libfaketimeMT.so.1 /out/libtls_realtime.so /usr/local/lib/agentenv-clock/
COPY --from=egress /out/egress /usr/local/lib/agentenv-egress/egress
COPY clock/clockpage.py clock/clock-follower /usr/local/lib/agentenv-clock/
COPY clock/clock.conf /etc/agentenv/clock.conf
COPY root.conf /etc/agentenv/root.conf
COPY start-agent /usr/local/bin/start-agent
RUN sed -i -e "s/^AGENTENV_SESSION_UID=.*/AGENTENV_SESSION_UID=$(id -u agent)/" \
-e "s/^AGENTENV_CLOCK_PAGE_UID=.*/AGENTENV_CLOCK_PAGE_UID=$(id -u agentenv-clock)/" /etc/agentenv/clock.conf \
&& chmod 0755 /usr/local/lib/agentenv-clock/clock-follower /usr/local/bin/start-agent \
&& printf '%s\n' /usr/local/lib/agentenv-clock/libfaketimeMT.so.1 /usr/local/lib/agentenv-clock/libtls_realtime.so \
> /etc/ld.so.preload
ENV A2A_PORT=8000 PYTHONPATH=/opt/agent CODEX_HOME=/home/agent/.codex
USER agent
WORKDIR /app
EXPOSE 8000
# CMD rather than ENTRYPOINT: Modal passes a sandbox's env to the image's CMD only.
CMD ["/opt/agent/entrypoint.sh"]
# Starts as root, which start-agent needs for the clock; the A2A server and the CLI run as the agent's user. CMD rather
# than ENTRYPOINT: Modal passes a sandbox's env to the image's CMD only.
CMD ["/usr/local/bin/start-agent"]
1 change: 1 addition & 0 deletions src/agent_env/agents/agents/codex/a2a_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,7 @@ def _record_event(event: dict) -> None:
task_id=cfg.task_id,
event_callback=_record_event,
max_turns=cfg.max_turns,
mcp_urls=[info["url"] for info in request.mcp_servers.values()],
config_overrides=[*codex_config.role_overrides(request.mcp_servers, cfg.role),
*codex_config.builtin_tools_overrides(cfg.builtin_tools),
*catalog],
Expand Down
14 changes: 11 additions & 3 deletions src/agent_env/agents/agents/codex/codex_bridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from datetime import datetime, timezone
from pathlib import Path

from agent_egress import clock_armed, egress_env
from codex_config import MODEL_HEADERS_ENV, model_headers

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -93,10 +94,12 @@ def get_last_attribution_snapshot() -> dict[str, str | None]:


def cli_env(environ: Mapping[str, str], *, project_id: str | None = None,
task_id: str | None = None) -> dict[str, str]:
task_id: str | None = None, mcp_urls: Sequence[str] = (), clock_armed: bool = False) -> dict[str, str]:
"""The CLI's environment: this process's, with the endpoint's key also under the name codex's own precheck
reads, and the run's attribution, which config.toml's env_http_headers sends as headers on each model call. The
run's tags join the x-litellm-tags [model.headers] names."""
run's tags join the x-litellm-tags [model.headers] names. On an armed clock (``clock_armed``) the CLI goes out through the
egress proxy (``egress_env``) for the model endpoint and the env's MCP servers (``mcp_urls``), which mcp-remote,
handed the proxy's variables (codex_config._PROXY_ENV), reaches through it too."""
env = dict(environ)
if env.get("LITELLM_API_KEY") and not env.get("OPENAI_API_KEY"):
env["OPENAI_API_KEY"] = env["LITELLM_API_KEY"]
Expand All @@ -110,6 +113,7 @@ def cli_env(environ: Mapping[str, str], *, project_id: str | None = None,
if name.lower() == _TAGS_HEADER), "")
if joined := _join_tags(configured, ",".join(tags)):
env["LITELLM_TAGS"] = joined
env.update(egress_env(environ, [env.get("LITELLM_BASE_URL", ""), *mcp_urls], armed=clock_armed))
return env


Expand Down Expand Up @@ -726,6 +730,7 @@ async def _run_codex_once(
config_overrides: Sequence[str] = (),
max_turns: int | None = None,
prior_tool_calls: int = 0,
mcp_urls: Sequence[str] = (),
) -> CodexResult:
# JSON Schema: codex's `--output-schema` flag takes a FILE PATH (unlike
# claude-code's inline-JSON `--json-schema`). Write the inner schema to a
Expand Down Expand Up @@ -774,7 +779,8 @@ async def _run_codex_once(
f"inactivity_watchdog={inactivity_s}s)"
)

subprocess_env = cli_env(os.environ, project_id=project_id, task_id=task_id)
subprocess_env = cli_env(os.environ, project_id=project_id, task_id=task_id, mcp_urls=mcp_urls,
clock_armed=clock_armed())
if project_id or task_id:
_record_attribution(project_id=project_id, task_id=task_id)
logger.info(
Expand Down Expand Up @@ -900,6 +906,7 @@ async def run_codex(
event_callback: Callable[[dict], None] | None = None,
config_overrides: Sequence[str] = (),
max_turns: int | None = None,
mcp_urls: Sequence[str] = (),
) -> CodexResult:
"""Run one logical turn with bounded transient recovery.

Expand Down Expand Up @@ -939,6 +946,7 @@ async def run_codex(
event_callback=event_callback,
config_overrides=config_overrides,
max_turns=max_turns,
mcp_urls=mcp_urls,
prior_tool_calls=tool_call_count,
)
failure = _resumable_api_failure(result)
Expand Down
9 changes: 7 additions & 2 deletions src/agent_env/agents/agents/codex/codex_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
# Codex hands a stdio MCP server only a few of its own variables; these tell mcp-remote, a Node client, which
# certificates to trust.
_TRUST_ENV = ("NODE_EXTRA_CA_CERTS", "NODE_TLS_REJECT_UNAUTHORIZED", "SSL_CERT_FILE")
# And these, which the bridge sets on an armed clock (agent_egress.egress_env), send it through the image's egress
# proxy: on the env's date, a certificate mcp-remote checked itself could be before its issue or past its expiry.
_PROXY_ENV = (*(name for base in ("HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY", "NO_PROXY") for name in (base, base.lower())),
"NODE_USE_ENV_PROXY")

# The CLI version CodexTool names the tools of; a test holds it to package.json's @openai/codex.
TOOLS_CLI_VERSION = "0.147.0"
Expand Down Expand Up @@ -244,7 +248,8 @@ def _server_entry(url: str, headers: dict[str, str] | None = None) -> dict[str,
"""Build a codex `mcp_servers.<name>` config table.

Wraps the URL in `mcp-remote` (stdio shim), a Node client that trusts the
certificates `_TRUST_ENV` names in the agent's environment. Each header is passed
certificates `_TRUST_ENV` names in the agent's environment and goes through the
proxy `_PROXY_ENV` names when the bridge sets one. Each header is passed
as a `--header "Name: Value"` arg. The `AgentEnv-Role` header, which the env
gateway filters tools by, is mcp-remote's `${AGENTENV_ROLE}`: the role the
registration's own headers name, from the entry's env, unless a CLI run passes
Expand All @@ -263,7 +268,7 @@ def _server_entry(url: str, headers: dict[str, str] | None = None) -> dict[str,
"command": "mcp-remote",
"args": args,
"env": {_ROLE_VARIABLE: registered},
"env_vars": list(_TRUST_ENV),
"env_vars": [*_TRUST_ENV, *_PROXY_ENV],
"startup_timeout_sec": 60,
# Codex silently drops non-`required` servers that miss its hard-coded
# 1s startup grace, which mcp-remote always does — but a `required`
Expand Down
4 changes: 2 additions & 2 deletions src/agent_env/agents/agents/codex/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ START_TIMEOUT_S=120
STOP_TIMEOUT_S=10
dockerfile_arg() { sed -n "s/^ARG $1=//p" "$here/Dockerfile"; }
NODE_VERSION=$(dockerfile_arg NODE_VERSION)
AGENT_FILES="a2a_server.py codex_bridge.py codex_config.py codex_kit.py requirements.txt run.sh"
AGENT_FILES="a2a_server.py codex_bridge.py codex_config.py codex_kit.py requirements.txt run.sh agent_clock/agent_egress.py clock/clockpage.py"

# put SRC DEST replaces DEST by a rename, so a binary an earlier install's agent still runs can be replaced; put_dir SRC
# DEST copies a folder to DEST, which isn't there.
Expand Down Expand Up @@ -144,7 +144,7 @@ put "$stage/agent.env" "$root/agent.env"
put "$here/package.json" "$root/npm/package.json"
put "$here/package-lock.json" "$root/npm/package-lock.json"
for file in $AGENT_FILES; do
put "$here/$file" "$root/app/$file"
put "$here/$file" "$root/app/${file##*/}"
done
on "chmod 0600 $r/agent.env && chmod 0755 $r/bin/uv $r/bin/codex $r/bin/mcp-remote $r/app/run.sh"

Expand Down
62 changes: 62 additions & 0 deletions src/agent_env/agents/agents/codex/root.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
; Root's supervisord (start-agent, FD-5916): the clock follower and the egress proxy, each as its own user, on real
; time, and the A2A server as the agent's user. The server starts with the real-time marker, which agent-env's
; libfaketime takes out of its environment, so the server's own records keep real timestamps and everything it starts,
; the CLI and the model's commands, reads the env's time. Its socket and logs are root's alone, so the agent's user can
; neither stop nor restart any of them. The follower follows nothing until the server writes its config, which
; sync_env_clock has it do, then picks it up within a quarter second.
[supervisord]
nodaemon=true
user=root
logfile=/var/log/agentenv-root/supervisord.log
pidfile=/run/agentenv-root/supervisord.pid
childlogdir=/var/log/agentenv-root

[unix_http_server]
file=/run/agentenv-root/supervisor.sock
chmod=0700

[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

[supervisorctl]
serverurl=unix:///run/agentenv-root/supervisor.sock

[program:clock]
command=/usr/local/bin/python3 -I /usr/local/lib/agentenv-clock/clock-follower
user=agentenv-clock
directory=/
priority=3
autorestart=true
startsecs=1
startretries=1000
redirect_stderr=true
stdout_logfile=/var/log/agentenv-root/clock.log
environment=HOME="/nonexistent",USER="agentenv-clock",LOGNAME="agentenv-clock"

[program:egress]
command=/usr/local/lib/agentenv-egress/egress serve
user=agentenv-egress
directory=/
priority=3
autorestart=true
startsecs=1
startretries=1000
redirect_stderr=true
stdout_logfile=/var/log/agentenv-root/egress.log
environment=HOME="/nonexistent",USER="agentenv-egress",LOGNAME="agentenv-egress",AGENTENV_EGRESS_PRIVATE="allow"

; uvicorn itself, not entrypoint.sh: the marker holds for the process it's given to alone, and a shell that execs
; uvicorn would hand uvicorn an environment without it.
[program:agent]
command=/usr/local/bin/python3 -m uvicorn a2a_server:app --host 0.0.0.0 --port %(ENV_A2A_PORT)s --timeout-graceful-shutdown 5
user=agent
directory=/app
priority=10
autorestart=true
stopasgroup=true
killasgroup=true
stopwaitsecs=30
redirect_stderr=true
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
environment=HOME="/home/agent",USER="agent",LOGNAME="agent",AGENTENV_REAL_TIME="1",AGENTENV_EGRESS_PROXY="http://127.0.0.1:3128",NODE_EXTRA_CA_CERTS="/etc/agentenv/ca.pem",SSL_CERT_FILE="/etc/agentenv/ca-bundle.pem",REQUESTS_CA_BUNDLE="/etc/agentenv/ca-bundle.pem"
Comment thread
williamloo-scale marked this conversation as resolved.
Resolved
5 changes: 5 additions & 0 deletions src/agent_env/agents/agents/codex/shared_sources.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# What this image's build context takes from agent-env's own sources, at the name its Dockerfile copies it from: one
# copy of each, shared with the other images that take it (utils/docker/context.py). Paths are under src/agent_env.
clock = "utils/faketime_clock"
egress = "utils/egress_proxy"
agent_clock = "utils/agent_clock"
30 changes: 30 additions & 0 deletions src/agent_env/agents/agents/codex/start-agent
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/sh
# The image's start (FD-5916). As root, it makes what the agent's user must not touch, the clock page and file (the
# clock user's from their first byte) and the egress proxy's CA (its key the egress user's alone, trusted in the
# system store, agent-env's trust files and every certifi bundle), then starts root's supervisord (root.conf), which
# runs the clock follower and the egress proxy, each as its own user on real time, and the A2A server as the agent's
# user on real time, everything it starts reading the env's time from the page. Until sync_env_clock has the agent
# follow a clock, the page holds real time and the proxy relays TLS untouched. Started as another user, the image runs
# the A2A server alone, as before, on real time.
set -eu
if [ "$(id -u)" != 0 ]; then
exec /opt/agent/entrypoint.sh
fi
install -d -o root -g root -m 0700 /var/log/agentenv-root /run/agentenv-root
install -d -o agentenv-clock -g agentenv-clock -m 0755 /run/agentenv-clock
python3 -I /usr/local/lib/agentenv-clock/clockpage.py create agentenv-clock
AGENTENV_SESSION_USER=agent AGENTENV_EGRESS_NSS=off \
/usr/local/lib/agentenv-egress/egress boot > /var/log/agentenv-root/egress-boot.log 2>&1 \
|| { cat /var/log/agentenv-root/egress-boot.log >&2; echo "the egress proxy's boot failed" >&2; exit 2; }
# A provider's own CA bundle stays trusted: Sail, for one, points SSL_CERT_FILE and the like at the bundle it signs
# model requests under, and root.conf points the server's trust at agent-env's bundles instead, so the provider's goes
# into them, and into the egress proxy's roots, which carry those requests once the clock is armed.
for bundle in "${SSL_CERT_FILE:-}" "${REQUESTS_CA_BUNDLE:-}" "${NODE_EXTRA_CA_CERTS:-}" "${CURL_CA_BUNDLE:-}"; do
case "$bundle" in ""|/etc/agentenv/*) continue ;; esac
[ -r "$bundle" ] || continue
for target in /etc/agentenv/ca-bundle.pem /etc/agentenv/ca.pem /usr/local/lib/agentenv-egress/roots.pem; do
grep -qxF "# agentenv: $bundle" "$target" 2>/dev/null && continue
{ printf '\n# agentenv: %s\n' "$bundle"; cat "$bundle"; } >> "$target"
done
done
exec supervisord -c /etc/agentenv/root.conf
10 changes: 9 additions & 1 deletion src/agent_env/utils/egress_proxy/leaves.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"sort"
"strings"
"sync"
"time"
)

// The longest common name X.509 allows (ub-common-name).
Expand Down Expand Up @@ -85,7 +86,7 @@ func (l *Leaves) For(host string, sans []string, trusted bool) (*tls.Certificate
template := &x509.Certificate{
SerialNumber: serial(),
Subject: pkix.Name{CommonName: truncate(host, commonNameLimit)},
NotBefore: by.cert.NotBefore.Add(LeafInset),
NotBefore: latest(by.cert.NotBefore.Add(LeafInset), LeafFrom),

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Historical clocks break HTTPS. This changes every shared proxy certificate to start in 1970, not just certificates used by Codex. A computer or Claude Code agent following a supported date such as 1960 now receives a certificate that is not yet valid when it opens a live HTTPS site. Those clients previously accepted the certificate starting in 1950. Keep the earlier window for existing clients rather than applying Codex’s date restriction to every image.

Prompt To Fix With AI
This is a comment left during a code review.
Path: src/agent_env/utils/egress_proxy/leaves.go
Line: 89

Comment:
**Historical clocks break HTTPS.** This changes every shared proxy certificate to start in 1970, not just certificates used by Codex. A computer or Claude Code agent following a supported date such as 1960 now receives a certificate that is not yet valid when it opens a live HTTPS site. Those clients previously accepted the certificate starting in 1950. Keep the earlier window for existing clients rather than applying Codex’s date restriction to every image.

---

For each issue above, determine whether it is valid and should be fixed. If so, fix it directly.

Fix in Cursor Fix in Claude Code Fix in Codex

NotAfter: by.cert.NotAfter.Add(-LeafInset),
KeyUsage: x509.KeyUsageDigitalSignature,
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
Expand Down Expand Up @@ -140,6 +141,13 @@ func mintCA(name string) (signer, error) {
return signer{cert: cert, key: key}, nil
}

func latest(a, b time.Time) time.Time {
if a.After(b) {
return a
}
return b
}

func parseSigner(certPEM, keyPEM []byte) (signer, error) {
block, _ := pem.Decode(certPEM)
if block == nil {
Expand Down
4 changes: 4 additions & 0 deletions src/agent_env/utils/egress_proxy/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ const PrivateEnv = "AGENTENV_EGRESS_PRIVATE"
var (
CAFrom = time.Date(1950, 1, 1, 0, 0, 0, 0, time.UTC)
CAUntil = time.Date(9999, 12, 31, 23, 59, 59, 0, time.UTC)

// The earliest a leaf starts, however early its CA does: rustls (webpki, as in the Codex CLI) refuses any
// certificate dated before the Unix epoch as badly encoded.
LeafFrom = time.Unix(0, 0).UTC()
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion src/agent_env/utils/egress_proxy/proxy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ func TestAUniverseInsideTheSitesCertificateIsSplicedAndOneOutsideIntercepted(t *
t.Fatalf("outside: %q %v", body, err)
}
leaf := resp.TLS.PeerCertificates[0]
if leaf.CheckSignatureFrom(h.ca.cert) != nil || !leaf.NotAfter.After(later) || leaf.NotBefore.Year() != 1950 {
if leaf.CheckSignatureFrom(h.ca.cert) != nil || !leaf.NotAfter.After(later) || !leaf.NotBefore.Equal(LeafFrom) {
t.Fatalf("the client's leaf: issuer %s, %s to %s", leaf.Issuer, leaf.NotBefore, leaf.NotAfter)
}
row := h.lastRow()
Expand Down
1 change: 1 addition & 0 deletions tst/integration/task_step/test_agent_env_clock_local.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ class Agent:
AGENTS = {
"claude-code": Agent(bridge="claude_bridge", version=("claude", "--version"), shows="(Claude Code)",
turn=_claude_turn),
"codex": Agent(bridge="codex_bridge", version=("codex", "--version"), shows="codex-cli"),
"opencode": Agent(bridge="opencode_bridge", version=("opencode", "--version"), shows="1.17.18"),
}

Expand Down
12 changes: 9 additions & 3 deletions tst/unit/agents/codex/agent.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
"""The Codex agent's modules, imported from its folder as its image runs them: by their own names, from the folder on
the path."""
"""The Codex agent's modules, imported as its image runs them: by their own names, from its folder and from the folders
its build context takes as agent_clock/ and clock/, whose modules the image copies beside the bridge."""

import importlib
import importlib.util
import os
import sys
from pathlib import Path

import agent_env
from tst.util.build_context import sent

AGENT_DIR = Path(agent_env.__file__).parent / "agents" / "agents" / "codex"
sys.path.insert(0, str(AGENT_DIR))
IMPORTED = [str(AGENT_DIR), str(sent(AGENT_DIR, "agent_clock/agent_egress.py").parent),
str(sent(AGENT_DIR, "clock/clockpage.py").parent)]
PYTHONPATH = os.pathsep.join(IMPORTED)
sys.path[:0] = IMPORTED
codex_bridge = importlib.import_module("codex_bridge")
codex_config = importlib.import_module("codex_config")
codex_kit = importlib.import_module("codex_kit")
agent_egress = importlib.import_module("agent_egress")
# By its path: Claude Code's a2a_server, imported by the same name, may be loaded already.
_spec = importlib.util.spec_from_file_location("codex_a2a_server", AGENT_DIR / "a2a_server.py")
a2a_server = importlib.util.module_from_spec(_spec)
Expand Down
Loading
Loading