didericis-claude
ac8c7ba696
End-to-end provisioning parity with the docker backend. After this
chunk a smolmachines bottle has a working trust store, git-gate
gitconfig, and supervise MCP registration — same shape as docker,
dispatched via `smolvm machine cp` / `smolvm machine exec` instead
of `docker cp` / `docker exec`.
Adds three new provision modules:
- ca.py: select egress vs pipelock CA (same logic as
docker), machine cp + update-ca-certificates,
log sha256 fingerprint.
- git.py: copy host .git when --cwd was passed; render
~/.gitconfig with insteadOf URLs. URL prefix is
`git://<bundle_ip>:9418/...` (no DNS in the
TSI-allowlisted guest) vs docker's
`git://git-gate/...`.
- supervise.py: `claude mcp add` via machine_exec; URL is
`http://<bundle_ip>:9100/`. Failure is logged but
non-fatal (matches docker).
Shared render: `render_git_gate_gitconfig` moves out of
backend/docker/provision/git.py into the platform-neutral
claude_bottle/git_gate.py (renamed to git_gate_render_gitconfig
for consistency with the existing git_gate_render_* helpers),
parameterized on a `gate_host` argument so both backends use the
same logic with different addresses.
Path/user fixups for the post-chunk-4c agent image (real
claude-bottle image, USER node, $HOME=/home/node):
- prompt.py default path moves from /root/... to
/home/node/.claude-bottle-prompt.txt; chown + chmod after
machine cp.
- skills.py default skills dir moves from /root/.claude/skills to
/home/node/.claude/skills; chown -R per skill.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
43 lines
1.8 KiB
Python
43 lines
1.8 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.
|
|
|
|
`smolvm machine cp` lands files as root inside the VM; the claude
|
|
process runs as `node`, so we chown + chmod the prompt after the
|
|
copy. Same flow as the docker backend's provision_prompt."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
|
|
from .. import smolvm as _smolvm
|
|
from ..bottle_plan import SmolmachinesBottlePlan
|
|
|
|
|
|
# `node` is the agent user from the repo Dockerfile.
|
|
# CLAUDE_BOTTLE_GUEST_HOME mirrors the docker backend's
|
|
# CLAUDE_BOTTLE_CONTAINER_HOME knob.
|
|
_DEFAULT_GUEST_HOME = "/home/node"
|
|
|
|
|
|
def provision_prompt(plan: SmolmachinesBottlePlan, target: str) -> str | None:
|
|
"""Copy the prompt file into the running smolvm guest, fix
|
|
ownership/mode. 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."""
|
|
guest_home = os.environ.get("CLAUDE_BOTTLE_GUEST_HOME", _DEFAULT_GUEST_HOME)
|
|
in_guest_prompt_path = f"{guest_home}/.claude-bottle-prompt.txt"
|
|
|
|
_smolvm.machine_cp(str(plan.prompt_file), f"{target}:{in_guest_prompt_path}")
|
|
# machine cp lands as root, source's 0o600 mode is preserved —
|
|
# node can't read its own prompt without these two.
|
|
_smolvm.machine_exec(target, ["chown", "node:node", in_guest_prompt_path])
|
|
_smolvm.machine_exec(target, ["chmod", "600", in_guest_prompt_path])
|
|
|
|
agent = plan.spec.manifest.agents[plan.spec.agent_name]
|
|
return in_guest_prompt_path if agent.prompt else None
|