Repository navigation
[FD-5916] feat(agents): the Claude Code image follows the env's clock #726
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
37 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 eea933c
refactor(agents): leave the Claude Code image to its own PR; agents s…
williamloo-scale 608a93d
Merge origin/main
williamloo-scale 182cef0
feat(agents): the Claude Code image follows the env's clock (FD-5916)
williamloo-scale bce00d4
fix(agents): agent clock review: new config's status, one clock per a…
williamloo-scale 84381b8
fix(agents): keep each agent's clock record on a key of its own; a re…
williamloo-scale 56dac45
fix(agents): agent clock keys can't collide; one clock env per agent;…
williamloo-scale c726743
chore: drop test run output committed by mistake
williamloo-scale 5e8c756
Merge #714
williamloo-scale 3b6f499
test(agents): the Claude Code image follows the env's clock end to en…
williamloo-scale cecc686
fix(agents): a failed agent sync retires its follower; the task's zon…
williamloo-scale afe55b4
Merge origin/main
williamloo-scale d523a6e
Merge #714
williamloo-scale ac0a39e
fix(agents): libfaketime's init can't deadlock the CLI; the CLI goes …
williamloo-scale c8ed6e1
fix(agents): a later clock sync leaves agents teardown_sandboxes took…
williamloo-scale b5d3b4b
fix(ci): the agent clock e2e skips as a declared capability gap; the …
williamloo-scale 25af21a
chore: drop test-run output committed again, and ignore where the pro…
williamloo-scale 7216c7c
fix(agents): route the CLI through egress by the clock page's armed f…
williamloo-scale fc3134b
Merge #714
williamloo-scale f8bd9ff
feat(a2a-agent): validate clock/v1 by the time the agent's own comman…
earakely-scale f9af1b6
refactor(a2a-agent): name the clock validation's timeouts and error l…
williamloo-scale 43fdb97
fix(gateway): get_time says the machine's clock may not be synchroniz…
earakely-scale 8bf8e4c
refactor(a2a-agent): move agent_clock to a2a_agent/clock.py, beside t…
earakely-scale 810f42e
Merge #714
williamloo-scale 686fdf1
test(agents): the agent clock e2e imports FOLLOWING_KEY from a2a_agen…
williamloo-scale 9d7d6c0
Merge origin/main (#714 merged)
williamloo-scale 1ff90bd
fix(agents): the Claude Code image installs protocol 0.1.575, the fir…
earakely-scale ca97b37
fix(computers): the clock follower follows a changed config while its…
earakely-scale 0875e06
fix(agents): an armed clock keeps the agent's own NO_PROXY hosts dire…
williamloo-scale bb4f07f
test(agents): the agent clock checks run over every clocked agent ima…
williamloo-scale a3f9e34
Merge main into #726: the clock and egress proxy now live in utils (#…
earakely-scale 3c60fda
refactor(agents): the Claude Code image takes the clock and egress pr…
earakely-scale 150c563
test(agents): Claude Code's contract test takes the folders shared_so…
williamloo-scale aed27ee
fix(agents): a private HTTPS model endpoint is reached directly on an…
williamloo-scale a6f3720
fix(agents): the model host's lookup is bounded and kept, so a slow r…
williamloo-scale 660d816
fix(agents): a private HTTPS model endpoint goes through the egress p…
earakely-scale 8848ea0
fix(agents): the egress proxy's private-network setting joins its pro…
earakely-scale File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| # The image installs the newest agentenv-framework-protocol at or above this floor; a release doesn't pin it, so the | ||
| # image is built again only when this folder changes. The floor is the first that serves peer-agents/v1's tools, which | ||
| # the agent advertises without handlers of its own; raise it when the agent needs a newer protocol. | ||
| agentenv-framework-protocol[agent]>=0.1.351 | ||
| # image is built again only when this folder changes. The floor is the first that serves clock/v1's sync_time on an | ||
| # agent whose image runs the clock follower (agentenv_protocol.a2a_agent.clock), which this image does; raise it when | ||
| # the agent needs a newer protocol. | ||
| agentenv-framework-protocol[agent]>=0.1.575 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| 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" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| # 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" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| #!/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; } | ||
| exec supervisord -c /etc/agentenv/root.conf |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Blocker: with this preload the Claude Code CLI deadlocks at startup.
claude --versionnever returns, as the agent user or root, armed or not./etc/ld.so.preloadit returns at once.libtls_realtime.sois fine; preloading onlylibfaketimeMT.so.1hangs.clock_gettime→ftpl_init→pthread_oncewaiting on itself (futex, single thread). Upstream 0.9.12's own comment at that call says "If ftpl_init ends up recursing, pthread_once will deadlock."I think this, not the proxy, is the
claude CLI timed out after 600son #714's CI: the CLI never gets as far as a request.A per-thread guard fixed it on my box: a clock call made while libfaketime's init is running reads the kernel clock instead of waiting. With it, the whole flow worked end to end:
Today's date isline and the model's commands followed the env's clock, including jumps during a turn;api.anthropic.comthrough egress at a date outside its certificate.The computer base ships the same patch, so other programs on computers that call the clock this way might freeze too; I haven't checked that.
The guard I tested (on top of libfaketime.patch)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you, this was the real blocker. I reproduced it:
claude --versionhung (killed bytimeoutafter 20 s) with/etc/ld.so.preloadin place, and returned at once without it. Fixed in ac0a39e with your guard, appended to the agent'sclock/libfaketime.patch. It applies cleanly after the existing patch, andclaude --versionnow returns as root and asagent. The computer base doesn't take it yet, so the drift test now checks that the agent's patch is the base's, byte for byte, followed by the guard. Whether computers need it too is worth its own PR. I agree this, not the proxy, explains the 600 s timeouts. I also made the CLI go through egress only while the follower follows an armed clock, and reach a plain-HTTP model endpoint directly, so a private endpoint keeps working when the clock isn't set.