didericis-claude
9e3b7e441e
First slice of chunk 4: implement the two provisioning methods
that don't depend on agent-image tooling beyond `cp` and
`mkdir`. provision_ca / provision_git / provision_supervise
land once the agent-image gap is solved (chunk 4b+) — they need
update-ca-certificates, git, and the claude binary respectively,
none of which the chunk-2d alpine placeholder provides.
What this PR ships:
- `claude_bottle/backend/smolmachines/provision/` subpackage
with `prompt.py` + `skills.py`. Each routes through
`smolvm.machine_cp` / `machine_exec`. provision_prompt mirrors
the docker contract (file always copied; return value drives
--append-system-prompt-file iff the agent has a non-empty
prompt). provision_skills mkdir + cp per skill, matching
the docker backend's loop.
- prepare.py now writes the prompt file under
agent_state_dir(slug) with the agent's `prompt` body, mode
0o600. The in-guest path is `/root/.claude-bottle-prompt.txt`
(alpine has no `node` user; will become `/home/node/...` once
the real claude-bottle image lands).
- launch.py calls `provision(plan, machine_name)` after
machine_start. The returned prompt path threads to
SmolmachinesBottle so exec_claude can add
--append-system-prompt-file when the agent has a prompt.
- backend.py: provision_prompt / provision_skills now real;
provision_git is a deliberate stub (waiting on the git-gate
inner Plan + git in the agent image). provision_supervise
stays the chunk-2d stub.
Tests:
- 7 new unit cases (test_smolmachines_provision.py): argv
shape (mocked smolvm.machine_cp / .machine_exec),
prompt return-value contract, no-op-with-no-skills,
CLAUDE_BOTTLE_GUEST_SKILLS_DIR override, fail-on-missing-skill.
- 1 new integration case in test_smolmachines_launch.py:
end-to-end verification that the prompt file lands in the
alpine guest at /root/.claude-bottle-prompt.txt with the
expected content (via `bottle.exec("cat ...")`). The smoke +
the two TSI probes stay green.
552 unit + 4 integration (Darwin+smolvm+docker gated) passing.
What's left in chunk 4:
- 4b: thread the inner Plans (PipelockProxyPlan / EgressPlan /
GitGatePlan / SupervisePlan) through prepare + launch so the
bundle daemons actually run (currently daemons_csv="").
- 4c: the agent-image-conversion gap — get claude-code + git +
curl + ca-certificates into the guest image (build a
.smolmachine via `pack create --from-vm` after manual setup,
or push the docker image to a registry smolvm can pull).
- 4d: provision_ca + provision_git + provision_supervise once
4b + 4c land.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
33 lines
1.3 KiB
Python
33 lines
1.3 KiB
Python
"""Copy the agent prompt into a running smolmachines bottle.
|
|
|
|
The prompt file is always copied (so the in-guest path always
|
|
exists) but `--append-system-prompt-file` only fires when the
|
|
agent actually has a prompt — the return value signals which
|
|
case, mirroring the docker backend's contract."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from .. import smolvm as _smolvm
|
|
from ..bottle_plan import SmolmachinesBottlePlan
|
|
|
|
|
|
# In-guest path for the prompt. Smolvm's default agent image
|
|
# (alpine for now; the real claude-bottle image later) runs as
|
|
# root with $HOME=/root. The path is also surfaced as the return
|
|
# value so the caller can pass it via --append-system-prompt-file.
|
|
_IN_GUEST_PROMPT_PATH = "/root/.claude-bottle-prompt.txt"
|
|
|
|
|
|
def provision_prompt(plan: SmolmachinesBottlePlan, target: str) -> str | None:
|
|
"""Copy the prompt file into the running smolvm guest. Returns
|
|
the in-guest path if the agent has a non-empty prompt (drives
|
|
--append-system-prompt-file), else None. The file is copied
|
|
either way so the path always exists — mirrors the docker
|
|
backend's behavior."""
|
|
_smolvm.machine_cp(
|
|
str(plan.prompt_file),
|
|
f"{target}:{_IN_GUEST_PROMPT_PATH}",
|
|
)
|
|
agent = plan.spec.manifest.agents[plan.spec.agent_name]
|
|
return _IN_GUEST_PROMPT_PATH if agent.prompt else None
|