didericis
62d2e36e5c
Previously prepare wrote two on-disk artifacts that launch consumed: agent.env (NAME=VALUE) and docker-args (paired -e\nNAME\n lines), with launch parsing the second back into argv. Docker requires the literals file on disk for --env-file, but the args-file round-trip was a pure serialize/deserialize trip with hand-rolled line pairing logic. Drop docker-args entirely. Pass forwarded names as a structured tuple[str, ...] field on DockerBottlePlan; launch iterates it directly to extend docker_args. _write_env_files becomes _write_env_file (only the literals file remains).
111 lines
4.1 KiB
Python
111 lines
4.1 KiB
Python
"""DockerBottlePlan — concrete subclass of BottlePlan.
|
|
|
|
Carries the Docker-specific resolved fields produced by
|
|
DockerBottleBackend.prepare. The launch step consumes it without
|
|
further resolution; show_plan-style rendering is the `print` method.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import sys
|
|
from dataclasses import dataclass
|
|
from pathlib import Path
|
|
|
|
from ...log import info
|
|
from ...pipelock import PipelockProxyPlan, pipelock_effective_allowlist
|
|
from .. import BottlePlan
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class DockerBottlePlan(BottlePlan):
|
|
"""Docker-specific resolved fields produced by
|
|
DockerBottleBackend.prepare. Inherits `spec` and `stage_dir` from
|
|
BottlePlan."""
|
|
|
|
slug: str
|
|
container_name: str
|
|
container_name_pinned: bool
|
|
image: str
|
|
derived_image: str # "" -> no derived image
|
|
runtime_image: str # image actually launched (derived or base)
|
|
env_file: Path # docker --env-file: NAME=VALUE literals
|
|
forwarded_env: tuple[str, ...] # docker -e <NAME>: forwarded by-name
|
|
prompt_file: Path
|
|
proxy_plan: PipelockProxyPlan
|
|
allowlist_summary: str
|
|
use_runsc: bool
|
|
|
|
def print(self, *, remote_control: bool) -> None:
|
|
"""Render the y/N preflight summary to stderr. Pure presentation."""
|
|
spec = self.spec
|
|
manifest = spec.manifest
|
|
agent = manifest.agents[spec.agent_name]
|
|
bottle = manifest.bottle_for(spec.agent_name)
|
|
|
|
env_names = list(bottle.env.keys())
|
|
if spec.forward_oauth_token:
|
|
env_names.append("CLAUDE_CODE_OAUTH_TOKEN")
|
|
|
|
ssh_hosts = [e.Host for e in bottle.ssh]
|
|
prompt_first_line = agent.prompt.splitlines()[0] if agent.prompt else ""
|
|
runtime_label = "runsc (gVisor)" if self.use_runsc else "runc (default)"
|
|
|
|
print(file=sys.stderr)
|
|
info(f"agent : {spec.agent_name}")
|
|
info(f"image : {self.image}")
|
|
if self.derived_image:
|
|
info(
|
|
f"cwd : {spec.user_cwd} -> /home/node/workspace "
|
|
f"(derived: {self.derived_image})"
|
|
)
|
|
info(f"container : {self.container_name}")
|
|
info(f"stage dir : {self.stage_dir}")
|
|
info("env (names only): " + (", ".join(env_names) if env_names else "(none)"))
|
|
info("skills : " + (" ".join(agent.skills) if agent.skills else "(none)"))
|
|
info(f"docker runtime : {runtime_label}")
|
|
info(f"bottle : {agent.bottle}")
|
|
if ssh_hosts:
|
|
info(f" ssh hosts : {', '.join(ssh_hosts)}")
|
|
else:
|
|
info(" ssh hosts : (none)")
|
|
info(f" egress : {self.allowlist_summary}")
|
|
info(
|
|
f"prompt : {len(agent.prompt)} chars; "
|
|
f"first line: {prompt_first_line or '(empty)'}"
|
|
)
|
|
info("remote-control : " + ("enabled" if remote_control else "disabled"))
|
|
print(file=sys.stderr)
|
|
|
|
def to_dict(self, *, remote_control: bool) -> dict[str, object]:
|
|
spec = self.spec
|
|
manifest = spec.manifest
|
|
agent = manifest.agents[spec.agent_name]
|
|
bottle = manifest.bottle_for(spec.agent_name)
|
|
|
|
env_names = list(bottle.env.keys())
|
|
if spec.forward_oauth_token:
|
|
env_names.append("CLAUDE_CODE_OAUTH_TOKEN")
|
|
|
|
hosts = pipelock_effective_allowlist(bottle)
|
|
return {
|
|
"agent": spec.agent_name,
|
|
"bottle": agent.bottle,
|
|
"container_name": self.container_name,
|
|
"image": self.image,
|
|
"derived_image": self.derived_image,
|
|
"stage_dir": str(self.stage_dir),
|
|
"runtime": "runsc" if self.use_runsc else "runc",
|
|
"env_names": env_names,
|
|
"skills": list(agent.skills),
|
|
"ssh_hosts": [e.Host for e in bottle.ssh],
|
|
"egress": {
|
|
"host_count": len(hosts),
|
|
"hosts": hosts,
|
|
},
|
|
"prompt": {
|
|
"length": len(agent.prompt),
|
|
"first_line": agent.prompt.splitlines()[0] if agent.prompt else "",
|
|
},
|
|
"remote_control": remote_control,
|
|
}
|