feat(acq): make --clone a neutral option, emulated on msb via a managed host-side scratch clone - #423
Draft
basiliskus wants to merge 2 commits into
Draft
feat(acq): make --clone a neutral option, emulated on msb via a managed host-side scratch clone#423basiliskus wants to merge 2 commits into
basiliskus wants to merge 2 commits into
Conversation
…tch clone Make --clone backend-neutral vocabulary (ADR-0027): acq owns the flag (and ACQ_CLONE=1), extracts it at dispatch, and never forwards it raw. sbx re-injects its native `sbx create --clone`; msb emulates disposable primary semantics: - git clone --no-hardlinks the primary (must be a git repo root) into $XDG_STATE_HOME/acq/clones/<sandbox>/<repo>; the physical copy is load-bearing (a same-fs clone hardlinks objects the guest could modify). - Mount the scratch rw at the ORIGINAL workspace path in the guest (verified msb 0.6.15 mounts --volume src:dst with src != dst), so agent cwd and kits behave exactly as a non-clone run. - Register a sandbox-<name> remote in the host checkout; recovery is sbx-parity: git fetch sandbox-<name> (inert, hash-verified objects). - acq rm warns about unfetched commits, then deletes the scratch and the remote (same gone-after-remove rule as derived volumes); a failed create cleans up its own fresh scratch. - Re-attach with --clone prints the same applies-only-at-create note as --image; a dirty host tree gets a committed-state-only notice. Deliberate divergence from sbx, documented in ADR-0027: a git clone carries committed state only (no gitignored/untracked files, no uncommitted edits); acq cp remains the escape hatch. Verified end-to-end on msb 0.6.15: clone mounted at the original path, guest commit fetched back on the host, rm warning + full cleanup. Closes #403
The stub wrote throwaway key material to whatever -f pointed at. A fixture git commit that forgot to disable signing routed the host's gpg.format=ssh config through the stubbed PATH, and the unguarded write clobbered a real ~/.ssh public key file. Guard the write to $STUBDIR and refuse loudly otherwise, so the offending test fails instead of touching host state.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Implements #403. AI-assisted.
What
--clone(env:ACQ_CLONE=1) becomes acq-owned neutral vocabulary, the same trajectory as--image/ADR-0022 andvolumes:/ADR-0023. acq extracts the flag at dispatch and never forwards it raw: sbx re-injects its nativesbx create --clone; msb emulates disposable-primary semantics with a managed host-side scratch clone. Design and divergences are recorded in ADR-0027.msb emulation
git clone --no-hardlinksof the primary (must be a git repo root) into$XDG_STATE_HOME/acq/clones/<sandbox>/<repo>. The physical copy is load-bearing: a same-filesystem clone hardlinks object files an agent could modify through the scratch.git.--volume src:dstwithsrc != dst), so agent cwd, kits, and docs behave exactly as a non-clone run. Secondaries unchanged.sandbox-<name>remote in the host checkout gives sbx-parity recovery:git fetch sandbox-<name>(inert, hash-verified objects; hooks/config never cross).acq rmwarns about unfetched commits, then deletes the scratch and the remote (same gone-after-remove rule as ADR-0023 derived volumes). A failed create cleans its own fresh scratch. Re-attach with--cloneprints the applies-only-at-create note, mirroring--image.Deliberate divergence from sbx (per the issue, ADR-0027)
A git clone carries committed state only: no gitignored/untracked files (the host-build-state contamination trap), and no uncommitted edits to tracked files. Create prints a notice on a dirty tree;
acq cpremains the escape hatch.Also in this PR
fix(test): the suite's stubbedssh-keygenwrote key material to whatever-fpointed at, which let a mis-isolated fixture reach a real~/.sshfile through the host's ssh-signing git config. It now refuses to write outside$STUBDIR.Testing
test/bats/116-clone-option.bats(written failing-first): mount remap +--no-hardlinksphysical copy + remote registration, env-flag equivalence, non-repo/subdir/no-workspace rejection, dirty-tree notice, secondary mounts untouched, rm cleanup, unfetched-commit warning, re-attach note, sbx passthrough.git fetch sandbox-<name>, rm warning + full cleanup.