docker: auto-restart, and resume the session the agent was actually in
The decoder died mid-task and it took four separate findings to explain, each of which read as something else: 1. OOM-KILLED, REPORTED AS A CLEAN EXIT. `OOMKilled: true` with **ExitCode 0**. So `--restart on-failure` would treat a memory kill as a successful finish and leave the agent down -- the policy has to be `unless-stopped`. 2. THE JOB CAP WAS SET AND THEN REMOVED THREE LINES LATER. build-reborn has always exported CARGO_BUILD_JOBS, but a raw `cargo test --release -p sylpheed-formats` never reaches the wrapper. Adding `-e CARGO_BUILD_JOBS` to the launcher did not help either: the entrypoint recomputes and exports over it unconditionally. An explicit value now wins, and says so in the log. 3. THE MEMORY CONSTANT WAS WRONG. `mem_gib * 2 / 3` assumes ~1.5 GB per job; release rustc on this workspace needs ~2 GB, and 4 jobs in 6 GB is what died. Divisor is now 2. 4. `--continue` CANNOT RESUME AN ABRUPT DEATH, which is the only kind we get. It resolves through ~/.claude.json's per-project `history`/`lastSessionId`, and MEASURED mid-session both are None -- they are written at a graceful shutdown. A killed container never writes them, so `--continue` answered "No conversation found to continue" with 33 MB of transcripts in the volume beside it. Persisting .claude.json did not help, because the fields were never populated in the first place; that attempt is removed rather than left in looking useful. The TRANSCRIPTS are durable and named by session id, so the entrypoint reads the id off the newest one for its cwd and passes `--resume <id>`. Verified on both agents: each reattached to its exact prior session and appended to the same file rather than opening a new one. The /loop prompt is still passed alongside `--resume`, so the loop is RE-ARMED rather than merely restored -- a resumed conversation with no wake-up scheduled answers once and stops, which looks like resuming and is not. Restarting into the same death is guarded at the other end: a start less than 120 s after the previous one begins FRESH instead of continuing back into whatever killed it. That fired correctly during this work. On resume the agent is told it was restarted, that its in-progress work is uncommitted in the tree, that any build or capture it had running did not finish and its absence is not a result, and which wrapper to prefer over a raw release build.
This commit is contained in:
MechaCat02
@@ -84,11 +84,26 @@ if [ -r /sys/fs/cgroup/memory.max ]; then
|
||||
[ "$_m" != max ] && mem_gib=$(( _m / 1073741824 ))
|
||||
fi
|
||||
[ "${mem_gib:-0}" -lt 1 ] && mem_gib=1
|
||||
by_mem=$(( mem_gib * 2 / 3 ))
|
||||
# 🔴 THIS CONSTANT WAS WRONG, AND IT COST A RUN. `mem_gib * 2 / 3` assumes
|
||||
# ~1.5 GB per job. On 2026-09-01 a raw `cargo test --release -p sylpheed-formats`
|
||||
# ran 4 jobs in a 6 GB container and was OOM-killed mid-task. Release-mode rustc
|
||||
# on this workspace needs closer to 2 GB, so the divisor is 2, not 3/2.
|
||||
#
|
||||
# ⚠️ And the kill reported `OOMKilled: true` with **ExitCode 0**, so it read as a
|
||||
# clean exit — which is why the restart policy is `unless-stopped` rather than
|
||||
# `on-failure`.
|
||||
by_mem=$(( mem_gib / 2 ))
|
||||
[ "$by_mem" -lt 1 ] && by_mem=1
|
||||
jobs=$(( cpus < by_mem ? cpus : by_mem ))
|
||||
# An EXPLICIT cap from the launcher wins. Without this the launcher's
|
||||
# `-e CARGO_BUILD_JOBS=...` was computed, exported over, and silently discarded
|
||||
# — the guardrail was set and then removed three lines later.
|
||||
if [ -n "${CARGO_BUILD_JOBS:-}" ] && [ "${CARGO_BUILD_JOBS}" -ge 1 ] 2>/dev/null; then
|
||||
jobs="$CARGO_BUILD_JOBS"
|
||||
_why=" (explicit, from the launcher)"
|
||||
fi
|
||||
export SYLPH_JOBS="$jobs" CARGO_BUILD_JOBS="$jobs" CMAKE_BUILD_PARALLEL_LEVEL="$jobs"
|
||||
log "build parallelism: $jobs (cpus=$cpus, mem=${mem_gib}GiB avail)"
|
||||
log "build parallelism: $jobs${_why:-} (cpus=$cpus, mem=${mem_gib}GiB avail)"
|
||||
|
||||
mkdir -p "$HOME/shots" "$HOME/logs"
|
||||
|
||||
@@ -160,6 +175,10 @@ fi
|
||||
if [ -f "$HOME/.claude.host.json" ] && [ ! -s "$HOME/.claude.json" ]; then
|
||||
cp "$HOME/.claude.host.json" "$HOME/.claude.json" 2>/dev/null || true
|
||||
fi
|
||||
|
||||
# Nothing is restored into `~/.claude.json` on purpose. Resuming is done by
|
||||
# SESSION ID off the transcript instead — see the resume block below for why
|
||||
# the index is useless for this.
|
||||
# `credential.helper=store` rewrites this file by rename-over-target, which
|
||||
# fails with EBUSY on a bind mount -- reported as `fatal: unable to write
|
||||
# credential store`, while the push itself succeeds. A fatal line that is
|
||||
@@ -181,6 +200,77 @@ if [ "${SYLPH_AUTONOMOUS:-0}" = "1" ]; then
|
||||
if [ "$#" -eq 1 ] && [ "$1" = "bash" ]; then
|
||||
set --
|
||||
fi
|
||||
# ── Resume across a restart ────────────────────────────────────────────────
|
||||
#
|
||||
# The container restarts automatically now, and a restart that opens a BLANK
|
||||
# session throws away everything the agent knew. That is not hypothetical: on
|
||||
# 2026-09-01 an OOM kill ended a run mid-task with a 2.7 MB transcript and two
|
||||
# files uncommitted in the volume.
|
||||
#
|
||||
# 🔴 RESUME BY SESSION ID, NOT BY `--continue`. Measured 2026-09-01:
|
||||
#
|
||||
# `--continue` resolves through `~/.claude.json`'s per-project `history` and
|
||||
# `lastSessionId`. Those are written at a GRACEFUL SHUTDOWN — mid-session the
|
||||
# live file has `history: None`, `lastSessionId: None`. A container that is
|
||||
# OOM-killed or `docker rm -f`ed never writes them, which is exactly the case
|
||||
# this feature exists for. So `--continue` answered "No conversation found to
|
||||
# continue" with 33 MB of perfectly good transcripts in the volume beside it,
|
||||
# and persisting `.claude.json` did not help because the fields were never
|
||||
# populated in the first place.
|
||||
#
|
||||
# The TRANSCRIPTS are durable and are named by session id, so read the id off
|
||||
# the newest one for this working directory. Claude Code has not started yet
|
||||
# at this point, so the newest is the previous run's.
|
||||
#
|
||||
# The /loop prompt is still passed, so the loop is RE-ARMED rather than merely
|
||||
# restored — a resumed conversation with no wake-up scheduled answers once and
|
||||
# stops, which looks like resuming and is not.
|
||||
SYLPH_STAMP="$HOME/.claude/.sylph-last-start"
|
||||
SYLPH_RESUME=0
|
||||
SYLPH_SESSION=""
|
||||
SYLPH_PROJ="$HOME/.claude/projects/$(printf '%s' "$PWD" | sed 's#/#-#g')"
|
||||
if [ -d "$SYLPH_PROJ" ]; then
|
||||
_newest=$(ls -1t "$SYLPH_PROJ"/*.jsonl 2>/dev/null | head -1)
|
||||
if [ -n "$_newest" ]; then
|
||||
SYLPH_SESSION=$(basename "$_newest" .jsonl)
|
||||
SYLPH_RESUME=1
|
||||
fi
|
||||
fi
|
||||
# 🔴 A POISONED TRANSCRIPT MUST NOT CRASH-LOOP. If the last start was under
|
||||
# two minutes ago we are already in a restart loop, and continuing back into
|
||||
# whatever killed us is the one thing guaranteed not to help. Start fresh and
|
||||
# say so, rather than burning tokens on the same death repeatedly.
|
||||
if [ "$SYLPH_RESUME" = "1" ] && [ -f "$SYLPH_STAMP" ]; then
|
||||
_last=$(cat "$SYLPH_STAMP" 2>/dev/null || echo 0)
|
||||
_now=$(date +%s)
|
||||
if [ $((_now - _last)) -lt 120 ]; then
|
||||
SYLPH_RESUME=0
|
||||
log "restarted <120s after the last start — restart loop suspected;"
|
||||
log " starting a FRESH session rather than continuing into the same death"
|
||||
fi
|
||||
fi
|
||||
mkdir -p "$HOME/.claude" 2>/dev/null || true
|
||||
date +%s > "$SYLPH_STAMP" 2>/dev/null || true
|
||||
|
||||
if [ "$SYLPH_RESUME" = "1" ] && [ "$#" -eq 1 ]; then
|
||||
set -- "$1
|
||||
|
||||
⚠️ YOU WERE RESTARTED, and this session was resumed — your context is intact,
|
||||
but the process that was running when it died is gone. Before anything else:
|
||||
|
||||
1. \`git -C /work status\`. Whatever you had in progress is still in the tree,
|
||||
UNCOMMITTED. Commit it and \`push-work\` before starting anything new.
|
||||
2. Any build, test or capture you had running did NOT finish. Do not read its
|
||||
absence as a result.
|
||||
3. The likeliest cause is an OOM kill — this container is capped at 6 GB.
|
||||
\`CARGO_BUILD_JOBS\` is now set for you in the environment; do not raise it,
|
||||
and prefer \`build-reborn test\` over a raw \`cargo test --release\`, which
|
||||
bypasses the wrapper's job cap. That is exactly what killed the run on
|
||||
2026-09-01."
|
||||
log "resuming session ${SYLPH_SESSION%%-*}… with a restart notice"
|
||||
fi
|
||||
[ "$SYLPH_RESUME" = "1" ] && set -- --resume "$SYLPH_SESSION" "$@"
|
||||
|
||||
# The flag the user asked for. It is refused under root, which is why this
|
||||
# image runs as `agent`.
|
||||
# Remote Control registers the session with your account so you can chat with
|
||||
|
||||
Reference in New Issue
Block a user