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>
64 lines
2.4 KiB
Python
64 lines
2.4 KiB
Python
"""Copy host-side skill directories into a running smolmachines
|
|
bottle.
|
|
|
|
Skills are validated on the host before launch by
|
|
`BottleBackend._validate_skills`; this module assumes that
|
|
validation has already run. A skill that disappears between
|
|
validation and copy still dies loudly rather than silently
|
|
producing a partial guest."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
|
|
from ....log import die, info
|
|
from ...util import host_skill_dir
|
|
from .. import smolvm as _smolvm
|
|
from ..bottle_plan import SmolmachinesBottlePlan
|
|
|
|
|
|
# In-guest path mirrors the docker backend's claude-skills
|
|
# convention (~/.claude/skills/<name>/) under the node user's
|
|
# home — same path as the real claude-bottle image's
|
|
# /home/node/.claude/skills (pre-created in the Dockerfile).
|
|
_DEFAULT_SKILLS_DIR = "/home/node/.claude/skills"
|
|
|
|
|
|
def provision_skills(plan: SmolmachinesBottlePlan, target: str) -> None:
|
|
"""Copy each of the agent's named skills from the host's
|
|
~/.claude/skills/<name>/ into the guest's equivalent path.
|
|
For each skill: `mkdir -p` the destination, `smolvm machine cp`
|
|
the host source dir over, then chown the result to node:node so
|
|
the agent can read it. No-op when the agent has no skills.
|
|
|
|
smolvm machine cp on a directory copies recursively (same
|
|
semantics as `cp -r`); unlike docker cp's trailing-slash
|
|
convention, smolvm doesn't need the `/.` suffix dance.
|
|
|
|
machine cp lands files as root inside the VM, so we chown each
|
|
skill tree over to node:node after the copy — same pattern as
|
|
the docker backend's provision_prompt."""
|
|
agent = plan.spec.manifest.agents[plan.spec.agent_name]
|
|
if not agent.skills:
|
|
return
|
|
|
|
skills_dir = os.environ.get(
|
|
"CLAUDE_BOTTLE_GUEST_SKILLS_DIR", _DEFAULT_SKILLS_DIR,
|
|
)
|
|
|
|
_smolvm.machine_exec(target, ["mkdir", "-p", skills_dir])
|
|
|
|
for name in agent.skills:
|
|
src = host_skill_dir(name)
|
|
if not os.path.isdir(src):
|
|
die(
|
|
f"skill {name!r} disappeared from host between "
|
|
f"validation and copy at {src}."
|
|
)
|
|
dst = f"{skills_dir}/{name}"
|
|
info(f"copying skill {name} into {target}:{dst}")
|
|
# Wipe any prior copy so re-runs don't accumulate.
|
|
_smolvm.machine_exec(target, ["rm", "-rf", dst])
|
|
_smolvm.machine_cp(src, f"{target}:{dst}")
|
|
_smolvm.machine_exec(target, ["chown", "-R", "node:node", dst])
|