Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 fargo
|
9d3e22b1c1 | ||
 jason.woltje
|
8199261caa | ||
|
fred
|
57a2f2b40e | ||
|
fred
|
93c1de51e1 |
@@ -233,8 +233,36 @@ assert_owned_tmux_server() {
|
||||
fail "tmux server ownership or environment validation failed"
|
||||
}
|
||||
|
||||
# Validate exact server ownership before querying, cleaning, or creating any
|
||||
# managed session. An unmanaged or contaminated named socket is never repaired.
|
||||
# Lease-broker socket preflight (#1292). The gated runtime (`mosaic yolo …` →
|
||||
# launch-runtime.py) registers with the broker or dies ~4 seconds in, with the
|
||||
# diagnostic invisible because tmux destroys the dead pane. This check runs
|
||||
# BEFORE any tmux effect — including the ownership probe below — so a host
|
||||
# without a broker produces a named, surviving refusal instead of a doomed
|
||||
# pane. Exit 75 (EX_TEMPFAIL), distinct from 64 (bad projection) and 69 (host
|
||||
# not ready for other reasons); the agent@ unit is Type=oneshot with no
|
||||
# Restart=, so the failed unit keeps its message instead of looping. Socket
|
||||
# resolution matches launch.ts's defaultLeaseBrokerSocket precedence exactly.
|
||||
# This preflight DETECTS and REFUSES — it never starts the broker (activation
|
||||
# belongs to the fleet control plane; a component that both detects and fixes
|
||||
# cannot be used to measure whether the fix worked).
|
||||
broker_socket_path() {
|
||||
if [ -n "${MOSAIC_LEASE_BROKER_SOCKET:-}" ]; then
|
||||
printf '%s\n' "$MOSAIC_LEASE_BROKER_SOCKET"
|
||||
return 0
|
||||
fi
|
||||
local runtime_dir="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}"
|
||||
printf '%s\n' "${runtime_dir}/mosaic-lease/broker.sock"
|
||||
}
|
||||
|
||||
if [ "$MODE" = "launch" ]; then
|
||||
_broker_socket=$(broker_socket_path)
|
||||
if [ ! -S "$_broker_socket" ]; then
|
||||
echo "[fleet] FAIL_LAUNCH broker-absent: lease broker socket ${_broker_socket} missing; runtime launch denied (#1292)." >&2
|
||||
echo "[fleet] remedy: systemctl --user enable --now mosaic-lease-broker.service (or reinstall via: mosaic fleet install)" >&2
|
||||
exit 75
|
||||
fi
|
||||
fi
|
||||
|
||||
assert_owned_tmux_server
|
||||
|
||||
if [ "$MODE" = interaction ]; then
|
||||
|
||||
+216
@@ -0,0 +1,216 @@
|
||||
#!/usr/bin/env bash
|
||||
# CI-fit regression suite for the #1292 lease-broker socket preflight in
|
||||
# start-agent-session.sh.
|
||||
#
|
||||
# WHY THIS SUITE IS CI-FIT WHERE test-start-agent-session.sh IS NOT (#1017/#1270
|
||||
# context): that older suite's precondition is "the host does not have the pi
|
||||
# binary", which a CI image that ships pi violates — its guard correctly
|
||||
# refuses to report a pass there, so it is excluded from the chain. THIS suite
|
||||
# controls its own preconditions instead of inheriting them from the host: a
|
||||
# fake tmux on PATH, a fake mosaic on PATH, a real unix socket created in a
|
||||
# tmpdir, a hermetic env (env -i, fake HOME, GIT_CONFIG_GLOBAL severed). It
|
||||
# never depends on what the host has installed, so a green here means the same
|
||||
# thing on every host. Anyone adding cases: keep that property — no case may
|
||||
# depend on host state.
|
||||
#
|
||||
# The failure this suite is written down to catch (#1292): a seat launched on a
|
||||
# host with no lease broker dies ~4 seconds in at registration, with the
|
||||
# diagnostic invisible because tmux destroys the dead pane. The preflight runs
|
||||
# BEFORE any tmux effect and refuses with a NAMED code (exit 75, EX_TEMPFAIL)
|
||||
# so the message survives. The agent@ unit is Type=oneshot with no Restart=,
|
||||
# so a failed unit keeps its output instead of looping.
|
||||
#
|
||||
# Cases:
|
||||
# 1. absent socket -> exit 75, message names broker-absent + socket path +
|
||||
# remedy, and NO tmux session was ever created (the doomed-pane half).
|
||||
# 2. present socket (real unix socket in tmpdir) -> proceeds PAST the
|
||||
# preflight (the suite then stops at the next precondition, proving the
|
||||
# preflight was not the refusal).
|
||||
# 3. explicit MOSAIC_LEASE_BROKER_SOCKET wins over XDG_RUNTIME_DIR default.
|
||||
# 4. --stop mode does NOT require the broker (teardown must not be fenced on
|
||||
# a component whose absence is exactly what teardown may follow).
|
||||
#
|
||||
# Sabotage control, run by the developer (not in-suite): remove the preflight
|
||||
# block from start-agent-session.sh, re-run — case 1 fails (a tmux session is
|
||||
# created / exit is not 75), cases 2-4 still pass; restore byte-identically.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
WORK_DIR="${MOSAIC_TEST_WORK_DIR:-$PWD/.mosaic-test-work/agent-session-broker-preflight}"
|
||||
FAKE_HOME="$WORK_DIR/home"
|
||||
BIN_DIR="$WORK_DIR/bin"
|
||||
ENV_DIR="$WORK_DIR/env"
|
||||
SOCK_DIR="$WORK_DIR/sockets"
|
||||
LOG_FILE="$WORK_DIR/tmux-calls.log"
|
||||
|
||||
rm -rf "$WORK_DIR"
|
||||
# The script asserts a managed directory tree under MOSAIC_HOME: mosaic/,
|
||||
# mosaic/fleet/, mosaic/fleet/agents/ — private (0700/0750-style) modes, no
|
||||
# symlinks — plus a per-agent env projection. Build the full tree the launcher
|
||||
# expects so the suite reaches the BROKER preflight rather than dying at
|
||||
# environment validation.
|
||||
mkdir -p "$FAKE_HOME/.config/mosaic/fleet/agents" "$BIN_DIR" "$SOCK_DIR"
|
||||
chmod 700 "$FAKE_HOME/.config/mosaic" "$FAKE_HOME/.config/mosaic/fleet/agents"
|
||||
chmod 750 "$FAKE_HOME/.config/mosaic/fleet"
|
||||
cat > "$FAKE_HOME/.config/mosaic/fleet/agents/preflight-test.env.generated" <<'ENVEOF'
|
||||
MOSAIC_AGENT_NAME=preflight-test
|
||||
MOSAIC_AGENT_CLASS=worker
|
||||
MOSAIC_AGENT_RUNTIME=pi
|
||||
MOSAIC_AGENT_MODEL=
|
||||
MOSAIC_AGENT_REASONING=
|
||||
MOSAIC_AGENT_TOOL_POLICY=code
|
||||
MOSAIC_AGENT_WORKDIR=/tmp
|
||||
MOSAIC_TMUX_SOCKET=mosaic-fleet
|
||||
ENVEOF
|
||||
chmod 600 "$FAKE_HOME/.config/mosaic/fleet/agents/preflight-test.env.generated"
|
||||
|
||||
# ─── Fake tmux: records every invocation; new-session marks the marker. ────
|
||||
: > "$LOG_FILE"
|
||||
cat > "$BIN_DIR/tmux" <<SH
|
||||
#!/usr/bin/env bash
|
||||
printf 'tmux %s\n' "\$*" >> "$LOG_FILE"
|
||||
if [[ "\$*" == *new-session* ]]; then
|
||||
echo "TMUX-NEW-SESSION-INVOKED" >> "$LOG_FILE"
|
||||
fi
|
||||
exit 0
|
||||
SH
|
||||
chmod +x "$BIN_DIR/tmux"
|
||||
|
||||
# ─── Fake mosaic/pi binaries so the script proceeds past its own lookups. ───
|
||||
for bin in mosaic pi claude; do
|
||||
printf '#!/usr/bin/env bash\nexit 0\n' > "$BIN_DIR/$bin"
|
||||
chmod +x "$BIN_DIR/$bin"
|
||||
done
|
||||
|
||||
# ─── Minimal launch environment the script expects. ────────────────────────
|
||||
# (Enough for the preflight to be reached; later stages will still fail in
|
||||
# case 2 — that is expected and asserted.)
|
||||
run_session_script() {
|
||||
local mode="$1"; shift
|
||||
(
|
||||
cd "$WORK_DIR"
|
||||
env -i HOME="$FAKE_HOME" PATH="$BIN_DIR:/usr/bin:/bin" \
|
||||
GIT_CONFIG_GLOBAL=/dev/null GIT_CONFIG_SYSTEM=/dev/null \
|
||||
MOSAIC_HOME="$FAKE_HOME/.config/mosaic" \
|
||||
AGENT_NAME=preflight-test \
|
||||
"$@" \
|
||||
bash "$SCRIPT_DIR/start-agent-session.sh" $mode preflight-test
|
||||
)
|
||||
}
|
||||
|
||||
fail=0
|
||||
assert() {
|
||||
local desc="$1" expected="$2" actual="$3"
|
||||
if [[ "$expected" != "$actual" ]]; then
|
||||
echo "FAIL: $desc — expected '$expected', got '$actual'" >&2
|
||||
fail=1
|
||||
fi
|
||||
}
|
||||
assert_contains() {
|
||||
local desc="$1" haystack="$2" needle="$3"
|
||||
[[ "$haystack" == *"$needle"* ]] || { echo "FAIL: $desc — missing '$needle' in: $haystack" >&2; fail=1; }
|
||||
}
|
||||
assert_not_contains() {
|
||||
local desc="$1" haystack="$2" needle="$3"
|
||||
if [[ "$haystack" == *"$needle"* ]]; then
|
||||
echo "FAIL: $desc — must not contain '$needle'" >&2
|
||||
fail=1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
# ─── 1. Absent socket → named refusal, NO tmux session. ────────────────────
|
||||
: > "$LOG_FILE"
|
||||
stderr_file="$WORK_DIR/stderr-1.tmp"
|
||||
set +e
|
||||
out=$(run_session_script "" MOSAIC_LEASE_BROKER_SOCKET="$SOCK_DIR/absent.sock" 2>"$stderr_file")
|
||||
rc=$?
|
||||
set -e
|
||||
assert "absent socket exit code" "75" "$rc"
|
||||
err=$(cat "$stderr_file")
|
||||
assert_contains "absent socket names the failure" "$err" "FAIL_LAUNCH broker-absent"
|
||||
assert_contains "absent socket names the socket path" "$err" "$SOCK_DIR/absent.sock"
|
||||
assert_contains "absent socket names a remedy" "$err" "mosaic fleet install"
|
||||
log1=$(cat "$LOG_FILE")
|
||||
assert_not_contains "absent socket must not create a tmux session" "$log1" "TMUX-NEW-SESSION-INVOKED"
|
||||
|
||||
# ─── 2. Present socket → passes the preflight. ─────────────────────────────
|
||||
# Expected: ownership/env checks AFTER the preflight may refuse (fixture is
|
||||
# minimal by design); the assertion is only that the refusal is NOT
|
||||
# broker-absent and the exit is NOT 75.
|
||||
# Create a REAL unix socket: a detached python holder binds it and stays alive
|
||||
# for the duration (bash cannot create sockets; a foreground python would
|
||||
# close the socket on exit and -S on a closed-but-unlinked path fails). Written
|
||||
# as a script file + setsid nohup so no job-control/heredoc interaction with
|
||||
# set -e can silently kill the suite.
|
||||
# AF_UNIX binds cap at 108 path bytes; the suite's workdir exceeds that, so
|
||||
# the live socket lives at a SHORT path under /tmp (unique per run, cleaned
|
||||
# with the suite). The preflight takes its socket path explicitly, so this
|
||||
# stays fully controlled.
|
||||
LIVE_SOCK=$(mktemp -u /tmp/mosaic-preflight-XXXXXX.sock)
|
||||
trap 'rm -f "$LIVE_SOCK"' EXIT
|
||||
rm -f "$SOCK_DIR/live.sock" "$LIVE_SOCK"
|
||||
cat > "$SOCK_DIR/holder.py" <<'PY'
|
||||
import socket, sys, time
|
||||
path = sys.argv[1]
|
||||
s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
|
||||
s.bind(path)
|
||||
s.listen(1)
|
||||
time.sleep(120)
|
||||
PY
|
||||
python3 "$SOCK_DIR/holder.py" "$LIVE_SOCK" >/dev/null 2>"$SOCK_DIR/holder.err" &
|
||||
HOLDER_PID=$!
|
||||
# Wait for the socket object to exist (bind is near-instant, but do not race it).
|
||||
for _ in $(seq 1 50); do
|
||||
[ -S "$LIVE_SOCK" ] && break
|
||||
sleep 0.1
|
||||
done
|
||||
if [ ! -S "$LIVE_SOCK" ]; then
|
||||
echo "FAIL: could not create live socket fixture (holder pid $HOLDER_PID)" >&2
|
||||
ps -p "$HOLDER_PID" -o pid,stat,cmd --no-headers >&2 || echo "(holder exited)" >&2
|
||||
cat "$SOCK_DIR/holder.err" >&2 || true
|
||||
exit 1
|
||||
fi
|
||||
: > "$LOG_FILE"
|
||||
set +e
|
||||
out=$(run_session_script "" MOSAIC_LEASE_BROKER_SOCKET="$LIVE_SOCK" 2>"$WORK_DIR/stderr-2.tmp")
|
||||
rc=$?
|
||||
set -e
|
||||
# The preflight PASSED if the failure (whatever later stage refused) is NOT
|
||||
# the broker refusal, and tmux was reached or a later precondition named
|
||||
# something else.
|
||||
err2=$(cat "$WORK_DIR/stderr-2.tmp")
|
||||
assert_not_contains "live socket must not refuse broker-absent" "$err2" "broker-absent"
|
||||
if [[ "$rc" == "75" ]]; then
|
||||
echo "FAIL: live socket — preflight still refused (exit 75) with a live socket" >&2
|
||||
fail=1
|
||||
fi
|
||||
|
||||
# ─── 3. Explicit socket env wins over XDG default. ─────────────────────────
|
||||
set +e
|
||||
out=$(run_session_script "" XDG_RUNTIME_DIR="$SOCK_DIR/no-runtime-here" MOSAIC_LEASE_BROKER_SOCKET="$SOCK_DIR/absent2.sock" 2>"$WORK_DIR/stderr-3.tmp")
|
||||
rc=$?
|
||||
set -e
|
||||
assert "explicit env wins (exit 75)" "75" "$rc"
|
||||
assert_contains "explicit env path named" "$(cat "$WORK_DIR/stderr-3.tmp")" "$SOCK_DIR/absent2.sock"
|
||||
|
||||
# ─── 4. --stop is not fenced on the broker. ────────────────────────────────
|
||||
: > "$LOG_FILE"
|
||||
set +e
|
||||
out=$(run_session_script "--stop" MOSAIC_LEASE_BROKER_SOCKET="$SOCK_DIR/absent3.sock" 2>"$WORK_DIR/stderr-4.tmp")
|
||||
rc=$?
|
||||
set -e
|
||||
err4=$(cat "$WORK_DIR/stderr-4.tmp")
|
||||
assert_not_contains "--stop must not refuse broker-absent" "$err4" "broker-absent"
|
||||
if [[ "$rc" == "75" ]]; then
|
||||
echo "FAIL: --stop — exit 75 means teardown was fenced on the broker" >&2
|
||||
fail=1
|
||||
fi
|
||||
|
||||
kill "$HOLDER_PID" 2>/dev/null || true
|
||||
|
||||
if [[ "$fail" -eq 0 ]]; then
|
||||
echo "start-agent-session lease-broker preflight regression passed"
|
||||
fi
|
||||
exit "$fail"
|
||||
@@ -39,3 +39,20 @@ packages/mosaic/framework/tools/tmux/test-send-message-verdict.sh | requires rea
|
||||
# recorded judgement. These lines ARE that judgement, signed.)
|
||||
packages/mosaic/framework/tools/orchestrator/smoke-test.sh | behavior smoke checks for coord continue/run workflows, run manually by orchestrator seats; unmeasured in CI; #1017 burndown
|
||||
packages/mosaic/framework/tools/wake/validate-973/microtest-wake-assert.sh | #973 instrument self-test, run as a precondition of the validate-973 evidence procedure rather than as a standing CI suite; #1017 burndown candidate
|
||||
|
||||
# --- tools/fleet: precondition is unsatisfiable in the CI image (#1271) ---
|
||||
# Signed by fred (sb-it-1-dt, 2026-08-16) at origin/next 476db12.
|
||||
# This suite asserts the launcher's behaviour when `mosaic` and `pi` are MISSING.
|
||||
# It shims fakes into $FAKE_BIN, but the constructed PANE_PATH always ends in the
|
||||
# real system path, so on a host that installs those binaries the missing-binary
|
||||
# cases cannot be measured at all. The suite's own guard (line 103) says so and
|
||||
# fails rather than reporting a pass it cannot back. That guard is correct.
|
||||
# The error was wiring the suite into CI: #1017 (c56483eb) enumerated it and
|
||||
# dropped this exclusion, and the CI image provides `pi` in the system path, so
|
||||
# it has failed on every pipeline since. Measured 2026-08-16 across pipelines
|
||||
# 2444 (#1256), 2438 (#1240) and 2441 (#1017-quality): exactly one FAIL line in
|
||||
# each full log, identical, this assertion; control `zzz-not-present-zzz` -> 0.
|
||||
# Burn-down and the full measurement are tracked in #1271; unwired by PR #1270.
|
||||
# Because test:framework-shell is one && chain and this sat at position 44 of 48,
|
||||
# the four suites after it had not run at all since the merge.
|
||||
packages/mosaic/framework/tools/fleet/test-start-agent-session.sh | precondition unsatisfiable in the CI image: asserts missing-binary behaviour, but PANE_PATH always ends in the system path and the image provides `pi` there; guard at line 103 fails by design rather than passing unmeasured. Burn down by controlling the tail of PANE_PATH inside the test. NOT by removing `pi` from the image: the CI image installs @earendil-works/[email protected] deliberately (measured in pipeline 2444's test-step log), and other suites depend on that pin. Burn-down tracked in #1271
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
"lint": "eslint src",
|
||||
"typecheck": "tsc --noEmit",
|
||||
"test": "vitest run --passWithNoTests && pnpm run test:framework-shell",
|
||||
"test:framework-shell": "bash framework/tools/quality/scripts/check-test-enumeration.sh && bash framework/tools/quality/scripts/test-check-test-enumeration.sh && python3 src/lease-broker/daemon_deadline_unittest.py && python3 src/lease-broker/normative_fragments_unittest.py && python3 src/lease-broker/promotion_binding_unittest.py && python3 src/lease-broker/promotion_trigger_unittest.py && python3 src/lease-broker/receipt_challenge_unittest.py && python3 src/lease-broker/context_recovery_unittest.py && python3 src/lease-broker/recovery_runtime_unittest.py && python3 src/lease-broker/recovery_b1_adversarial_unittest.py && python3 src/lease-broker/receipt_observer_client_unittest.py && python3 src/lease-broker/invariant_r_unittest.py && python3 src/lease-broker/framework_skill_portability_unittest.py && python3 src/mutator-gate/runtime_tools_unittest.py && python3 src/mutator-gate/runtime_launch_guard_unittest.py && python3 src/mutator-gate/version_coupling_unittest.py && python3 framework/tools/lease-broker/check-runtime-launches.py --root ../.. && bash framework/tools/codex/test-pr-diff-context.sh && bash framework/tools/qa/test-deps-preflight.sh && bash framework/tools/git/test-pr-review-gitea-comment.sh && bash framework/tools/git/test-pr-review-repo-host-override.sh && bash framework/tools/git/test-ci-queue-wait-branch-absent.sh && bash framework/tools/git/test-ci-queue-wait-tristate.sh && bash framework/tools/git/test-ci-queue-wait-github-checks.sh && bash framework/tools/git/test-pr-merge-queue-branch.sh && bash framework/tools/git/test-pr-merge-head-pin.sh && bash framework/tools/git/test-pr-merge-message-field.sh && bash framework/tools/git/test-git-credential-mosaic.sh && bash framework/tools/git/test-gitea-token-identity.sh && bash framework/tools/woodpecker/test-terminal-green-contract.sh && bash framework/tools/_scripts/test-install-ordering-guard.sh && bash framework/tools/_scripts/test-mosaic-init-rce.sh && bash framework/tools/tmux/agent-send.test.sh && bash framework/tools/wake/test-wake-store-ack.sh && bash framework/tools/wake/test-wake-store-enqueue-race.sh && bash framework/tools/wake/test-wake-digest-hmac.sh && bash framework/tools/wake/test-wake-digest-quarantine.sh && bash framework/tools/wake/test-wake-detector.sh && bash framework/tools/wake/test-wake-fn-oracle.sh && bash framework/tools/wake/test-wake-reconcile.sh && bash framework/tools/wake/test-wake-beacon.sh && bash framework/tools/wake/test-wake-preimage.sh && bash framework/tools/wake/test-wake-install.sh && bash framework/tools/fleet/test-start-agent-session.sh && bash framework/tools/glpi/test-list-http-status.sh && bash framework/tools/orchestrator/test-board-roll.sh && bash framework/tools/woodpecker/test-ci-wait-exit-matrix.sh && bash framework/tools/_scripts/test-fleet-transport-check.sh"
|
||||
"test:framework-shell": "bash framework/tools/quality/scripts/check-test-enumeration.sh && bash framework/tools/quality/scripts/test-check-test-enumeration.sh && python3 src/lease-broker/daemon_deadline_unittest.py && python3 src/lease-broker/normative_fragments_unittest.py && python3 src/lease-broker/promotion_binding_unittest.py && python3 src/lease-broker/promotion_trigger_unittest.py && python3 src/lease-broker/receipt_challenge_unittest.py && python3 src/lease-broker/context_recovery_unittest.py && python3 src/lease-broker/recovery_runtime_unittest.py && python3 src/lease-broker/recovery_b1_adversarial_unittest.py && python3 src/lease-broker/receipt_observer_client_unittest.py && python3 src/lease-broker/invariant_r_unittest.py && python3 src/lease-broker/framework_skill_portability_unittest.py && python3 src/mutator-gate/runtime_tools_unittest.py && python3 src/mutator-gate/runtime_launch_guard_unittest.py && python3 src/mutator-gate/version_coupling_unittest.py && python3 framework/tools/lease-broker/check-runtime-launches.py --root ../.. && bash framework/tools/codex/test-pr-diff-context.sh && bash framework/tools/qa/test-deps-preflight.sh && bash framework/tools/git/test-pr-review-gitea-comment.sh && bash framework/tools/git/test-pr-review-repo-host-override.sh && bash framework/tools/git/test-ci-queue-wait-branch-absent.sh && bash framework/tools/git/test-ci-queue-wait-tristate.sh && bash framework/tools/git/test-ci-queue-wait-github-checks.sh && bash framework/tools/git/test-pr-merge-queue-branch.sh && bash framework/tools/git/test-pr-merge-head-pin.sh && bash framework/tools/git/test-pr-merge-message-field.sh && bash framework/tools/git/test-git-credential-mosaic.sh && bash framework/tools/git/test-gitea-token-identity.sh && bash framework/tools/woodpecker/test-terminal-green-contract.sh && bash framework/tools/_scripts/test-install-ordering-guard.sh && bash framework/tools/_scripts/test-mosaic-init-rce.sh && bash framework/tools/tmux/agent-send.test.sh && bash framework/tools/wake/test-wake-store-ack.sh && bash framework/tools/wake/test-wake-store-enqueue-race.sh && bash framework/tools/wake/test-wake-digest-hmac.sh && bash framework/tools/wake/test-wake-digest-quarantine.sh && bash framework/tools/wake/test-wake-detector.sh && bash framework/tools/wake/test-wake-fn-oracle.sh && bash framework/tools/wake/test-wake-reconcile.sh && bash framework/tools/wake/test-wake-beacon.sh && bash framework/tools/wake/test-wake-preimage.sh && bash framework/tools/wake/test-wake-install.sh && bash framework/tools/glpi/test-list-http-status.sh && bash framework/tools/orchestrator/test-board-roll.sh && bash framework/tools/woodpecker/test-ci-wait-exit-matrix.sh && bash framework/tools/_scripts/test-fleet-transport-check.sh"
|
||||
},
|
||||
"dependencies": {
|
||||
"@mosaicstack/brain": "workspace:*",
|
||||
|
||||
@@ -20,7 +20,6 @@ import { registerMissionCommand } from './commands/mission.js';
|
||||
import { registerUninstallCommand } from './commands/uninstall.js';
|
||||
import { registerRestoreCommand } from './commands/restore.js';
|
||||
import { registerSkillCommand } from './commands/skill.js';
|
||||
import { registerStoreCommand } from './commands/store.js';
|
||||
// prdy is registered via launch.ts
|
||||
import { registerLaunchCommands } from './commands/launch.js';
|
||||
import { registerLeaseCapabilityProbe } from './commands/lease-activation-probe.js';
|
||||
@@ -426,10 +425,6 @@ registerRestoreCommand(program);
|
||||
|
||||
registerSkillCommand(program);
|
||||
|
||||
// ─── store ───────────────────────────────────────────────────────────────────
|
||||
|
||||
registerStoreCommand(program);
|
||||
|
||||
// ─── telemetry ───────────────────────────────────────────────────────────────
|
||||
|
||||
registerTelemetryCommand(program);
|
||||
|
||||
@@ -0,0 +1,177 @@
|
||||
import { lstat, mkdir, mkdtemp, readFile, rm, symlink, writeFile } from 'node:fs/promises';
|
||||
import { tmpdir } from 'node:os';
|
||||
import { join } from 'node:path';
|
||||
import { afterEach, describe, expect, it } from 'vitest';
|
||||
|
||||
import { placeUnitFile, resolveLeaseBrokerSocketForPreflight } from './fleet.js';
|
||||
|
||||
/**
|
||||
* Unit-placement regression harness for #1292.
|
||||
*
|
||||
* The two measured defects this suite pins:
|
||||
* 1. `systemctl enable <name>` does NOT rewrite an existing by-path
|
||||
* wants-symlink — so placement must remove stale residue explicitly, and
|
||||
* acceptance asserts on the RESULTING SYMLINK TARGET, never on the enable
|
||||
* call's argument (asserting the call cannot see where the link ended up).
|
||||
* 2. Node's copyFile FOLLOWS a by-path symlink at the destination and
|
||||
* overwrites the SEED template. Acceptance asserts on the SEED's bytes
|
||||
* AND mtime — unchanged — which is the only check that can redden for
|
||||
* finding 2. The symlink-target assertion catches finding 1; these are
|
||||
* different defects with different failure modes.
|
||||
*
|
||||
* Fixtures are entirely inside tmpdirs (source template, active systemd dir,
|
||||
* wants dir) — no real host paths are touched by this suite.
|
||||
*/
|
||||
|
||||
describe('placeUnitFile (#1292 unit placement)', () => {
|
||||
const cleanup: string[] = [];
|
||||
afterEach(async () => {
|
||||
while (cleanup.length > 0) {
|
||||
await rm(cleanup.pop()!, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
async function fixture() {
|
||||
const root = await mkdtemp(join(tmpdir(), 'place-unit-'));
|
||||
cleanup.push(root);
|
||||
const seedDir = join(root, 'seed');
|
||||
const activeDir = join(root, 'active');
|
||||
await mkdir(seedDir, { recursive: true });
|
||||
await mkdir(activeDir, { recursive: true });
|
||||
const seedTemplate = join(seedDir, 'unit-under-test.service');
|
||||
await writeFile(
|
||||
seedTemplate,
|
||||
'[Unit]\nDescription=seed template\n[Service]\nType=oneshot\nExecStart=/bin/true\n[Install]\nWantedBy=default.target\n',
|
||||
);
|
||||
const activeSource = join(root, 'active-source.service');
|
||||
await writeFile(
|
||||
activeSource,
|
||||
'[Unit]\nDescription=active copy v2\n[Service]\nType=oneshot\nExecStart=/bin/true\n[Install]\nWantedBy=default.target\n',
|
||||
);
|
||||
return { root, seedDir, activeDir, seedTemplate, activeSource };
|
||||
}
|
||||
|
||||
it('places a regular file on a clean host (negative control: no residue anywhere)', async () => {
|
||||
const f = await fixture();
|
||||
const result = await placeUnitFile(f.activeSource, f.activeDir, 'unit-under-test.service');
|
||||
expect(result.unlinkedDestinationSymlink).toBe(false);
|
||||
expect(result.removedStaleWantsSymlink).toBe(false);
|
||||
const info = await lstat(join(f.activeDir, 'unit-under-test.service'));
|
||||
expect(info.isSymbolicLink()).toBe(false);
|
||||
expect(await readFile(join(f.activeDir, 'unit-under-test.service'), 'utf8')).toContain(
|
||||
'active copy v2',
|
||||
);
|
||||
// Seed untouched by construction — but assert it, so the clean-host case
|
||||
// cannot silently regress into seed-mutation.
|
||||
expect(await readFile(f.seedTemplate, 'utf8')).toContain('seed template');
|
||||
});
|
||||
|
||||
it('by-path residue: unlinks destination symlink, places the file, seed bytes AND mtime unchanged (finding 2)', async () => {
|
||||
const f = await fixture();
|
||||
const seedBefore = await readFile(f.seedTemplate, 'utf8');
|
||||
const mtimeBefore = (await lstat(f.seedTemplate)).mtimeMs;
|
||||
// The fomo-lin convention: by-path enable left a symlink AT the unit name
|
||||
// pointing at the seed template, plus a wants-symlink doing the same.
|
||||
await symlink(f.seedTemplate, join(f.activeDir, 'unit-under-test.service'));
|
||||
const wantsDir = join(f.activeDir, 'default.target.wants');
|
||||
await mkdir(wantsDir, { recursive: true });
|
||||
await symlink(f.seedTemplate, join(wantsDir, 'unit-under-test.service'));
|
||||
|
||||
const result = await placeUnitFile(f.activeSource, f.activeDir, 'unit-under-test.service');
|
||||
expect(result.unlinkedDestinationSymlink).toBe(true);
|
||||
expect(result.removedStaleWantsSymlink).toBe(true);
|
||||
|
||||
// FINDING 2's check: the seed is byte-identical and its mtime did not move.
|
||||
expect(await readFile(f.seedTemplate, 'utf8')).toBe(seedBefore);
|
||||
expect((await lstat(f.seedTemplate)).mtimeMs).toBe(mtimeBefore);
|
||||
|
||||
// The destination is now a regular file carrying the ACTIVE content.
|
||||
const destInfo = await lstat(join(f.activeDir, 'unit-under-test.service'));
|
||||
expect(destInfo.isSymbolicLink()).toBe(false);
|
||||
expect(await readFile(join(f.activeDir, 'unit-under-test.service'), 'utf8')).toContain(
|
||||
'active copy v2',
|
||||
);
|
||||
});
|
||||
|
||||
it('by-path residue: no wants-symlink remains pointing at the seed (finding 1 residue cleared)', async () => {
|
||||
const f = await fixture();
|
||||
await symlink(f.seedTemplate, join(f.activeDir, 'unit-under-test.service'));
|
||||
const wantsDir = join(f.activeDir, 'default.target.wants');
|
||||
await mkdir(wantsDir, { recursive: true });
|
||||
await symlink(f.seedTemplate, join(wantsDir, 'unit-under-test.service'));
|
||||
|
||||
await placeUnitFile(f.activeSource, f.activeDir, 'unit-under-test.service');
|
||||
|
||||
// After placement the stale wants link is GONE (enable-by-name recreates
|
||||
// it correctly). A link still present must not point at the seed.
|
||||
try {
|
||||
const link = await lstat(join(wantsDir, 'unit-under-test.service'));
|
||||
if (link.isSymbolicLink()) {
|
||||
const target = await readFile(join(wantsDir, 'unit-under-test.service'), 'utf8').catch(
|
||||
async () => '',
|
||||
);
|
||||
expect(target).not.toContain('seed template');
|
||||
}
|
||||
} catch {
|
||||
// absent wants link — the expected post-placement state
|
||||
}
|
||||
});
|
||||
|
||||
it('idempotence: second placement on a reconciled host is a no-op producing the identical final state', async () => {
|
||||
const f = await fixture();
|
||||
// Reconciled starting state: regular file at the name, wants link to the active copy.
|
||||
await writeFile(
|
||||
join(f.activeDir, 'unit-under-test.service'),
|
||||
await readFile(f.activeSource, 'utf8'),
|
||||
);
|
||||
const wantsDir = join(f.activeDir, 'default.target.wants');
|
||||
await mkdir(wantsDir, { recursive: true });
|
||||
await symlink(
|
||||
join(f.activeDir, 'unit-under-test.service'),
|
||||
join(wantsDir, 'unit-under-test.service'),
|
||||
);
|
||||
const before = await readFile(join(f.activeDir, 'unit-under-test.service'), 'utf8');
|
||||
|
||||
const result = await placeUnitFile(f.activeSource, f.activeDir, 'unit-under-test.service');
|
||||
// No destructive step fired: no unlink, no wants removal.
|
||||
expect(result.unlinkedDestinationSymlink).toBe(false);
|
||||
expect(result.removedStaleWantsSymlink).toBe(false);
|
||||
// Identical final state.
|
||||
expect(await readFile(join(f.activeDir, 'unit-under-test.service'), 'utf8')).toBe(before);
|
||||
const link = await lstat(join(wantsDir, 'unit-under-test.service'));
|
||||
expect(link.isSymbolicLink()).toBe(true);
|
||||
});
|
||||
|
||||
it('double install on by-path residue converges to the identical reconciled state', async () => {
|
||||
const f = await fixture();
|
||||
await symlink(f.seedTemplate, join(f.activeDir, 'unit-under-test.service'));
|
||||
const wantsDir = join(f.activeDir, 'default.target.wants');
|
||||
await mkdir(wantsDir, { recursive: true });
|
||||
await symlink(f.seedTemplate, join(wantsDir, 'unit-under-test.service'));
|
||||
|
||||
await placeUnitFile(f.activeSource, f.activeDir, 'unit-under-test.service');
|
||||
const first = await readFile(join(f.activeDir, 'unit-under-test.service'), 'utf8');
|
||||
const secondRun = await placeUnitFile(f.activeSource, f.activeDir, 'unit-under-test.service');
|
||||
const second = await readFile(join(f.activeDir, 'unit-under-test.service'), 'utf8');
|
||||
expect(secondRun.unlinkedDestinationSymlink).toBe(false);
|
||||
expect(second).toBe(first);
|
||||
});
|
||||
});
|
||||
|
||||
describe('resolveLeaseBrokerSocketForPreflight (#1292 preflight resolution)', () => {
|
||||
it('explicit MOSAIC_LEASE_BROKER_SOCKET wins', () => {
|
||||
expect(
|
||||
resolveLeaseBrokerSocketForPreflight({ MOSAIC_LEASE_BROKER_SOCKET: '/custom/sock' }, 1000),
|
||||
).toBe('/custom/sock');
|
||||
});
|
||||
it('XDG_RUNTIME_DIR next', () => {
|
||||
expect(resolveLeaseBrokerSocketForPreflight({ XDG_RUNTIME_DIR: '/run/user/1001' }, 1000)).toBe(
|
||||
'/run/user/1001/mosaic-lease/broker.sock',
|
||||
);
|
||||
});
|
||||
it('falls back to /run/user/<uid>', () => {
|
||||
expect(resolveLeaseBrokerSocketForPreflight({}, 1002)).toBe(
|
||||
'/run/user/1002/mosaic-lease/broker.sock',
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -835,13 +835,25 @@ describe('fleet command construction', () => {
|
||||
};
|
||||
const program = new Command();
|
||||
program.exitOverride();
|
||||
registerFleetCommand(program, { runner, mosaicHome: home });
|
||||
// #1292: inject a present broker socket so the preflight passes and this
|
||||
// spec keeps testing its ORIGINAL property (holder-before-agent ordering).
|
||||
// The preflight's own refusal behavior has dedicated specs below.
|
||||
registerFleetCommand(program, {
|
||||
runner,
|
||||
mosaicHome: home,
|
||||
checkBrokerSocket: async () => true,
|
||||
});
|
||||
|
||||
try {
|
||||
await program.parseAsync(['node', 'mosaic', 'fleet', 'start']);
|
||||
await program.parseAsync(['node', 'mosaic', 'fleet', 'stop']);
|
||||
|
||||
expect(calls).toEqual([
|
||||
// #1292: fleet start enables + starts the broker FIRST (enable is
|
||||
// idempotent; the unit exists after install), re-checking the socket
|
||||
// before any holder/agent lifecycle effect.
|
||||
['systemctl', '--user', 'enable', 'mosaic-lease-broker.service'],
|
||||
['systemctl', '--user', 'start', 'mosaic-lease-broker.service'],
|
||||
['systemctl', '--user', 'start', 'mosaic-tmux-holder.service'],
|
||||
['systemctl', '--user', 'start', '[email protected]'],
|
||||
['systemctl', '--user', 'stop', '[email protected]'],
|
||||
@@ -852,6 +864,92 @@ describe('fleet command construction', () => {
|
||||
}
|
||||
});
|
||||
|
||||
it('fleet start refuses with a named error when the broker socket does not appear (#1292)', async () => {
|
||||
const home = await tempDir();
|
||||
const rosterPath = join(home, 'fleet', 'roster.yaml');
|
||||
await mkdir(join(home, 'fleet'), { recursive: true });
|
||||
await writeFile(
|
||||
rosterPath,
|
||||
['version: 1', 'transport: tmux', 'agents:', ' - name: coder0', ' runtime: codex'].join(
|
||||
'\n',
|
||||
),
|
||||
);
|
||||
const calls: string[][] = [];
|
||||
const runner: CommandRunner = async (command, args) => {
|
||||
calls.push([command, ...args]);
|
||||
return { stdout: '', stderr: '', exitCode: 0 };
|
||||
};
|
||||
const program = new Command();
|
||||
program.exitOverride();
|
||||
const errors: string[] = [];
|
||||
const origError = console.error;
|
||||
console.error = (...args: unknown[]) => {
|
||||
errors.push(args.join(' '));
|
||||
};
|
||||
registerFleetCommand(program, {
|
||||
runner,
|
||||
mosaicHome: home,
|
||||
checkBrokerSocket: async () => false,
|
||||
});
|
||||
try {
|
||||
await program.parseAsync(['node', 'mosaic', 'fleet', 'start']);
|
||||
// Refused: no holder/agent starts were issued after the broker attempt.
|
||||
expect(calls).toEqual([
|
||||
['systemctl', '--user', 'enable', 'mosaic-lease-broker.service'],
|
||||
['systemctl', '--user', 'start', 'mosaic-lease-broker.service'],
|
||||
]);
|
||||
expect(errors.join('\n')).toContain('broker-absent');
|
||||
expect(errors.join('\n')).toContain('mosaic fleet install');
|
||||
} finally {
|
||||
console.error = origError;
|
||||
await rm(home, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
it('fleet start re-probes the broker on the SECOND invocation — no ActiveState trust (#1292 sticky half)', async () => {
|
||||
const home = await tempDir();
|
||||
const rosterPath = join(home, 'fleet', 'roster.yaml');
|
||||
await mkdir(join(home, 'fleet'), { recursive: true });
|
||||
await writeFile(
|
||||
rosterPath,
|
||||
['version: 1', 'transport: tmux', 'agents:', ' - name: coder0', ' runtime: codex'].join(
|
||||
'\n',
|
||||
),
|
||||
);
|
||||
const calls: string[][] = [];
|
||||
const runner: CommandRunner = async (command, args) => {
|
||||
calls.push([command, ...args]);
|
||||
return { stdout: '', stderr: '', exitCode: 0 };
|
||||
};
|
||||
const program = new Command();
|
||||
program.exitOverride();
|
||||
// Broker socket NEVER appears — the second start must refuse exactly like
|
||||
// the first; RemainAfterExit-style stale unit state changes nothing
|
||||
// because the check is the socket, not systemctl.
|
||||
registerFleetCommand(program, {
|
||||
runner,
|
||||
mosaicHome: home,
|
||||
checkBrokerSocket: async () => false,
|
||||
});
|
||||
const errors: string[] = [];
|
||||
const origError = console.error;
|
||||
console.error = (...args: unknown[]) => {
|
||||
errors.push(args.join(' '));
|
||||
};
|
||||
try {
|
||||
await program.parseAsync(['node', 'mosaic', 'fleet', 'start']);
|
||||
await program.parseAsync(['node', 'mosaic', 'fleet', 'start']);
|
||||
// Two invocations, each refusing after its own broker attempt:
|
||||
expect(
|
||||
calls.filter((c) => c.join(' ') === 'systemctl --user start [email protected]'),
|
||||
).toHaveLength(0);
|
||||
expect(errors.filter((e) => e.includes('broker-absent')).length).toBeGreaterThanOrEqual(2);
|
||||
} finally {
|
||||
console.error = origError;
|
||||
await rm(home, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
it('waits for an in-flight restart to clear before relaunching (re-entry guard)', async () => {
|
||||
const home = await tempDir();
|
||||
const rosterPath = join(home, 'fleet', 'roster.yaml');
|
||||
@@ -2065,8 +2163,19 @@ describe('fleet install — auto-enable units for boot-survival', () => {
|
||||
|
||||
await enableFleetUnits(runner, minimalRoster, {});
|
||||
|
||||
expect(calls).toContainEqual(['systemctl', '--user', 'enable', 'mosaic-lease-broker.service']);
|
||||
expect(calls).toContainEqual(['systemctl', '--user', 'enable', 'mosaic-tmux-holder.service']);
|
||||
expect(calls).toContainEqual(['systemctl', '--user', 'enable', '[email protected]']);
|
||||
// The broker must be enabled BEFORE the holder and agents: a start of any
|
||||
// gated runtime without the broker is exactly the #1292 4-second death.
|
||||
const brokerIndex = calls.findIndex(
|
||||
(c) => c.join(' ') === 'systemctl --user enable mosaic-lease-broker.service',
|
||||
);
|
||||
const holderIndex = calls.findIndex(
|
||||
(c) => c.join(' ') === 'systemctl --user enable mosaic-tmux-holder.service',
|
||||
);
|
||||
expect(brokerIndex).toBeGreaterThanOrEqual(0);
|
||||
expect(brokerIndex).toBeLessThan(holderIndex);
|
||||
});
|
||||
|
||||
it('install still succeeds when systemctl enable returns non-zero (non-fatal)', async () => {
|
||||
|
||||
@@ -3,9 +3,11 @@ import {
|
||||
access,
|
||||
chmod,
|
||||
copyFile,
|
||||
lstat,
|
||||
mkdir,
|
||||
open,
|
||||
readFile,
|
||||
readlink,
|
||||
stat,
|
||||
unlink,
|
||||
writeFile,
|
||||
@@ -89,6 +91,8 @@ export type SleepFn = (ms: number) => Promise<void>;
|
||||
|
||||
export interface FleetCommandDeps {
|
||||
runner?: CommandRunner;
|
||||
/** Test seam for the #1292 fleet-start broker preflight (socket presence). */
|
||||
checkBrokerSocket?: (path: string) => Promise<boolean> | boolean;
|
||||
/** Injectable interactive runner for commands needing inherited TTY (e.g., `tmux attach`). */
|
||||
interactiveRunner?: InteractiveRunner;
|
||||
/**
|
||||
@@ -797,6 +801,96 @@ export function buildSystemdEnableCommand(unit: string): string[] {
|
||||
return ['systemctl', '--user', 'enable', unit];
|
||||
}
|
||||
|
||||
/**
|
||||
* Place a unit file into the ACTIVE systemd user directory, never through a
|
||||
* symlink (#1292, measured 2026-08-17).
|
||||
*
|
||||
* ⚠ SET-INDEPENDENCE (fomo-lin, 2026-08-17): the set of unit names carrying
|
||||
* by-path residue and the set of unit names this install copies are
|
||||
* INDEPENDENT. Until 0.0.50 they were disjoint only by accident of which
|
||||
* units the install happened to name — fomo-lin survived copy-through solely
|
||||
* because its one by-path symlink (the broker) was the one unit the install
|
||||
* did NOT copy. Adding the broker to the copy set made the intersection
|
||||
* non-empty on the first run. Whoever adds a fifth unit to the placement
|
||||
* list inherits this helper and its unlink step; do not place units with a
|
||||
* bare copyFile.
|
||||
*
|
||||
* A host provisioned by the enable-by-path convention carries a symlink AT
|
||||
* the unit-name path in ~/.config/systemd/user/ pointing at the shipped
|
||||
* template under ~/.config/mosaic/systemd/user/. Node's copyFile FOLLOWS
|
||||
* that link and overwrites the SEED template instead of placing the active
|
||||
* unit (verified with fs.copyFile on a throwaway systemd user instance) —
|
||||
* silent, rc=0, and it mutates the directory every later reseed reads from.
|
||||
* The same measurement showed `systemctl enable <name>` does NOT rewrite an
|
||||
* existing by-path wants-symlink, so reconciliation must be explicit.
|
||||
*
|
||||
* Placement therefore: if the destination is a symlink, unlink it first
|
||||
* (unlink → copy — copy-then-unlink would mutate the seed and then destroy
|
||||
* the evidence that it did); then copy. Also removes a stale
|
||||
* `default.target.wants/<name>` symlink that points outside the active
|
||||
* directory (readlink — NOT readFile, which follows the link and returns the
|
||||
* target's CONTENT), so the subsequent enable-by-name recreates it against
|
||||
* the active copy. Idempotent: on a clean or already-reconciled destination
|
||||
* every step is a no-op (the copy rewrites identical bytes).
|
||||
*
|
||||
* Returns what was done, for assertions and install reporting.
|
||||
*/
|
||||
export interface PlaceUnitResult {
|
||||
readonly unit: string;
|
||||
readonly destination: string;
|
||||
/** A symlink at the unit-name path was unlinked (by-path residue). */
|
||||
readonly unlinkedDestinationSymlink: boolean;
|
||||
/** A stale wants-symlink pointing outside the active dir was removed. */
|
||||
readonly removedStaleWantsSymlink: boolean;
|
||||
}
|
||||
|
||||
export async function placeUnitFile(
|
||||
source: string,
|
||||
systemdUserDir: string,
|
||||
unit: string,
|
||||
): Promise<PlaceUnitResult> {
|
||||
const destination = join(systemdUserDir, unit);
|
||||
let unlinkedDestinationSymlink = false;
|
||||
try {
|
||||
const destInfo = await lstat(destination);
|
||||
if (destInfo.isSymbolicLink()) {
|
||||
await unlink(destination);
|
||||
unlinkedDestinationSymlink = true;
|
||||
}
|
||||
} catch {
|
||||
// absent destination — nothing to unlink
|
||||
}
|
||||
await copyFile(source, destination);
|
||||
|
||||
let removedStaleWantsSymlink = false;
|
||||
const wantsLink = join(systemdUserDir, 'default.target.wants', unit);
|
||||
try {
|
||||
const wantsInfo = await lstat(wantsLink);
|
||||
if (wantsInfo.isSymbolicLink()) {
|
||||
// readlink — NOT readFile: readFile FOLLOWS the link and returns the
|
||||
// target file's CONTENT, which is not the question being asked.
|
||||
let target: string | undefined;
|
||||
try {
|
||||
target = await readlink(wantsLink);
|
||||
} catch {
|
||||
target = undefined;
|
||||
}
|
||||
// Normalize (systemctl writes absolute targets; a relative one resolves
|
||||
// against the wants dir). A wants-symlink pointing anywhere other than
|
||||
// the active copy (the by-path convention points at the seed template)
|
||||
// survives enable-by-name unchanged — remove it so enable recreates it.
|
||||
if (target !== undefined && resolve(dirname(wantsLink), target) !== destination) {
|
||||
await unlink(wantsLink);
|
||||
removedStaleWantsSymlink = true;
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
// absent wants link — nothing to reconcile
|
||||
}
|
||||
|
||||
return { unit, destination, unlinkedDestinationSymlink, removedStaleWantsSymlink };
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the systemctl --user disable command for a given unit.
|
||||
* Used by `fleet remove` so a removed agent's enabled unit cannot resurrect on
|
||||
@@ -831,6 +925,22 @@ export async function enableFleetUnits(
|
||||
let succeeded = 0;
|
||||
let failed = 0;
|
||||
|
||||
// The lease broker ships with the fleet and every gated runtime needs it
|
||||
// (#1292): seats die at lease registration without it, and no documented
|
||||
// path ever enabled it. Enabled first — alongside the holder — and the
|
||||
// unit must have been placed by installFleet's placeUnitFile step.
|
||||
const brokerResult = await runner(
|
||||
...splitCommand(buildSystemdEnableCommand('mosaic-lease-broker.service')),
|
||||
);
|
||||
if (brokerResult.exitCode === 0) {
|
||||
succeeded++;
|
||||
} else {
|
||||
failed++;
|
||||
process.stderr.write(
|
||||
`Warning: could not enable mosaic-lease-broker.service: ${brokerResult.stderr || brokerResult.stdout || 'non-zero exit'}\n`,
|
||||
);
|
||||
}
|
||||
|
||||
const holderResult = await runner(
|
||||
...splitCommand(buildSystemdEnableCommand('mosaic-tmux-holder.service')),
|
||||
);
|
||||
@@ -1527,7 +1637,7 @@ export function registerFleetCommand(program: Command, deps: FleetCommandDeps =
|
||||
.description('Install local fleet tools and user systemd units')
|
||||
.option('--no-enable', 'Skip enabling units for boot-survival')
|
||||
.action(async (opts: { enable?: boolean }) => {
|
||||
await installFleet(cmd, frameworkRoot);
|
||||
await installFleet(cmd, frameworkRoot, runner);
|
||||
// Unit enablement needs agent names only, so it reads either version.
|
||||
const roster = await loadRosterReadModel(cmd);
|
||||
await enableFleetUnits(runner, roster, opts);
|
||||
@@ -1538,7 +1648,7 @@ export function registerFleetCommand(program: Command, deps: FleetCommandDeps =
|
||||
.description('Install local fleet tools and user systemd units')
|
||||
.option('--no-enable', 'Skip enabling units for boot-survival')
|
||||
.action(async (opts: { enable?: boolean }) => {
|
||||
await installFleet(cmd, frameworkRoot);
|
||||
await installFleet(cmd, frameworkRoot, runner);
|
||||
// Unit enablement needs agent names only, so it reads either version.
|
||||
const roster = await loadRosterReadModel(cmd);
|
||||
await enableFleetUnits(runner, roster, opts);
|
||||
@@ -1591,6 +1701,37 @@ export function registerFleetCommand(program: Command, deps: FleetCommandDeps =
|
||||
);
|
||||
return;
|
||||
}
|
||||
if (action === 'start') {
|
||||
// Broker preflight (#1292), re-probed on EVERY invocation: a
|
||||
// gated runtime started without a live lease broker dies ~4s in
|
||||
// while the unit reports active (RemainAfterExit) — enabling +
|
||||
// starting here and then RE-CHECKING the socket refuses loudly
|
||||
// instead of reporting rc0 over a doomed start. This is the
|
||||
// second-start check as much as the first: it never trusts unit
|
||||
// ActiveState.
|
||||
await runChecked(runner, [
|
||||
'systemctl',
|
||||
'--user',
|
||||
'enable',
|
||||
'mosaic-lease-broker.service',
|
||||
]);
|
||||
await runChecked(runner, [
|
||||
'systemctl',
|
||||
'--user',
|
||||
'start',
|
||||
'mosaic-lease-broker.service',
|
||||
]);
|
||||
if (!(await brokerSocketPresent(deps))) {
|
||||
console.error(
|
||||
'[fleet] broker-absent: lease broker socket did not appear after enable+start (#1292).',
|
||||
);
|
||||
console.error(
|
||||
'[fleet] remedy: mosaic fleet install (it reconciles either enable convention)',
|
||||
);
|
||||
process.exitCode = 1;
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (action === 'restart') {
|
||||
// Serialize the holder+agents teardown/relaunch behind the restart lock
|
||||
// so a re-entrant restart waits for clean shutdown before relaunching,
|
||||
@@ -2349,7 +2490,11 @@ export function registerFleetAgentCommands(
|
||||
});
|
||||
}
|
||||
|
||||
async function installFleet(cmd: Command, frameworkRoot: string): Promise<void> {
|
||||
async function installFleet(
|
||||
cmd: Command,
|
||||
frameworkRoot: string,
|
||||
runner: CommandRunner,
|
||||
): Promise<void> {
|
||||
const activePaths = resolveFleetPaths(cmd.opts<{ mosaicHome: string }>().mosaicHome);
|
||||
assertDefaultMosaicHomeForSystemd(activePaths.mosaicHome);
|
||||
// Read model first: every file this function places is roster-independent, and
|
||||
@@ -2401,18 +2546,40 @@ async function installFleet(cmd: Command, frameworkRoot: string): Promise<void>
|
||||
for (const toolPath of executableToolPaths) {
|
||||
await chmod(toolPath, 0o755);
|
||||
}
|
||||
await copyFile(
|
||||
join(frameworkRoot, 'systemd', 'user', 'mosaic-tmux-holder.service'),
|
||||
join(activePaths.systemdUserDir, 'mosaic-tmux-holder.service'),
|
||||
// Unit placement (#1292): every unit goes through placeUnitFile — never a
|
||||
// bare copyFile — so a by-path-enable symlink at the destination is
|
||||
// unlinked rather than written through (copy-through would silently
|
||||
// overwrite the SEED template, measured 2026-08-17). The lease broker unit
|
||||
// is placed here too: previously the install named three units and omitted
|
||||
// the broker entirely, which is why no documented path ever enabled it.
|
||||
const placedUnits = await Promise.all(
|
||||
[
|
||||
'mosaic-tmux-holder.service',
|
||||
'[email protected]',
|
||||
'[email protected]',
|
||||
'mosaic-lease-broker.service',
|
||||
].map((unit) =>
|
||||
placeUnitFile(join(frameworkRoot, 'systemd', 'user', unit), activePaths.systemdUserDir, unit),
|
||||
),
|
||||
);
|
||||
await copyFile(
|
||||
join(frameworkRoot, 'systemd', 'user', '[email protected]'),
|
||||
join(activePaths.systemdUserDir, '[email protected]'),
|
||||
);
|
||||
await copyFile(
|
||||
join(frameworkRoot, 'systemd', 'user', '[email protected]'),
|
||||
join(activePaths.systemdUserDir, '[email protected]'),
|
||||
const reconciled = placedUnits.filter(
|
||||
(result) => result.unlinkedDestinationSymlink || result.removedStaleWantsSymlink,
|
||||
);
|
||||
if (reconciled.length > 0) {
|
||||
console.log(
|
||||
`Reconciled ${reconciled.length} unit placement(s) from by-path enable residue: ${reconciled.map((r) => r.unit).join(', ')}`,
|
||||
);
|
||||
}
|
||||
// systemd will not see a replaced unit file without a reload; do it once
|
||||
// after all placements, before any enable call below. runCommand never
|
||||
// rejects (it resolves exitCode 127 on spawn error), so a plain await with
|
||||
// an exitCode check matches the rest of this file's systemctl handling.
|
||||
const reloadResult = await runner(...splitCommand(['systemctl', '--user', 'daemon-reload']));
|
||||
if (reloadResult.exitCode !== 0) {
|
||||
process.stderr.write(
|
||||
`Warning: systemctl --user daemon-reload after unit placement failed (non-systemd host?): ${reloadResult.stderr || reloadResult.stdout || 'non-zero exit'}\n`,
|
||||
);
|
||||
}
|
||||
|
||||
// On roster v2 the reconciler owns the generated env: `apply` writes it and
|
||||
// `regen` rebuilds it, both from projectRosterV2AgentGeneratedEnv. Writing it
|
||||
@@ -2609,6 +2776,40 @@ function splitCommand(command: string[]): [string, string[]] {
|
||||
return [bin, args];
|
||||
}
|
||||
|
||||
/**
|
||||
* Lease-broker socket presence for the fleet-start preflight (#1292).
|
||||
* Resolution precedence matches launch.ts's defaultLeaseBrokerSocket and
|
||||
* start-agent-session.sh's broker_socket_path: explicit
|
||||
* MOSAIC_LEASE_BROKER_SOCKET, else $XDG_RUNTIME_DIR/mosaic-lease/broker.sock,
|
||||
* else /run/user/<uid>/mosaic-lease/broker.sock. Pure filesystem check — this
|
||||
* deliberately does NOT consult systemd state: a unit can be active
|
||||
* (RemainAfterExit) with no live socket, and the socket is the thing the
|
||||
* gated runtime connects to. Injectable via deps for tests.
|
||||
*/
|
||||
export function resolveLeaseBrokerSocketForPreflight(
|
||||
env: NodeJS.ProcessEnv = process.env,
|
||||
uid: number = typeof process.getuid === 'function' ? process.getuid() : 0,
|
||||
): string {
|
||||
if (env['MOSAIC_LEASE_BROKER_SOCKET']) return env['MOSAIC_LEASE_BROKER_SOCKET'];
|
||||
const runtimeDir = env['XDG_RUNTIME_DIR'] ?? `/run/user/${uid}`;
|
||||
return join(runtimeDir, 'mosaic-lease', 'broker.sock');
|
||||
}
|
||||
|
||||
async function brokerSocketPresent(
|
||||
deps: FleetCommandDeps,
|
||||
env: NodeJS.ProcessEnv = process.env,
|
||||
): Promise<boolean> {
|
||||
const check = deps.checkBrokerSocket;
|
||||
if (check) return check(resolveLeaseBrokerSocketForPreflight(env));
|
||||
try {
|
||||
const socketPath = resolveLeaseBrokerSocketForPreflight(env);
|
||||
await access(socketPath, constants.S_IFSOCK);
|
||||
return true;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/** All supported fleet profile names. */
|
||||
export type FleetProfile =
|
||||
| 'general'
|
||||
|
||||
@@ -205,6 +205,12 @@ export async function runLeaseEnforcementDoctorCheck(
|
||||
message:
|
||||
`Lease-enforcement hooks (${matchedMarkers.join(', ')}) are wired in ~/.claude/settings.json, but ${reasons.join(' and ')}. ` +
|
||||
'Every gated tool call will fail closed and BRICK this agent (see #869). ' +
|
||||
'Remediate by activating the lease-broker supervisor (systemd unit + socket) or by removing the enforcement hooks from ~/.claude/settings.json.',
|
||||
// #1292: one remedy, correct under BOTH enable conventions (by-path on
|
||||
// the seed template, and copy-then-enable in the active dir). Written
|
||||
// from the 2026-08-17 symlink measurement: `systemctl enable` by name
|
||||
// does NOT rewrite an existing by-path wants-symlink, so teaching a
|
||||
// manual systemctl line here could leave a host with two competing
|
||||
// wants links. fleet install reconciles either shape.
|
||||
'Remedy: run `mosaic fleet install` (it reconciles either enable convention), or remove the enforcement hooks from ~/.claude/settings.json.',
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,458 +0,0 @@
|
||||
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
||||
import { Command } from 'commander';
|
||||
import {
|
||||
existsSync,
|
||||
lstatSync,
|
||||
mkdirSync,
|
||||
mkdtempSync,
|
||||
readFileSync,
|
||||
readdirSync,
|
||||
rmSync,
|
||||
symlinkSync,
|
||||
writeFileSync,
|
||||
} from 'node:fs';
|
||||
import { tmpdir } from 'node:os';
|
||||
import { join } from 'node:path';
|
||||
import {
|
||||
addStoreEntry,
|
||||
getDefaultStorePaths,
|
||||
listStoreEntries,
|
||||
registerStoreCommand,
|
||||
StoreError,
|
||||
storeKindDir,
|
||||
validateStoreKind,
|
||||
validateStoreName,
|
||||
validateStoreVersion,
|
||||
type StorePaths,
|
||||
} from './store.js';
|
||||
|
||||
/** Assert a typed StoreError with exactly the expected code. */
|
||||
function expectStoreError(run: () => unknown, code: string): void {
|
||||
try {
|
||||
run();
|
||||
} catch (error) {
|
||||
expect(error).toBeInstanceOf(StoreError);
|
||||
expect((error as StoreError).code).toBe(code);
|
||||
return;
|
||||
}
|
||||
throw new Error(`expected StoreError ${code}, but nothing threw`);
|
||||
}
|
||||
|
||||
describe('vetted user store (W-F4)', () => {
|
||||
let root: string;
|
||||
let paths: StorePaths;
|
||||
let sourceRoot: string;
|
||||
|
||||
beforeEach(() => {
|
||||
root = mkdtempSync(join(tmpdir(), 'mosaic-store-cli-'));
|
||||
paths = { userRoot: join(root, '.mosaic') };
|
||||
sourceRoot = join(root, 'sources');
|
||||
mkdirSync(sourceRoot, { recursive: true });
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
rmSync(root, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
function createSource(name: string): string {
|
||||
const dir = join(sourceRoot, name);
|
||||
mkdirSync(dir, { recursive: true });
|
||||
writeFileSync(join(dir, 'SKILL.md'), `# ${name}\n`);
|
||||
return dir;
|
||||
}
|
||||
|
||||
describe('name and version validation (before any filesystem call)', () => {
|
||||
const invalidNames = [
|
||||
'../../etc',
|
||||
'/abs/path',
|
||||
'a/b',
|
||||
String.raw`a\b`,
|
||||
'-rf',
|
||||
'..',
|
||||
'safe.',
|
||||
'space name',
|
||||
'line\nbreak',
|
||||
'escape\u001B[31m',
|
||||
];
|
||||
|
||||
for (const name of invalidNames) {
|
||||
it(`rejects name ${JSON.stringify(name)}`, () => {
|
||||
expect(() => validateStoreName(name)).toThrow(StoreError);
|
||||
});
|
||||
}
|
||||
|
||||
const invalidVersions = ['', '-1', '1..0', 'a/b', '..', '1.0 beta', '/x'];
|
||||
for (const version of invalidVersions) {
|
||||
it(`rejects version ${JSON.stringify(version)}`, () => {
|
||||
expect(() => validateStoreVersion(version)).toThrow(StoreError);
|
||||
});
|
||||
}
|
||||
|
||||
it('accepts semver-shaped versions including prerelease and build metadata', () => {
|
||||
expect(() => validateStoreVersion('0.1.0-beta.1')).not.toThrow();
|
||||
expect(() => validateStoreVersion('1.2.3+build.7')).not.toThrow();
|
||||
});
|
||||
|
||||
it('rejects plural and unknown kinds', () => {
|
||||
expectStoreError(() => validateStoreKind('plugins'), 'STORE_INVALID_KIND');
|
||||
expectStoreError(() => validateStoreKind('widget'), 'STORE_INVALID_KIND');
|
||||
});
|
||||
|
||||
it('accepts the two spec kinds', () => {
|
||||
expect(() => validateStoreKind('plugin')).not.toThrow();
|
||||
expect(() => validateStoreKind('skill')).not.toThrow();
|
||||
});
|
||||
});
|
||||
|
||||
describe('addStoreEntry', () => {
|
||||
it('copies content into a versioned directory and writes the marker last', () => {
|
||||
const result = addStoreEntry(
|
||||
'skill',
|
||||
'demo',
|
||||
'1.0.0',
|
||||
createSource('demo'),
|
||||
'op',
|
||||
undefined,
|
||||
paths,
|
||||
);
|
||||
expect(result.status).toBe('added');
|
||||
const entryPath = join(paths.userRoot, 'skills', 'demo', '1.0.0');
|
||||
expect(result.entryPath).toBe(entryPath);
|
||||
expect(existsSync(join(entryPath, 'SKILL.md'))).toBe(true);
|
||||
expect(existsSync(join(entryPath, 'store-entry.json'))).toBe(true);
|
||||
const meta = JSON.parse(readFileSync(join(entryPath, 'store-entry.json'), 'utf-8'));
|
||||
expect(meta).toMatchObject({
|
||||
schema: 1,
|
||||
kind: 'skill',
|
||||
name: 'demo',
|
||||
version: '1.0.0',
|
||||
vettedBy: 'op',
|
||||
});
|
||||
expect(typeof meta['vettedAt']).toBe('string');
|
||||
});
|
||||
|
||||
it('writes plugins under plugins/ and skills under skills/', () => {
|
||||
addStoreEntry('plugin', 'alpha', '0.1.0', createSource('alpha'), 'op', undefined, paths);
|
||||
addStoreEntry('skill', 'beta', '2.0.0', createSource('beta'), 'op', undefined, paths);
|
||||
expect(existsSync(join(paths.userRoot, 'plugins', 'alpha', '0.1.0'))).toBe(true);
|
||||
expect(existsSync(join(paths.userRoot, 'skills', 'beta', '2.0.0'))).toBe(true);
|
||||
});
|
||||
|
||||
it('is append-only: an existing version with a marker is refused, not overwritten', () => {
|
||||
const sourceA = createSource('demo');
|
||||
const sourceB = join(sourceRoot, 'demo-other');
|
||||
mkdirSync(sourceB, { recursive: true });
|
||||
writeFileSync(join(sourceB, 'SKILL.md'), '# changed\n');
|
||||
addStoreEntry('skill', 'demo', '1.0.0', sourceA, 'op', undefined, paths);
|
||||
expectStoreError(
|
||||
() => addStoreEntry('skill', 'demo', '1.0.0', sourceB, 'op', undefined, paths),
|
||||
'STORE_ALREADY_PRESENT',
|
||||
);
|
||||
expect(
|
||||
readFileSync(join(paths.userRoot, 'skills', 'demo', '1.0.0', 'SKILL.md'), 'utf-8'),
|
||||
).toBe('# demo\n');
|
||||
});
|
||||
|
||||
it('allows a second version alongside the first', () => {
|
||||
addStoreEntry('skill', 'demo', '1.0.0', createSource('demo'), 'op', undefined, paths);
|
||||
const result = addStoreEntry(
|
||||
'skill',
|
||||
'demo',
|
||||
'1.1.0',
|
||||
createSource('demo'),
|
||||
'op',
|
||||
undefined,
|
||||
paths,
|
||||
);
|
||||
expect(result.status).toBe('added');
|
||||
expect(readdirSync(join(paths.userRoot, 'skills', 'demo')).sort()).toEqual([
|
||||
'1.0.0',
|
||||
'1.1.0',
|
||||
]);
|
||||
});
|
||||
|
||||
it('refuses an unmarked target directory by default and preserves its content', () => {
|
||||
const unmarked = join(paths.userRoot, 'skills', 'demo', '1.0.0');
|
||||
mkdirSync(unmarked, { recursive: true });
|
||||
writeFileSync(join(unmarked, 'SKILL.md'), '# operator content\n');
|
||||
expectStoreError(
|
||||
() => addStoreEntry('skill', 'demo', '1.0.0', createSource('demo'), 'op', undefined, paths),
|
||||
'STORE_TARGET_UNMARKED',
|
||||
);
|
||||
// The operator's hand-placed content survives the refusal.
|
||||
expect(readFileSync(join(unmarked, 'SKILL.md'), 'utf-8')).toBe('# operator content\n');
|
||||
});
|
||||
|
||||
it('reclaims an unmarked target only under explicit reclaim opt-in', () => {
|
||||
const unmarked = join(paths.userRoot, 'skills', 'demo', '1.0.0');
|
||||
mkdirSync(unmarked, { recursive: true });
|
||||
writeFileSync(join(unmarked, 'SKILL.md'), '# torn write\n');
|
||||
const result = addStoreEntry(
|
||||
'skill',
|
||||
'demo',
|
||||
'1.0.0',
|
||||
createSource('demo'),
|
||||
'op',
|
||||
undefined,
|
||||
paths,
|
||||
{ reclaim: true },
|
||||
);
|
||||
expect(result.status).toBe('reclaimed-unmarked');
|
||||
expect(readFileSync(join(unmarked, 'SKILL.md'), 'utf-8')).toBe('# demo\n');
|
||||
});
|
||||
|
||||
it('reclaim can never destroy a marked, vetted entry (append-only holds under --reclaim)', () => {
|
||||
addStoreEntry('skill', 'demo', '1.0.0', createSource('demo'), 'op', undefined, paths);
|
||||
const marked = join(paths.userRoot, 'skills', 'demo', '1.0.0');
|
||||
const vettedContent = readFileSync(join(marked, 'SKILL.md'), 'utf-8');
|
||||
expectStoreError(
|
||||
() =>
|
||||
addStoreEntry('skill', 'demo', '1.0.0', createSource('demo'), 'op', undefined, paths, {
|
||||
reclaim: true,
|
||||
}),
|
||||
'STORE_ALREADY_PRESENT',
|
||||
);
|
||||
// Load-bearing half: the throw alone does not prove nothing was deleted
|
||||
// before it. Pins the marker-check-before-reclaim-check ordering against
|
||||
// the guard-clause-migrates-upward refactor (review finding on b2124c6).
|
||||
expect(readFileSync(join(marked, 'SKILL.md'), 'utf-8')).toBe(vettedContent);
|
||||
expect(existsSync(join(marked, 'store-entry.json'))).toBe(true);
|
||||
});
|
||||
|
||||
it('refuses a missing source with a typed error', () => {
|
||||
expectStoreError(
|
||||
() =>
|
||||
addStoreEntry('skill', 'demo', '1.0.0', join(sourceRoot, 'nope'), 'op', undefined, paths),
|
||||
'STORE_SOURCE_MISSING',
|
||||
);
|
||||
});
|
||||
|
||||
it('refuses a file (non-directory) source with a typed error', () => {
|
||||
const filePath = join(sourceRoot, 'file.txt');
|
||||
writeFileSync(filePath, 'x');
|
||||
expectStoreError(
|
||||
() => addStoreEntry('skill', 'demo', '1.0.0', filePath, 'op', undefined, paths),
|
||||
'STORE_SOURCE_NOT_DIR',
|
||||
);
|
||||
});
|
||||
|
||||
it('refuses a symlinked source with a typed error and writes nothing', () => {
|
||||
const real = createSource('demo');
|
||||
const link = join(sourceRoot, 'demo-link');
|
||||
symlinkSync(real, link);
|
||||
expectStoreError(
|
||||
() => addStoreEntry('skill', 'demo', '1.0.0', link, 'op', undefined, paths),
|
||||
'STORE_SOURCE_SYMLINK',
|
||||
);
|
||||
expect(existsSync(join(paths.userRoot, 'skills', 'demo'))).toBe(false);
|
||||
});
|
||||
|
||||
it('refuses a source tree containing nested symlinks and writes nothing', () => {
|
||||
const src = createSource('demo');
|
||||
const target = join(sourceRoot, 'elsewhere');
|
||||
mkdirSync(target, { recursive: true });
|
||||
symlinkSync(target, join(src, 'escape'));
|
||||
expectStoreError(
|
||||
() => addStoreEntry('skill', 'demo', '1.0.0', src, 'op', undefined, paths),
|
||||
'STORE_SOURCE_SYMLINK',
|
||||
);
|
||||
expect(existsSync(join(paths.userRoot, 'skills', 'demo'))).toBe(false);
|
||||
});
|
||||
|
||||
it('refuses adding from inside the store itself', () => {
|
||||
const first = addStoreEntry(
|
||||
'skill',
|
||||
'demo',
|
||||
'1.0.0',
|
||||
createSource('demo'),
|
||||
'op',
|
||||
undefined,
|
||||
paths,
|
||||
);
|
||||
expectStoreError(
|
||||
() => addStoreEntry('skill', 'copy', '1.0.0', first.entryPath, 'op', undefined, paths),
|
||||
'STORE_SOURCE_INSIDE_STORE',
|
||||
);
|
||||
});
|
||||
|
||||
it('refuses a symlinked user root ancestor', () => {
|
||||
const linkedRoot = join(sourceRoot, 'linked-mosaic');
|
||||
symlinkSync(paths.userRoot, linkedRoot);
|
||||
expectStoreError(
|
||||
() =>
|
||||
addStoreEntry('skill', 'demo', '1.0.0', createSource('demo'), 'op', undefined, {
|
||||
userRoot: linkedRoot,
|
||||
}),
|
||||
'STORE_SYMLINK_ROOT',
|
||||
);
|
||||
});
|
||||
|
||||
it('requires a non-empty vetting attribution', () => {
|
||||
expectStoreError(
|
||||
() => addStoreEntry('skill', 'demo', '1.0.0', createSource('demo'), ' ', undefined, paths),
|
||||
'STORE_INVALID_VETTER',
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('listStoreEntries', () => {
|
||||
it('returns empty for an absent store without creating it', () => {
|
||||
expect(listStoreEntries(paths)).toEqual([]);
|
||||
expect(existsSync(paths.userRoot)).toBe(false);
|
||||
});
|
||||
|
||||
it('lists entries deterministically with vetting metadata', () => {
|
||||
addStoreEntry('plugin', 'alpha', '0.1.0', createSource('alpha'), 'fred', undefined, paths);
|
||||
addStoreEntry('skill', 'beta', '2.0.0', createSource('beta'), 'fargo', 'looked fine', paths);
|
||||
addStoreEntry('skill', 'beta', '2.1.0', createSource('beta'), 'fargo', undefined, paths);
|
||||
|
||||
const entries = listStoreEntries(paths);
|
||||
expect(entries.map((e) => `${e.kind}:${e.name}:${e.version}`)).toEqual([
|
||||
'plugin:alpha:0.1.0',
|
||||
'skill:beta:2.0.0',
|
||||
'skill:beta:2.1.0',
|
||||
]);
|
||||
expect(entries[0]?.meta?.vettedBy).toBe('fred');
|
||||
expect(entries[1]?.meta?.notes).toBe('looked fine');
|
||||
});
|
||||
|
||||
it('classifies markerless version directories as incomplete', () => {
|
||||
addStoreEntry('skill', 'demo', '1.0.0', createSource('demo'), 'op', undefined, paths);
|
||||
mkdirSync(join(paths.userRoot, 'skills', 'demo', '2.0.0'), { recursive: true });
|
||||
const entries = listStoreEntries(paths, { kind: 'skill', name: 'demo' });
|
||||
expect(entries.find((e) => e.version === '1.0.0')?.status).toBe('vetted');
|
||||
expect(entries.find((e) => e.version === '2.0.0')?.status).toBe('incomplete');
|
||||
});
|
||||
|
||||
it('classifies malformed marker JSON as invalid-metadata, not vetted', () => {
|
||||
addStoreEntry('skill', 'demo', '1.0.0', createSource('demo'), 'op', undefined, paths);
|
||||
writeFileSync(
|
||||
join(paths.userRoot, 'skills', 'demo', '1.0.0', 'store-entry.json'),
|
||||
'{not json',
|
||||
);
|
||||
const entries = listStoreEntries(paths);
|
||||
expect(entries[0]?.status).toBe('invalid-metadata');
|
||||
});
|
||||
|
||||
it('surfaces foreign files (never mutates them)', () => {
|
||||
mkdirSync(join(paths.userRoot, 'skills'), { recursive: true });
|
||||
writeFileSync(join(paths.userRoot, 'skills', 'stray.txt'), 'x');
|
||||
const entries = listStoreEntries(paths);
|
||||
expect(entries[0]?.status).toBe('foreign');
|
||||
expect(existsSync(join(paths.userRoot, 'skills', 'stray.txt'))).toBe(true);
|
||||
});
|
||||
|
||||
it('filters by kind and name', () => {
|
||||
addStoreEntry('plugin', 'alpha', '0.1.0', createSource('alpha'), 'op', undefined, paths);
|
||||
addStoreEntry('skill', 'beta', '1.0.0', createSource('beta'), 'op', undefined, paths);
|
||||
expect(listStoreEntries(paths, { kind: 'plugin' }).map((e) => e.name)).toEqual(['alpha']);
|
||||
expect(listStoreEntries(paths, { name: 'beta' }).map((e) => e.name)).toEqual(['beta']);
|
||||
expect(() => listStoreEntries(paths, { name: '../escape' })).toThrow(StoreError);
|
||||
});
|
||||
});
|
||||
|
||||
describe('default paths seam', () => {
|
||||
it('honors MOSAIC_USER_HOME', () => {
|
||||
const previous = process.env['MOSAIC_USER_HOME'];
|
||||
try {
|
||||
process.env['MOSAIC_USER_HOME'] = join(root, 'custom-user-home');
|
||||
expect(getDefaultStorePaths().userRoot).toBe(join(root, 'custom-user-home'));
|
||||
expect(storeKindDir('plugin')).toBe(join(root, 'custom-user-home', 'plugins'));
|
||||
} finally {
|
||||
if (previous === undefined) delete process.env['MOSAIC_USER_HOME'];
|
||||
else process.env['MOSAIC_USER_HOME'] = previous;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
describe('CLI', () => {
|
||||
let previousExitCode: string | number | null | undefined;
|
||||
|
||||
beforeEach(() => {
|
||||
previousExitCode = process.exitCode;
|
||||
process.exitCode = undefined;
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
process.exitCode = previousExitCode;
|
||||
});
|
||||
|
||||
const parse = (args: string[]) => {
|
||||
const program = new Command().exitOverride();
|
||||
registerStoreCommand(program, paths);
|
||||
return program.parseAsync(['node', 'mosaic', 'store', ...args]);
|
||||
};
|
||||
|
||||
it('registers on the parent program and renders help', () => {
|
||||
const program = new Command().exitOverride();
|
||||
registerStoreCommand(program, paths);
|
||||
const cmd = program.commands.find((c) => c.name() === 'store');
|
||||
expect(cmd).toBeDefined();
|
||||
expect(() => cmd?.helpInformation()).not.toThrow();
|
||||
});
|
||||
|
||||
it('add exits nonzero with a typed code for an invalid name', async () => {
|
||||
await parse([
|
||||
'add',
|
||||
'skill',
|
||||
'../../etc',
|
||||
'1.0.0',
|
||||
'--from',
|
||||
createSource('x'),
|
||||
'--by',
|
||||
'op',
|
||||
]);
|
||||
expect(process.exitCode).toBe(1);
|
||||
});
|
||||
|
||||
it('add exits nonzero when the kind is plural', async () => {
|
||||
await parse(['add', 'skills', 'demo', '1.0.0', '--from', createSource('demo'), '--by', 'op']);
|
||||
expect(process.exitCode).toBe(1);
|
||||
});
|
||||
|
||||
it('add succeeds and creates the entry directory', async () => {
|
||||
await parse(['add', 'skill', 'demo', '1.0.0', '--from', createSource('demo'), '--by', 'op']);
|
||||
expect(process.exitCode).toBeUndefined();
|
||||
expect(lstatSync(join(paths.userRoot, 'skills', 'demo', '1.0.0')).isDirectory()).toBe(true);
|
||||
});
|
||||
|
||||
it('add requires --by (commander requiredOption)', async () => {
|
||||
await expect(
|
||||
parse(['add', 'skill', 'demo', '1.0.0', '--from', createSource('demo')]),
|
||||
).rejects.toThrow(/--by/);
|
||||
});
|
||||
|
||||
it('add exits nonzero on an unmarked target without --reclaim, preserving content', async () => {
|
||||
const unmarked = join(paths.userRoot, 'skills', 'demo', '1.0.0');
|
||||
mkdirSync(unmarked, { recursive: true });
|
||||
writeFileSync(join(unmarked, 'SKILL.md'), '# operator\n');
|
||||
await parse(['add', 'skill', 'demo', '1.0.0', '--from', createSource('demo'), '--by', 'op']);
|
||||
expect(process.exitCode).toBe(1);
|
||||
expect(readFileSync(join(unmarked, 'SKILL.md'), 'utf-8')).toBe('# operator\n');
|
||||
});
|
||||
|
||||
it('add --reclaim replaces the unmarked target and succeeds', async () => {
|
||||
const unmarked = join(paths.userRoot, 'skills', 'demo', '1.0.0');
|
||||
mkdirSync(unmarked, { recursive: true });
|
||||
writeFileSync(join(unmarked, 'SKILL.md'), '# torn\n');
|
||||
await parse([
|
||||
'add',
|
||||
'skill',
|
||||
'demo',
|
||||
'1.0.0',
|
||||
'--from',
|
||||
createSource('demo'),
|
||||
'--by',
|
||||
'op',
|
||||
'--reclaim',
|
||||
]);
|
||||
expect(process.exitCode).toBeUndefined();
|
||||
expect(readFileSync(join(unmarked, 'SKILL.md'), 'utf-8')).toBe('# demo\n');
|
||||
});
|
||||
|
||||
it('list exits 0 on an empty store', async () => {
|
||||
await parse(['list']);
|
||||
expect(process.exitCode).toBeUndefined();
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,544 +0,0 @@
|
||||
import {
|
||||
cpSync,
|
||||
existsSync,
|
||||
lstatSync,
|
||||
mkdirSync,
|
||||
readdirSync,
|
||||
readFileSync,
|
||||
rmSync,
|
||||
writeFileSync,
|
||||
type Dirent,
|
||||
type Stats,
|
||||
} from 'node:fs';
|
||||
import { isAbsolute, join, parse, relative, resolve, sep } from 'node:path';
|
||||
import type { Command } from 'commander';
|
||||
import { DEFAULT_MOSAIC_USER_HOME } from '../constants.js';
|
||||
|
||||
/**
|
||||
* `mosaic store` — the vetted user store under `~/.mosaic/{plugins,skills}` (W-F4).
|
||||
*
|
||||
* Two roots with distinct ownership (HARNESS-HOMES design, frozen REV3):
|
||||
* - `~/.config/mosaic/` is the SYSTEM root: update-owned, replaceable wholesale.
|
||||
* - `~/.mosaic/` is the USER root: never touched by installs or updates.
|
||||
*
|
||||
* This module only ever writes under the USER root. The store is the vetting
|
||||
* boundary: content lands here only through an explicit `store add` carrying a
|
||||
* named vetting attribution, and every entry is versioned
|
||||
* (`store/<kind>s/<name>/<version>/`) with a `store-entry.json` marker written
|
||||
* LAST — a version directory without its marker is never a usable entry, and
|
||||
* an unmarked target is REFUSED by default: it may be this tool's own debris
|
||||
* from an interrupted add, or content the operator placed by hand, and the
|
||||
* code cannot tell those apart — so deletion happens only under an explicit
|
||||
* `--reclaim` opt-in, and the result status names what was done.
|
||||
*
|
||||
* Deferred by design (W-F6 and later): activation/symlink-install into agent
|
||||
* homes, `current`-pointer pinning, network acquisition. `add` accepts a local
|
||||
* source path only — no network, no credentials, ever.
|
||||
*/
|
||||
|
||||
export type StoreKind = 'plugin' | 'skill';
|
||||
export const STORE_KINDS: readonly StoreKind[] = ['plugin', 'skill'];
|
||||
|
||||
/** On-disk metadata marker; written last so its presence commits an entry. */
|
||||
export const STORE_ENTRY_MARKER = 'store-entry.json';
|
||||
|
||||
export interface StorePaths {
|
||||
/** User data root, e.g. `~/.mosaic`. */
|
||||
userRoot: string;
|
||||
}
|
||||
|
||||
export interface StoreEntryMeta {
|
||||
schema: 1;
|
||||
kind: StoreKind;
|
||||
name: string;
|
||||
version: string;
|
||||
/** Absolute source path the content was vetted from, as resolved at add time. */
|
||||
sourcePath: string;
|
||||
/** Operator who vouched for the content — required, non-empty. */
|
||||
vettedBy: string;
|
||||
/** ISO timestamp of the add. */
|
||||
vettedAt: string;
|
||||
/** Free-form vetting notes, if any. */
|
||||
notes?: string;
|
||||
}
|
||||
|
||||
export type StoreAddStatus = 'added' | 'reclaimed-unmarked';
|
||||
|
||||
export interface StoreAddResult {
|
||||
kind: StoreKind;
|
||||
name: string;
|
||||
version: string;
|
||||
status: StoreAddStatus;
|
||||
entryPath: string;
|
||||
sourcePath: string;
|
||||
}
|
||||
|
||||
export type StoreEntryStatus = 'vetted' | 'incomplete' | 'invalid-metadata' | 'foreign';
|
||||
|
||||
export interface StoreListEntry {
|
||||
kind: StoreKind;
|
||||
name: string;
|
||||
/** Undefined for name-level foreign files (not a directory at all). */
|
||||
version?: string;
|
||||
status: StoreEntryStatus;
|
||||
entryPath: string;
|
||||
meta?: StoreEntryMeta;
|
||||
}
|
||||
|
||||
const SAFE_STORE_NAME = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
|
||||
const SAFE_STORE_VERSION = /^[A-Za-z0-9][A-Za-z0-9._+-]*$/;
|
||||
|
||||
export class StoreError extends Error {
|
||||
public readonly code: string;
|
||||
|
||||
public constructor(code: string, message: string) {
|
||||
super(message);
|
||||
this.name = 'StoreError';
|
||||
this.code = code;
|
||||
}
|
||||
}
|
||||
|
||||
/** Resolve the user store root while keeping tests injectable. */
|
||||
export function getDefaultStorePaths(): StorePaths {
|
||||
const userRoot = process.env['MOSAIC_USER_HOME'] ?? DEFAULT_MOSAIC_USER_HOME;
|
||||
return { userRoot };
|
||||
}
|
||||
|
||||
/**
|
||||
* Reject a user-supplied name before any filesystem operation.
|
||||
* A store name identifies one directory under `store/<kind>s/`.
|
||||
*/
|
||||
export function validateStoreName(name: string): void {
|
||||
if (
|
||||
name.length === 0 ||
|
||||
name.startsWith('-') ||
|
||||
name.endsWith('.') ||
|
||||
name.includes('..') ||
|
||||
name.includes('/') ||
|
||||
name.includes('\\') ||
|
||||
isAbsolute(name) ||
|
||||
!SAFE_STORE_NAME.test(name)
|
||||
) {
|
||||
throw new StoreError(
|
||||
'STORE_INVALID_NAME',
|
||||
`Invalid store name ${JSON.stringify(name)}: use letters, numbers, dots, underscores, or hyphens; start with a letter or number; and do not use paths, "..", or a leading "-".`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/** Versions share the name discipline plus `+` (semver build metadata). */
|
||||
export function validateStoreVersion(version: string): void {
|
||||
if (
|
||||
version.length === 0 ||
|
||||
version.startsWith('-') ||
|
||||
version.endsWith('.') ||
|
||||
version.includes('..') ||
|
||||
version.includes('/') ||
|
||||
version.includes('\\') ||
|
||||
isAbsolute(version) ||
|
||||
!SAFE_STORE_VERSION.test(version)
|
||||
) {
|
||||
throw new StoreError(
|
||||
'STORE_INVALID_VERSION',
|
||||
`Invalid version ${JSON.stringify(version)}: use letters, numbers, dots, underscores, hyphens, or plus; start with a letter or number; and do not use paths, "..", or a leading "-".`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export function validateStoreKind(kind: string): asserts kind is StoreKind {
|
||||
if (!(STORE_KINDS as readonly string[]).includes(kind)) {
|
||||
throw new StoreError(
|
||||
'STORE_INVALID_KIND',
|
||||
`Invalid store kind ${JSON.stringify(kind)}: expected one of ${STORE_KINDS.map((k) => `"${k}"`).join(', ')}.`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
function validateVettedBy(vettedBy: string): void {
|
||||
if (vettedBy.trim().length === 0 || vettedBy.includes('\n') || vettedBy.length > 80) {
|
||||
throw new StoreError(
|
||||
'STORE_INVALID_VETTER',
|
||||
'Invalid --by value: name the operator vouching for this content (single line, at most 80 characters).',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
function lstatIfPresent(path: string): Stats | undefined {
|
||||
try {
|
||||
return lstatSync(path);
|
||||
} catch (error: unknown) {
|
||||
if (error instanceof Error && 'code' in error && error.code === 'ENOENT') return undefined;
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
function assertNoSymlinkAncestors(path: string): void {
|
||||
const absolute = resolve(path);
|
||||
const pathRoot = parse(absolute).root;
|
||||
let current = pathRoot;
|
||||
|
||||
for (const segment of relative(pathRoot, absolute).split(sep)) {
|
||||
if (segment.length === 0) continue;
|
||||
current = join(current, segment);
|
||||
const entry = lstatIfPresent(current);
|
||||
if (!entry) break;
|
||||
if (entry.isSymbolicLink()) {
|
||||
throw new StoreError(
|
||||
'STORE_SYMLINK_ROOT',
|
||||
`Refusing symlink ancestor at ${current}; the user store root must resolve without symlink traversal.`,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** `plugins` for plugin, `skills` for skill — plural on disk per the layout. */
|
||||
function kindDirName(kind: StoreKind): string {
|
||||
return kind === 'plugin' ? 'plugins' : 'skills';
|
||||
}
|
||||
|
||||
export function storeKindDir(kind: StoreKind, paths: StorePaths = getDefaultStorePaths()): string {
|
||||
return join(paths.userRoot, kindDirName(kind));
|
||||
}
|
||||
|
||||
function entryDir(kind: StoreKind, name: string, version: string, paths: StorePaths): string {
|
||||
return join(storeKindDir(kind, paths), name, version);
|
||||
}
|
||||
|
||||
function isInsideRoot(candidate: string, root: string): boolean {
|
||||
const rel = relative(resolve(root), resolve(candidate));
|
||||
return rel.length > 0 && rel !== '..' && !rel.startsWith(`..${sep}`) && !isAbsolute(rel);
|
||||
}
|
||||
|
||||
/**
|
||||
* Refuse any symlink in the source tree — the vetting boundary copies real
|
||||
* content only, so a vetted entry can never carry a link that escapes it.
|
||||
*
|
||||
* NOTE: known check-then-use window between this walk and the `cpSync` below:
|
||||
* a symlink created concurrently with the add could slip through. Accepted
|
||||
* for a local, operator-run CLI; revisit before any unattended or networked
|
||||
* acquisition path exists.
|
||||
*/
|
||||
function assertSourceTreeHasNoSymlinks(sourcePath: string): void {
|
||||
const stack: string[] = [sourcePath];
|
||||
while (stack.length > 0) {
|
||||
const current = stack.pop()!;
|
||||
for (const dirent of readdirSync(current, { withFileTypes: true })) {
|
||||
const child = join(current, dirent.name);
|
||||
if (dirent.isSymbolicLink()) {
|
||||
throw new StoreError(
|
||||
'STORE_SOURCE_SYMLINK',
|
||||
`Refusing to vet content containing a symlink: ${child}. Resolve or remove symlinks before adding to the store.`,
|
||||
);
|
||||
}
|
||||
if (dirent.isDirectory()) stack.push(child);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Vet and add one versioned entry to the user store.
|
||||
*
|
||||
* Copies the source directory (real content, no symlinks) to
|
||||
* `<userRoot>/<kind>s/<name>/<version>/` and writes the `store-entry.json`
|
||||
* marker LAST: a crash mid-copy leaves at most a recoverable partial, never a
|
||||
* half-vetted entry that lists as present.
|
||||
*/
|
||||
export function addStoreEntry(
|
||||
kind: StoreKind,
|
||||
name: string,
|
||||
version: string,
|
||||
sourcePath: string,
|
||||
vettedBy: string,
|
||||
notes: string | undefined,
|
||||
paths: StorePaths = getDefaultStorePaths(),
|
||||
options: { reclaim?: boolean } = {},
|
||||
): StoreAddResult {
|
||||
validateStoreKind(kind);
|
||||
validateStoreName(name);
|
||||
validateStoreVersion(version);
|
||||
validateVettedBy(vettedBy);
|
||||
assertNoSymlinkAncestors(paths.userRoot);
|
||||
|
||||
const resolvedSource = resolve(sourcePath);
|
||||
const source = lstatIfPresent(resolvedSource);
|
||||
if (!source) {
|
||||
throw new StoreError('STORE_SOURCE_MISSING', `Source path does not exist: ${resolvedSource}`);
|
||||
}
|
||||
if (source.isSymbolicLink()) {
|
||||
throw new StoreError(
|
||||
'STORE_SOURCE_SYMLINK',
|
||||
`Refusing to vet a symlink as store content: ${resolvedSource} (points at ${resolve(sourcePath)}). Add the real directory.`,
|
||||
);
|
||||
}
|
||||
if (!source.isDirectory()) {
|
||||
throw new StoreError(
|
||||
'STORE_SOURCE_NOT_DIR',
|
||||
`Source path is not a directory: ${resolvedSource}`,
|
||||
);
|
||||
}
|
||||
if (isInsideRoot(resolvedSource, paths.userRoot)) {
|
||||
throw new StoreError(
|
||||
'STORE_SOURCE_INSIDE_STORE',
|
||||
`Refusing to add store content from inside the store itself: ${resolvedSource}`,
|
||||
);
|
||||
}
|
||||
assertSourceTreeHasNoSymlinks(resolvedSource);
|
||||
|
||||
const target = entryDir(kind, name, version, paths);
|
||||
const existing = lstatIfPresent(target);
|
||||
let status: StoreAddStatus = 'added';
|
||||
if (existing) {
|
||||
if (existsSync(join(target, STORE_ENTRY_MARKER))) {
|
||||
throw new StoreError(
|
||||
'STORE_ALREADY_PRESENT',
|
||||
`${kind} "${name}" version "${version}" is already present at ${target}; stores are append-only — add a new version instead.`,
|
||||
);
|
||||
}
|
||||
// Unmarked target: either this tool's own debris from an interrupted add,
|
||||
// or content the operator placed by hand — indistinguishable on disk. The
|
||||
// USER root's contract is that tooling never destroys operator content,
|
||||
// so deletion requires the explicit --reclaim opt-in (review finding on
|
||||
// c23a71d7: silent rmSync under a benign-sounding status).
|
||||
if (!options.reclaim) {
|
||||
throw new StoreError(
|
||||
'STORE_TARGET_UNMARKED',
|
||||
`Target exists without ${STORE_ENTRY_MARKER}: ${target}. Refusing to delete unmarked content — if this is debris from an interrupted add, re-run with --reclaim to replace it.`,
|
||||
);
|
||||
}
|
||||
rmSync(target, { recursive: true, force: true });
|
||||
status = 'reclaimed-unmarked';
|
||||
}
|
||||
|
||||
mkdirSync(target, { recursive: true });
|
||||
cpSync(resolvedSource, target, { recursive: true });
|
||||
|
||||
const meta: StoreEntryMeta = {
|
||||
schema: 1,
|
||||
kind,
|
||||
name,
|
||||
version,
|
||||
sourcePath: resolvedSource,
|
||||
vettedBy: vettedBy.trim(),
|
||||
vettedAt: new Date().toISOString(),
|
||||
...(notes === undefined ? {} : { notes }),
|
||||
};
|
||||
writeFileSync(join(target, STORE_ENTRY_MARKER), `${JSON.stringify(meta, null, 2)}\n`);
|
||||
|
||||
return { kind, name, version, status, entryPath: target, sourcePath: resolvedSource };
|
||||
}
|
||||
|
||||
function readEntryMeta(markerPath: string): { meta?: StoreEntryMeta; status: StoreEntryStatus } {
|
||||
let raw: string;
|
||||
try {
|
||||
raw = readFileSync(markerPath, 'utf-8');
|
||||
} catch {
|
||||
return { status: 'invalid-metadata' };
|
||||
}
|
||||
try {
|
||||
const parsed = JSON.parse(raw) as StoreEntryMeta;
|
||||
if (
|
||||
parsed?.schema === 1 &&
|
||||
(STORE_KINDS as readonly string[]).includes(parsed.kind) &&
|
||||
typeof parsed.name === 'string' &&
|
||||
typeof parsed.version === 'string' &&
|
||||
typeof parsed.vettedBy === 'string' &&
|
||||
typeof parsed.vettedAt === 'string'
|
||||
) {
|
||||
return { meta: parsed, status: 'vetted' };
|
||||
}
|
||||
} catch {
|
||||
// fall through
|
||||
}
|
||||
return { status: 'invalid-metadata' };
|
||||
}
|
||||
|
||||
/**
|
||||
* Enumerate every store entry deterministically (kind, then name, then
|
||||
* version). Version directories without a marker list as `incomplete`; files
|
||||
* where directories were expected list as `foreign` — surfaced, never mutated.
|
||||
*/
|
||||
export function listStoreEntries(
|
||||
paths: StorePaths = getDefaultStorePaths(),
|
||||
filter: { kind?: StoreKind; name?: string } = {},
|
||||
): StoreListEntry[] {
|
||||
if (filter.name !== undefined) validateStoreName(filter.name);
|
||||
assertNoSymlinkAncestors(paths.userRoot);
|
||||
|
||||
const kinds = filter.kind ? [filter.kind] : [...STORE_KINDS];
|
||||
const entries: StoreListEntry[] = [];
|
||||
|
||||
for (const kind of kinds) {
|
||||
const kindRoot = lstatIfPresent(storeKindDir(kind, paths));
|
||||
if (!kindRoot) continue;
|
||||
if (!kindRoot.isDirectory()) {
|
||||
entries.push({
|
||||
kind,
|
||||
name: kindDirName(kind),
|
||||
status: 'foreign',
|
||||
entryPath: storeKindDir(kind, paths),
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
for (const nameDirent of readdirSync(storeKindDir(kind, paths), {
|
||||
withFileTypes: true,
|
||||
}).sort(byName) as Dirent[]) {
|
||||
if (filter.name !== undefined && nameDirent.name !== filter.name) continue;
|
||||
const namePath = join(storeKindDir(kind, paths), nameDirent.name);
|
||||
|
||||
if (!nameDirent.isDirectory()) {
|
||||
entries.push({ kind, name: nameDirent.name, status: 'foreign', entryPath: namePath });
|
||||
continue;
|
||||
}
|
||||
|
||||
const versionDirents = readdirSync(namePath, { withFileTypes: true }).sort(byName);
|
||||
if (versionDirents.length === 0) {
|
||||
entries.push({ kind, name: nameDirent.name, status: 'incomplete', entryPath: namePath });
|
||||
continue;
|
||||
}
|
||||
for (const versionDirent of versionDirents) {
|
||||
const versionPath = join(namePath, versionDirent.name);
|
||||
if (!versionDirent.isDirectory()) {
|
||||
entries.push({
|
||||
kind,
|
||||
name: nameDirent.name,
|
||||
version: versionDirent.name,
|
||||
status: 'foreign',
|
||||
entryPath: versionPath,
|
||||
});
|
||||
continue;
|
||||
}
|
||||
const markerPath = join(versionPath, STORE_ENTRY_MARKER);
|
||||
if (!existsSync(markerPath)) {
|
||||
entries.push({
|
||||
kind,
|
||||
name: nameDirent.name,
|
||||
version: versionDirent.name,
|
||||
status: 'incomplete',
|
||||
entryPath: versionPath,
|
||||
});
|
||||
continue;
|
||||
}
|
||||
const { meta, status } = readEntryMeta(markerPath);
|
||||
entries.push({
|
||||
kind,
|
||||
name: nameDirent.name,
|
||||
version: versionDirent.name,
|
||||
status,
|
||||
entryPath: versionPath,
|
||||
...(meta === undefined ? {} : { meta }),
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return entries;
|
||||
}
|
||||
|
||||
function byName(a: Dirent, b: Dirent): number {
|
||||
return a.name < b.name ? -1 : a.name > b.name ? 1 : 0;
|
||||
}
|
||||
|
||||
function reportCommandError(error: unknown): void {
|
||||
if (error instanceof StoreError) {
|
||||
console.error(`store: ${error.code}: ${error.message}`);
|
||||
} else {
|
||||
console.error(error instanceof Error ? error.message : String(error));
|
||||
}
|
||||
process.exitCode = 1;
|
||||
}
|
||||
|
||||
function displayStoreName(name: string): string {
|
||||
return SAFE_STORE_NAME.test(name) ? name : JSON.stringify(name);
|
||||
}
|
||||
|
||||
/** Register the `mosaic store` command group (W-F4). */
|
||||
export function registerStoreCommand(
|
||||
program: Command,
|
||||
paths: StorePaths = getDefaultStorePaths(),
|
||||
): void {
|
||||
const store = program
|
||||
.command('store')
|
||||
.description('Manage the vetted user store under ~/.mosaic (plugins, skills)')
|
||||
.configureHelp({ sortSubcommands: true });
|
||||
|
||||
store
|
||||
.command('add <kind> <name> <version>')
|
||||
.description(
|
||||
'Vet and add a local plugin/skill directory to the user store (versioned, append-only)',
|
||||
)
|
||||
.requiredOption('--from <path>', 'Local source directory to vet (no network acquisition)')
|
||||
.requiredOption('--by <operator>', 'Name of the operator vouching for this content')
|
||||
.option('--notes <notes>', 'Vetting notes recorded in the entry metadata')
|
||||
.option(
|
||||
'--reclaim',
|
||||
'Replace an existing UNMARKED target directory (e.g. debris from an interrupted add); refuses without this flag',
|
||||
)
|
||||
.action(
|
||||
async (
|
||||
kind: string,
|
||||
name: string,
|
||||
version: string,
|
||||
opts: {
|
||||
from: string;
|
||||
by: string;
|
||||
notes?: string;
|
||||
reclaim: boolean;
|
||||
},
|
||||
) => {
|
||||
try {
|
||||
const result = addStoreEntry(
|
||||
kind as StoreKind,
|
||||
name,
|
||||
version,
|
||||
opts.from,
|
||||
opts.by,
|
||||
opts.notes,
|
||||
paths,
|
||||
{ reclaim: opts.reclaim },
|
||||
);
|
||||
const suffix =
|
||||
result.status === 'reclaimed-unmarked' ? ' (replaced unmarked directory)' : '';
|
||||
console.log(
|
||||
`${result.kind} ${displayStoreName(result.name)} ${result.version}: added${suffix}`,
|
||||
);
|
||||
console.log(` entry: ${result.entryPath}`);
|
||||
console.log(` vetted by ${opts.by.trim()}`);
|
||||
} catch (error: unknown) {
|
||||
reportCommandError(error);
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
store
|
||||
.command('list')
|
||||
.description('List store entries with vetting status')
|
||||
.option('--kind <kind>', 'Filter by kind (plugin | skill)')
|
||||
.option('--name <name>', 'Filter by entry name')
|
||||
.action((opts: { kind?: string; name?: string }) => {
|
||||
try {
|
||||
let kind: StoreKind | undefined;
|
||||
if (opts.kind !== undefined) {
|
||||
validateStoreKind(opts.kind);
|
||||
kind = opts.kind;
|
||||
}
|
||||
const entries = listStoreEntries(paths, {
|
||||
...(kind === undefined ? {} : { kind }),
|
||||
...(opts.name === undefined ? {} : { name: opts.name }),
|
||||
});
|
||||
if (entries.length === 0) {
|
||||
console.log('No store entries found.');
|
||||
return;
|
||||
}
|
||||
for (const entry of entries) {
|
||||
const version = entry.version ?? '-';
|
||||
const vetter = entry.meta?.vettedBy ?? '-';
|
||||
console.log(
|
||||
`${entry.status.padEnd(17)}${entry.kind.padEnd(8)}${displayStoreName(entry.name).padEnd(24)}${version.padEnd(16)}${vetter}`,
|
||||
);
|
||||
}
|
||||
} catch (error: unknown) {
|
||||
reportCommandError(error);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -5,13 +5,6 @@ export const VERSION = '0.0.2';
|
||||
|
||||
export const DEFAULT_MOSAIC_HOME = join(homedir(), '.config', 'mosaic');
|
||||
|
||||
/**
|
||||
* USER data root (HARNESS-HOMES two-root split): everything under here is user
|
||||
* content — never replaced or removed by installs, updates, or uninstallers.
|
||||
* Distinct from the SYSTEM root above, which is update-owned.
|
||||
*/
|
||||
export const DEFAULT_MOSAIC_USER_HOME = join(homedir(), '.mosaic');
|
||||
|
||||
export const DEFAULTS = {
|
||||
agentName: 'Assistant',
|
||||
roleDescription: 'execution partner and visibility engine',
|
||||
|
||||
@@ -459,6 +459,7 @@ describe('FCM-M3-002 reconciler lifecycle acceptance', (): void => {
|
||||
plan: {
|
||||
generation: 7,
|
||||
holder: 'owned',
|
||||
broker: { unitInstalled: false, socketPresent: false },
|
||||
agents: [
|
||||
{
|
||||
name: 'coder0',
|
||||
|
||||
@@ -92,6 +92,112 @@ async function run(command: FleetReconcileCommand, overrides: Partial<FleetRecon
|
||||
}
|
||||
|
||||
describe('fleet roster-owned reconciler', (): void => {
|
||||
// ── #1292: broker as first-class plan member + broker-first start ordering ──
|
||||
|
||||
it('reports broker unit and socket state in the plan (socket is the signal, not unit state)', async (): Promise<void> => {
|
||||
const result = await run('status', {
|
||||
statPath: async () => true,
|
||||
checkBrokerSocket: async () => true,
|
||||
});
|
||||
expect(result.plan.broker).toEqual({ unitInstalled: true, socketPresent: true });
|
||||
});
|
||||
|
||||
it('reports a dead broker as socketPresent=false even when the unit is installed (enabled-but-dead is the #1292 shape)', async (): Promise<void> => {
|
||||
const result = await run('status', {
|
||||
statPath: async () => true,
|
||||
checkBrokerSocket: async () => false,
|
||||
});
|
||||
expect(result.plan.broker).toEqual({ unitInstalled: true, socketPresent: false });
|
||||
});
|
||||
|
||||
it('reports broker-absent when neither seam is present (defaults false, never guesses healthy)', async (): Promise<void> => {
|
||||
const result = await run('status');
|
||||
expect(result.plan.broker).toEqual({ unitInstalled: false, socketPresent: false });
|
||||
});
|
||||
|
||||
it('command start enables and starts the broker BEFORE the holder and any agent unit', async (): Promise<void> => {
|
||||
const calls: string[][] = [];
|
||||
const result = await run('start', {
|
||||
runner: async (command, args) => {
|
||||
calls.push([command, ...args]);
|
||||
if (command === 'tmux' && args.includes('list-sessions')) {
|
||||
return { stdout: '_holder\ncoder0\n', stderr: '', exitCode: 0 };
|
||||
}
|
||||
if (command === 'tmux' && args.includes('show-environment')) {
|
||||
return {
|
||||
stdout:
|
||||
'HOME=/home/mosaic\nMOSAIC_FLEET_OWNER=11111111-1111-4111-8111-111111111111\nMOSAIC_TMUX_HOLDER=_holder\nMOSAIC_TMUX_SOCKET=mosaic-fleet\nPATH=/usr/bin:/bin\nPWD=/home/mosaic\n',
|
||||
stderr: '',
|
||||
exitCode: 0,
|
||||
};
|
||||
}
|
||||
return { stdout: '', stderr: '', exitCode: 0 };
|
||||
},
|
||||
});
|
||||
expect(result.lifecycle).toBe('complete');
|
||||
const brokerEnable = calls.findIndex(
|
||||
(c) => c.join(' ') === 'systemctl --user enable mosaic-lease-broker.service',
|
||||
);
|
||||
const brokerStart = calls.findIndex(
|
||||
(c) => c.join(' ') === 'systemctl --user start mosaic-lease-broker.service',
|
||||
);
|
||||
const holderStart = calls.findIndex(
|
||||
(c) => c.join(' ') === 'systemctl --user start mosaic-tmux-holder.service',
|
||||
);
|
||||
const agentStart = calls.findIndex(
|
||||
(c) => c.join(' ') === 'systemctl --user start [email protected]',
|
||||
);
|
||||
expect(brokerEnable).toBeGreaterThanOrEqual(0);
|
||||
expect(brokerStart).toBeGreaterThan(brokerEnable);
|
||||
// Holder start may be absent (holder 'owned' in this fixture); if present it must follow the broker.
|
||||
if (holderStart >= 0) expect(holderStart).toBeGreaterThan(brokerStart);
|
||||
expect(agentStart).toBeGreaterThan(brokerStart);
|
||||
});
|
||||
|
||||
it('apply with a running desired agent also enables and starts the broker first', async (): Promise<void> => {
|
||||
const calls: string[][] = [];
|
||||
const runningRoster: FleetRosterV2 = {
|
||||
...roster,
|
||||
agents: roster.agents.map((agent) =>
|
||||
agent.name === 'coder0'
|
||||
? { ...agent, lifecycle: { enabled: true, desiredState: 'running' as const } }
|
||||
: agent,
|
||||
),
|
||||
};
|
||||
const result = await executeFleetReconcile({
|
||||
roster: runningRoster,
|
||||
command: 'apply',
|
||||
expectedGeneration: 7,
|
||||
deps: deps({
|
||||
readRoster: async () => runningRoster,
|
||||
runner: async (command, args) => {
|
||||
calls.push([command, ...args]);
|
||||
if (command === 'tmux' && args.includes('list-sessions')) {
|
||||
return { stdout: '_holder\n', stderr: '', exitCode: 0 };
|
||||
}
|
||||
if (command === 'tmux' && args.includes('show-environment')) {
|
||||
return {
|
||||
stdout:
|
||||
'HOME=/home/mosaic\nMOSAIC_FLEET_OWNER=11111111-1111-4111-8111-111111111111\nMOSAIC_TMUX_HOLDER=_holder\nMOSAIC_TMUX_SOCKET=mosaic-fleet\nPATH=/usr/bin:/bin\nPWD=/home/mosaic\n',
|
||||
stderr: '',
|
||||
exitCode: 0,
|
||||
};
|
||||
}
|
||||
return { stdout: '', stderr: '', exitCode: 0 };
|
||||
},
|
||||
}),
|
||||
});
|
||||
expect(result.applied).toBe(true);
|
||||
const brokerStart = calls.findIndex(
|
||||
(c) => c.join(' ') === 'systemctl --user start mosaic-lease-broker.service',
|
||||
);
|
||||
const agentStart = calls.findIndex(
|
||||
(c) => c.join(' ') === 'systemctl --user start [email protected]',
|
||||
);
|
||||
expect(brokerStart).toBeGreaterThanOrEqual(0);
|
||||
expect(agentStart).toBeGreaterThan(brokerStart);
|
||||
});
|
||||
|
||||
it('fails closed on a symlinked fleet ancestor without touching its target', async (): Promise<void> => {
|
||||
const home = await lockHome();
|
||||
const fleet = join(home, 'fleet');
|
||||
|
||||
@@ -43,6 +43,10 @@ export interface FleetReconcileDeps {
|
||||
readonly overrideDir?: string;
|
||||
readonly homeDirectory?: string;
|
||||
readonly readHolderIdentity?: () => Promise<string>;
|
||||
/** Test/observation seams for the lease-broker plan member (#1292). */
|
||||
readonly statPath?: (path: string) => Promise<boolean> | boolean;
|
||||
readonly checkBrokerSocket?: (path: string) => Promise<boolean> | boolean;
|
||||
readonly brokerSocketEnv?: NodeJS.ProcessEnv;
|
||||
readonly validateRoster?: (roster: FleetRosterV2) => Promise<void>;
|
||||
readonly prepareProjections?: (roster: FleetRosterV2) => Promise<readonly unknown[]>;
|
||||
readonly applyProjection?: (prepared: unknown) => Promise<unknown>;
|
||||
@@ -74,6 +78,17 @@ export interface FleetReconcileObservedAgent {
|
||||
export interface FleetReconcilePlan {
|
||||
readonly generation: number;
|
||||
readonly holder: 'owned' | 'missing' | 'ownership-mismatch';
|
||||
/**
|
||||
* Lease broker observation (#1292): every gated runtime registers with the
|
||||
* broker or dies ~4s in — a broker not in the plan cannot be reported as
|
||||
* drifted, which made "broker died an hour ago" and "broker fine"
|
||||
* produce identical output. `unitInstalled` = unit file present in the
|
||||
* active dir; `socketPresent` = live broker at the resolved socket path.
|
||||
*/
|
||||
readonly broker: {
|
||||
readonly unitInstalled: boolean;
|
||||
readonly socketPresent: boolean;
|
||||
};
|
||||
readonly agents: readonly FleetReconcileObservedAgent[];
|
||||
readonly unmanagedSessions: readonly string[];
|
||||
}
|
||||
@@ -314,6 +329,39 @@ function isObservational(command: FleetReconcileCommand): boolean {
|
||||
return command === 'plan' || command === 'status' || command === 'verify' || command === 'doctor';
|
||||
}
|
||||
|
||||
/**
|
||||
* Observe the lease broker for the plan (#1292). Unit presence via systemctl
|
||||
* is-system-running is NOT the signal — a unit can be enabled-but-dead. The
|
||||
* authoritative signal is the socket the gated runtimes connect to, matching
|
||||
* broker-supervisor.ts's `checkBrokerSupervisorHealth` (healthy ===
|
||||
* socketPresent). Injectable so tests drive every branch without a broker.
|
||||
*/
|
||||
async function observeBroker(deps: FleetReconcileDeps): Promise<FleetReconcilePlan['broker']> {
|
||||
const homeDirectory = deps.homeDirectory ?? homedir();
|
||||
const env = (deps.brokerSocketEnv ?? process.env) as NodeJS.ProcessEnv;
|
||||
const uid = typeof process.getuid === 'function' ? process.getuid() : 0;
|
||||
const runtimeDir = env['XDG_RUNTIME_DIR'] ?? `/run/user/${uid}`;
|
||||
const socketPath =
|
||||
env['MOSAIC_LEASE_BROKER_SOCKET'] ?? join(runtimeDir, 'mosaic-lease', 'broker.sock');
|
||||
const configHome = env['XDG_CONFIG_HOME'] ?? join(homeDirectory, '.config');
|
||||
const unitPath = join(configHome, 'systemd', 'user', 'mosaic-lease-broker.service');
|
||||
const statPath = deps.statPath;
|
||||
const checkBrokerSocket = deps.checkBrokerSocket;
|
||||
let unitInstalled = false;
|
||||
let socketPresent = false;
|
||||
try {
|
||||
unitInstalled = statPath ? await statPath(unitPath) : false;
|
||||
} catch {
|
||||
unitInstalled = false;
|
||||
}
|
||||
try {
|
||||
socketPresent = checkBrokerSocket ? await checkBrokerSocket(socketPath) : false;
|
||||
} catch {
|
||||
socketPresent = false;
|
||||
}
|
||||
return { unitInstalled, socketPresent };
|
||||
}
|
||||
|
||||
async function observeFleet(
|
||||
roster: FleetRosterV2,
|
||||
deps: FleetReconcileDeps,
|
||||
@@ -324,10 +372,12 @@ async function observeFleet(
|
||||
'-F',
|
||||
'#{session_name}',
|
||||
]);
|
||||
const broker = await observeBroker(deps);
|
||||
if (sessionsResult.exitCode !== 0) {
|
||||
return {
|
||||
generation: roster.generation,
|
||||
holder: 'missing',
|
||||
broker,
|
||||
agents: await observeAgents(roster, deps, new Set<string>()),
|
||||
unmanagedSessions: [],
|
||||
};
|
||||
@@ -350,6 +400,7 @@ async function observeFleet(
|
||||
return {
|
||||
generation: roster.generation,
|
||||
holder,
|
||||
broker,
|
||||
agents: await observeAgents(roster, deps, sessions),
|
||||
unmanagedSessions: Object.freeze(unmanagedSessions.sort()),
|
||||
};
|
||||
@@ -517,6 +568,24 @@ async function executeExplicitLifecycle(
|
||||
}
|
||||
}
|
||||
try {
|
||||
// Broker FIRST (#1292): a gated runtime started without a running lease
|
||||
// broker dies ~4 seconds in at registration — enable the unit (install
|
||||
// places it) and start it before any holder/agent lifecycle effect. The
|
||||
// socket re-check after start is the same probe observeBroker uses, so a
|
||||
// unit that starts but never produces a socket is caught here, not four
|
||||
// seconds later inside a doomed seat.
|
||||
if (request.command === 'start') {
|
||||
await runChecked(request.deps, 'systemctl', [
|
||||
'--user',
|
||||
'enable',
|
||||
'mosaic-lease-broker.service',
|
||||
]);
|
||||
await runChecked(request.deps, 'systemctl', [
|
||||
'--user',
|
||||
'start',
|
||||
'mosaic-lease-broker.service',
|
||||
]);
|
||||
}
|
||||
if (request.command === 'start' && plan.holder === 'missing') {
|
||||
await runChecked(request.deps, 'systemctl', [
|
||||
'--user',
|
||||
@@ -562,6 +631,12 @@ async function applyDesiredLifecycle(
|
||||
(agent: FleetRosterV2Agent): boolean =>
|
||||
agent.lifecycle.enabled && agent.lifecycle.desiredState === 'running',
|
||||
);
|
||||
// Broker before any running agent, same ordering and reason as the
|
||||
// command-driven path above (#1292).
|
||||
if (needsRunningAgent) {
|
||||
await runChecked(deps, 'systemctl', ['--user', 'enable', 'mosaic-lease-broker.service']);
|
||||
await runChecked(deps, 'systemctl', ['--user', 'start', 'mosaic-lease-broker.service']);
|
||||
}
|
||||
if (needsRunningAgent && plan.holder === 'missing') {
|
||||
await runChecked(deps, 'systemctl', ['--user', 'start', 'mosaic-tmux-holder.service']);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user