Compare commits
1 Commits
fix/fleet-
...
release/mo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ee29d0610a |
7
.gitignore
vendored
7
.gitignore
vendored
@@ -15,10 +15,3 @@ infra/step-ca/dev-password
|
|||||||
|
|
||||||
# Scratch dirs created by the framework git-wrapper shell test harnesses
|
# Scratch dirs created by the framework git-wrapper shell test harnesses
|
||||||
.mosaic-test-work/
|
.mosaic-test-work/
|
||||||
|
|
||||||
# Transient config files vite/vitest/esbuild write next to a *.config.ts while
|
|
||||||
# loading it, then unlink. They are untracked but were not ignored, so turbo's
|
|
||||||
# package traversal hashed them and intermittently failed CI with "Package
|
|
||||||
# traversal error: ... .timestamp-*.mjs: No such file or directory" when the
|
|
||||||
# file vanished mid-scan. Ignoring them removes the race.
|
|
||||||
*.timestamp-*.mjs
|
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ export default tseslint.config(
|
|||||||
'apps/web/e2e/helpers/*.ts',
|
'apps/web/e2e/helpers/*.ts',
|
||||||
'apps/web/playwright.config.ts',
|
'apps/web/playwright.config.ts',
|
||||||
'apps/gateway/vitest.config.ts',
|
'apps/gateway/vitest.config.ts',
|
||||||
'packages/db/vitest.config.ts',
|
|
||||||
'packages/storage/vitest.config.ts',
|
'packages/storage/vitest.config.ts',
|
||||||
'packages/mosaic/__tests__/*.ts',
|
'packages/mosaic/__tests__/*.ts',
|
||||||
'tools/federation-harness/*.ts',
|
'tools/federation-harness/*.ts',
|
||||||
|
|||||||
@@ -4,22 +4,5 @@ export default defineConfig({
|
|||||||
test: {
|
test: {
|
||||||
globals: true,
|
globals: true,
|
||||||
environment: 'node',
|
environment: 'node',
|
||||||
// The migration suite spins up a real PGlite (WASM Postgres) instance per
|
|
||||||
// test and applies the full drizzle migration set. Each case legitimately
|
|
||||||
// takes ~5s locally and considerably longer on CI, where turbo runs many
|
|
||||||
// packages' test suites concurrently. The 5s vitest default then expires
|
|
||||||
// mid-migration and the run fails as a phantom "Test timed out in 5000ms"
|
|
||||||
// (often surfacing the underlying WASM `memory access out of bounds` when
|
|
||||||
// the heap is starved). Give migrations real headroom.
|
|
||||||
testTimeout: 120_000,
|
|
||||||
hookTimeout: 120_000,
|
|
||||||
// Each PGlite instance carries a multi-hundred-MB WASM heap. Running test
|
|
||||||
// files in parallel forks multiplies that peak and is what tips the CI
|
|
||||||
// runner into the WASM OOM. A single fork keeps only one instance resident
|
|
||||||
// at a time — slightly slower, but deterministic.
|
|
||||||
pool: 'forks',
|
|
||||||
poolOptions: {
|
|
||||||
forks: { singleFork: true },
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -122,85 +122,6 @@ fi
|
|||||||
|
|
||||||
mkdir -p "$MOSAIC_AGENT_WORKDIR"
|
mkdir -p "$MOSAIC_AGENT_WORKDIR"
|
||||||
|
|
||||||
# ── Pre-trust the workdir for the Claude runtime ─────────────────────────────
|
|
||||||
# Claude Code shows a one-time "Is this a project you trust?" folder-trust gate
|
|
||||||
# the first time it opens a directory. A fleet-launched agent has no human to
|
|
||||||
# answer it, so the pane stalls forever at the prompt while its heartbeat keeps
|
|
||||||
# reporting "healthy" (the pane process IS alive — it's just blocked).
|
|
||||||
#
|
|
||||||
# IMPORTANT: --dangerously-skip-permissions does NOT bypass this gate, and
|
|
||||||
# neither does `trustedProjectDirectories` in settings.json (verified empirically
|
|
||||||
# 2026-06-24). The ONLY thing the gate honors is the per-project record in
|
|
||||||
# ~/.claude.json: projects["<dir>"].hasTrustDialogAccepted == true (exactly what
|
|
||||||
# answering the prompt writes). So we pre-seed that record here.
|
|
||||||
#
|
|
||||||
# Idempotent, atomic, best-effort: any failure is non-fatal (the agent still
|
|
||||||
# launches — worst case it stalls on the gate, i.e. the pre-fix status quo).
|
|
||||||
# Only the claude runtime needs this; codex/pi have no such gate.
|
|
||||||
_ensure_claude_workdir_trusted() {
|
|
||||||
local workdir="$1"
|
|
||||||
# The path claude keys on is the resolved cwd it is launched in.
|
|
||||||
local rp
|
|
||||||
rp=$(cd "$workdir" 2>/dev/null && pwd -P) || rp="$workdir"
|
|
||||||
# ~/.claude.json lives next to the claude config dir; honor CLAUDE_CONFIG_DIR.
|
|
||||||
local claude_json="${MOSAIC_CLAUDE_JSON:-${CLAUDE_CONFIG_DIR:+$CLAUDE_CONFIG_DIR/.claude.json}}"
|
|
||||||
claude_json="${claude_json:-$HOME/.claude.json}"
|
|
||||||
|
|
||||||
if ! command -v python3 >/dev/null 2>&1; then
|
|
||||||
echo "WARNING: python3 not found; cannot pre-trust '$rp' for claude (agent may stall on the folder-trust gate)" >&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Serialize concurrent agent launches that share ~/.claude.json (flock if available).
|
|
||||||
local lock="${claude_json}.mosaic-lock"
|
|
||||||
_seed() {
|
|
||||||
MOSAIC_CJ="$claude_json" MOSAIC_TRUST_DIR="$rp" python3 - <<'PY'
|
|
||||||
import json, os, sys, tempfile
|
|
||||||
cj = os.environ["MOSAIC_CJ"]
|
|
||||||
d = os.environ["MOSAIC_TRUST_DIR"]
|
|
||||||
try:
|
|
||||||
data = json.load(open(cj)) if os.path.exists(cj) else {}
|
|
||||||
if not isinstance(data, dict):
|
|
||||||
data = {}
|
|
||||||
except Exception:
|
|
||||||
# Never corrupt an unreadable/partial file — bail without writing.
|
|
||||||
sys.exit(2)
|
|
||||||
projects = data.setdefault("projects", {})
|
|
||||||
entry = projects.get(d)
|
|
||||||
if not isinstance(entry, dict):
|
|
||||||
entry = {}
|
|
||||||
projects[d] = entry
|
|
||||||
if entry.get("hasTrustDialogAccepted") is True:
|
|
||||||
sys.exit(0) # already trusted — nothing to do
|
|
||||||
entry["hasTrustDialogAccepted"] = True
|
|
||||||
tmp_dir = os.path.dirname(cj) or "."
|
|
||||||
fd, tmp = tempfile.mkstemp(dir=tmp_dir, prefix=".claude.json.mosaic.")
|
|
||||||
try:
|
|
||||||
with os.fdopen(fd, "w") as f:
|
|
||||||
json.dump(data, f, indent=2)
|
|
||||||
os.replace(tmp, cj) # atomic
|
|
||||||
except Exception:
|
|
||||||
try:
|
|
||||||
os.unlink(tmp)
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
sys.exit(3)
|
|
||||||
PY
|
|
||||||
}
|
|
||||||
if command -v flock >/dev/null 2>&1; then
|
|
||||||
( flock 9; _seed ) 9>"$lock" 2>/dev/null || _seed
|
|
||||||
else
|
|
||||||
_seed
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
case "$MOSAIC_AGENT_RUNTIME" in
|
|
||||||
claude)
|
|
||||||
_ensure_claude_workdir_trusted "$MOSAIC_AGENT_WORKDIR" \
|
|
||||||
|| echo "WARNING: could not pre-trust workdir for claude agent $AGENT_NAME" >&2
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# ── Launch the tmux session (no exec — we continue to wire the heartbeat) ────
|
# ── Launch the tmux session (no exec — we continue to wire the heartbeat) ────
|
||||||
_tmux new-session -d -s "$AGENT_NAME" -c "$MOSAIC_AGENT_WORKDIR" \
|
_tmux new-session -d -s "$AGENT_NAME" -c "$MOSAIC_AGENT_WORKDIR" \
|
||||||
bash -c "$PANE_SHELL_SNIPPET"
|
bash -c "$PANE_SHELL_SNIPPET"
|
||||||
|
|||||||
@@ -128,8 +128,8 @@ PY
|
|||||||
merge_gitea_with_api() {
|
merge_gitea_with_api() {
|
||||||
local host="$1" api_url token basic_auth body_file raw_code payload
|
local host="$1" api_url token basic_auth body_file raw_code payload
|
||||||
api_url="https://${host}/api/v1/repos/${OWNER}/${REPO}/pulls/${PR_NUMBER}/merge"
|
api_url="https://${host}/api/v1/repos/${OWNER}/${REPO}/pulls/${PR_NUMBER}/merge"
|
||||||
mkdir -p "${AGENT_WORK_ROOT:-${HOME:-/tmp}/mosaic/agent-work}"
|
mkdir -p "${AGENT_WORK_ROOT:-/home/hermes/agent-work}"
|
||||||
body_file=$(mktemp "${AGENT_WORK_ROOT:-${HOME:-/tmp}/mosaic/agent-work}/pr-merge-api-response.XXXXXX")
|
body_file=$(mktemp "${AGENT_WORK_ROOT:-/home/hermes/agent-work}/pr-merge-api-response.XXXXXX")
|
||||||
payload='{"Do":"squash"}'
|
payload='{"Do":"squash"}'
|
||||||
|
|
||||||
token=$(get_gitea_token "$host" || true)
|
token=$(get_gitea_token "$host" || true)
|
||||||
@@ -214,8 +214,8 @@ case "$PLATFORM" in
|
|||||||
TEA_LOGIN="$(get_gitea_login_for_host "$HOST" || true)"
|
TEA_LOGIN="$(get_gitea_login_for_host "$HOST" || true)"
|
||||||
|
|
||||||
if [[ -n "$TEA_LOGIN" ]]; then
|
if [[ -n "$TEA_LOGIN" ]]; then
|
||||||
mkdir -p "${AGENT_WORK_ROOT:-${HOME:-/tmp}/mosaic/agent-work}"
|
mkdir -p "${AGENT_WORK_ROOT:-/home/hermes/agent-work}"
|
||||||
TEA_ERROR_FILE=$(mktemp "${AGENT_WORK_ROOT:-${HOME:-/tmp}/mosaic/agent-work}/pr-merge-tea-error.XXXXXX")
|
TEA_ERROR_FILE=$(mktemp "${AGENT_WORK_ROOT:-/home/hermes/agent-work}/pr-merge-tea-error.XXXXXX")
|
||||||
if tea pr merge "$PR_NUMBER" --style squash --repo "$OWNER/$REPO" --login "$TEA_LOGIN" 2> "$TEA_ERROR_FILE"; then
|
if tea pr merge "$PR_NUMBER" --style squash --repo "$OWNER/$REPO" --login "$TEA_LOGIN" 2> "$TEA_ERROR_FILE"; then
|
||||||
rm -f "$TEA_ERROR_FILE"
|
rm -f "$TEA_ERROR_FILE"
|
||||||
elif is_known_tea_empty_identity_failure "$TEA_ERROR_FILE"; then
|
elif is_known_tea_empty_identity_failure "$TEA_ERROR_FILE"; then
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
WORK_ROOT="${AGENT_WORK_ROOT:-${HOME:-/tmp}/mosaic/agent-work}"
|
WORK_ROOT="${AGENT_WORK_ROOT:-/home/hermes/agent-work}"
|
||||||
SANDBOX="$WORK_ROOT/pr-merge-empty-uid-test-$$"
|
SANDBOX="$WORK_ROOT/pr-merge-empty-uid-test-$$"
|
||||||
MOCK_BIN="$SANDBOX/bin"
|
MOCK_BIN="$SANDBOX/bin"
|
||||||
REPO_DIR="$SANDBOX/repo"
|
REPO_DIR="$SANDBOX/repo"
|
||||||
|
|||||||
@@ -12,10 +12,6 @@
|
|||||||
# ambiguity about lanes or origin. Recipients replying should FLIP the
|
# ambiguity about lanes or origin. Recipients replying should FLIP the
|
||||||
# preamble: [<dst> -> <src>] ... (this tool sends; it does not auto-reply).
|
# preamble: [<dst> -> <src>] ... (this tool sends; it does not auto-reply).
|
||||||
#
|
#
|
||||||
# Optionally tags the message with a TRIAGE CLASS (see -C / --class) so a
|
|
||||||
# comms daemon can route it (deliver-to-agent vs log-and-drop) from an exact
|
|
||||||
# field instead of re-deriving intent from the body.
|
|
||||||
#
|
|
||||||
# WHY A WRAPPER
|
# WHY A WRAPPER
|
||||||
# Reliable submission into an interactive REPL (Claude Code / Codex) is fiddly:
|
# Reliable submission into an interactive REPL (Claude Code / Codex) is fiddly:
|
||||||
# a trailing Enter is often swallowed and the message sits as an unsubmitted
|
# a trailing Enter is often swallowed and the message sits as an unsubmitted
|
||||||
@@ -30,7 +26,6 @@
|
|||||||
# agent-send.sh [-L socket] -s <dst_session> -m "message" # local target
|
# agent-send.sh [-L socket] -s <dst_session> -m "message" # local target
|
||||||
# agent-send.sh [-L socket] -H user@host -s <dst_session> -m "message" # remote target
|
# agent-send.sh [-L socket] -H user@host -s <dst_session> -m "message" # remote target
|
||||||
# agent-send.sh [-L socket] -H user@host -n <dst_hostname> -s <sess> -f msg.txt
|
# agent-send.sh [-L socket] -H user@host -n <dst_hostname> -s <sess> -f msg.txt
|
||||||
# agent-send.sh -s mos-claude --class terminal-log -m "ACK — received"
|
|
||||||
# echo "msg" | agent-send.sh [-L socket] -H user@host -s <dst_session>
|
# echo "msg" | agent-send.sh [-L socket] -H user@host -s <dst_session>
|
||||||
#
|
#
|
||||||
# OPTIONS
|
# OPTIONS
|
||||||
@@ -41,61 +36,27 @@
|
|||||||
# Default: local hostname, or (remote) resolved via one ssh.
|
# Default: local hostname, or (remote) resolved via one ssh.
|
||||||
# -m MESSAGE message text (single- or multi-line)
|
# -m MESSAGE message text (single- or multi-line)
|
||||||
# -f FILE read message from FILE instead of -m
|
# -f FILE read message from FILE instead of -m
|
||||||
# -C CLASS triage class for a comms daemon. One of:
|
|
||||||
# terminal-log log-only; never needs the agent's attention
|
|
||||||
# actionable carries a decision/blocker/gate — deliver
|
|
||||||
# human from a human operator — deliver
|
|
||||||
# reaction an emoji/ack reaction
|
|
||||||
# Long form: --class CLASS (or --class=CLASS). When SET, the
|
|
||||||
# preamble carries a ` class=<CLASS>` token INSIDE the bracket:
|
|
||||||
# [<src> -> <dst> class=terminal-log] <message>
|
|
||||||
# When OMITTED, NO token is emitted and the preamble is
|
|
||||||
# byte-for-byte identical to the classic format. Consumers MUST
|
|
||||||
# treat an absent class as 'actionable' (fail-safe: agent sees it).
|
|
||||||
# -S SRC_LABEL override source label "<host>:<session>" (default: auto)
|
# -S SRC_LABEL override source label "<host>:<session>" (default: auto)
|
||||||
# -r N Enter-flush attempts passed through (default 2)
|
# -r N Enter-flush attempts passed through (default 2)
|
||||||
# -v verbose: print pane tail after delivery
|
# -v verbose: print pane tail after delivery
|
||||||
# -h help
|
# -h help
|
||||||
#
|
#
|
||||||
# PREAMBLE GRAMMAR (for consumers / daemons mirroring this producer)
|
|
||||||
# ^\[(\S+) -> (\S+?)(?: class=(terminal-log|actionable|human|reaction))?\] (.*)$
|
|
||||||
# group 1 = src label group 2 = dst host:session
|
|
||||||
# group 3 = class (absent => actionable) group 4 = message body
|
|
||||||
#
|
|
||||||
# EXIT CODES (passed through from send-message.sh)
|
# EXIT CODES (passed through from send-message.sh)
|
||||||
# 0 delivered/queued · 1 target not found · 2 still draft · 3 usage error
|
# 0 delivered/queued · 1 target not found · 2 still draft · 3 usage error
|
||||||
set -uo pipefail
|
set -uo pipefail
|
||||||
|
|
||||||
SELF_DIR=$(cd -- "$(dirname -- "$0")" && pwd)
|
SELF_DIR=$(cd -- "$(dirname -- "$0")" && pwd)
|
||||||
# Sender is overridable via env purely for testing (inject a capture stub). The
|
SENDER="$SELF_DIR/send-message.sh"
|
||||||
# default is the canonical send-message.sh beside this script; production callers
|
|
||||||
# never set AGENT_SEND_SENDER, so behavior is unchanged.
|
|
||||||
SENDER="${AGENT_SEND_SENDER:-$SELF_DIR/send-message.sh}"
|
|
||||||
|
|
||||||
# Translate the long option --class[=value] into "-C value" so getopts (which is
|
|
||||||
# short-option-only) can parse it. Every other argument passes through untouched,
|
|
||||||
# so callers that never use --class hit the exact original getopts path.
|
|
||||||
args=()
|
|
||||||
while [ $# -gt 0 ]; do
|
|
||||||
case "$1" in
|
|
||||||
--class) [ $# -ge 2 ] || { echo "ERROR: --class requires a value" >&2; exit 3; }
|
|
||||||
args+=(-C "$2"); shift 2 ;;
|
|
||||||
--class=*) args+=(-C "${1#*=}"); shift ;;
|
|
||||||
*) args+=("$1"); shift ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
set -- ${args[@]+"${args[@]}"}
|
|
||||||
|
|
||||||
DST_SESSION=""; SSH_TARGET=""; DST_HOST=""; MSG=""; FILE=""; SOCKET_NAME=""
|
DST_SESSION=""; SSH_TARGET=""; DST_HOST=""; MSG=""; FILE=""; SOCKET_NAME=""
|
||||||
SRC_LABEL=""; RETRIES=2; VERBOSE=0; CLASS=""
|
SRC_LABEL=""; RETRIES=2; VERBOSE=0
|
||||||
usage() { sed -n '2,/^set -uo pipefail/{/^set -uo pipefail/d;p}' "$0"; exit "${1:-3}"; }
|
usage() { sed -n '2,44p' "$0"; exit "${1:-3}"; }
|
||||||
|
|
||||||
while getopts "L:s:H:n:m:f:S:r:C:vh" o; do
|
while getopts "L:s:H:n:m:f:S:r:vh" o; do
|
||||||
case "$o" in
|
case "$o" in
|
||||||
L) SOCKET_NAME=$OPTARG ;;
|
L) SOCKET_NAME=$OPTARG ;;
|
||||||
s) DST_SESSION=$OPTARG ;; H) SSH_TARGET=$OPTARG ;; n) DST_HOST=$OPTARG ;;
|
s) DST_SESSION=$OPTARG ;; H) SSH_TARGET=$OPTARG ;; n) DST_HOST=$OPTARG ;;
|
||||||
m) MSG=$OPTARG ;; f) FILE=$OPTARG ;; S) SRC_LABEL=$OPTARG ;;
|
m) MSG=$OPTARG ;; f) FILE=$OPTARG ;; S) SRC_LABEL=$OPTARG ;;
|
||||||
C) CLASS=$OPTARG ;;
|
|
||||||
r) RETRIES=$OPTARG ;; v) VERBOSE=1 ;; h) usage 0 ;; *) usage 3 ;;
|
r) RETRIES=$OPTARG ;; v) VERBOSE=1 ;; h) usage 0 ;; *) usage 3 ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
@@ -103,17 +64,6 @@ done
|
|||||||
[ -n "$DST_SESSION" ] || { echo "ERROR: -s DST_SESSION is required" >&2; usage 3; }
|
[ -n "$DST_SESSION" ] || { echo "ERROR: -s DST_SESSION is required" >&2; usage 3; }
|
||||||
[ -x "$SENDER" ] || { echo "ERROR: send-message.sh not found beside this script" >&2; exit 3; }
|
[ -x "$SENDER" ] || { echo "ERROR: send-message.sh not found beside this script" >&2; exit 3; }
|
||||||
|
|
||||||
# Validate the triage class only when one was given. An absent class emits NO
|
|
||||||
# token (preamble byte-identical to the classic format); the consumer defaults
|
|
||||||
# absent => actionable.
|
|
||||||
CLASS_TOKEN=""
|
|
||||||
if [ -n "$CLASS" ]; then
|
|
||||||
case "$CLASS" in
|
|
||||||
terminal-log|actionable|human|reaction) CLASS_TOKEN=" class=${CLASS}" ;;
|
|
||||||
*) echo "ERROR: invalid --class '$CLASS' (allowed: terminal-log, actionable, human, reaction)" >&2; exit 3 ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Message body from -f / -m / stdin.
|
# Message body from -f / -m / stdin.
|
||||||
if [ -n "$FILE" ]; then [ -r "$FILE" ] || { echo "ERROR: cannot read $FILE" >&2; exit 3; }; MSG=$(cat -- "$FILE")
|
if [ -n "$FILE" ]; then [ -r "$FILE" ] || { echo "ERROR: cannot read $FILE" >&2; exit 3; }; MSG=$(cat -- "$FILE")
|
||||||
elif [ -z "$MSG" ] && [ ! -t 0 ]; then MSG=$(cat)
|
elif [ -z "$MSG" ] && [ ! -t 0 ]; then MSG=$(cat)
|
||||||
@@ -140,7 +90,7 @@ if [ -z "$DST_HOST" ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PREAMBLE="[${SRC_LABEL} -> ${DST_HOST}:${DST_SESSION}${CLASS_TOKEN}]"
|
PREAMBLE="[${SRC_LABEL} -> ${DST_HOST}:${DST_SESSION}]"
|
||||||
FULL="${PREAMBLE} ${MSG}"
|
FULL="${PREAMBLE} ${MSG}"
|
||||||
B64=$(printf '%s' "$FULL" | base64 -w0)
|
B64=$(printf '%s' "$FULL" | base64 -w0)
|
||||||
|
|
||||||
|
|||||||
@@ -1,97 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
# agent-send.test.sh — regression + grammar lock for agent-send.sh --class.
|
|
||||||
#
|
|
||||||
# Strategy: inject a capture stub via AGENT_SEND_SENDER that decodes the -b
|
|
||||||
# base64 payload and prints the FULL message (preamble + body) so we can assert
|
|
||||||
# the exact bytes on the wire. Local path only (no ssh), -n pins the dst host so
|
|
||||||
# the preamble is deterministic across machines.
|
|
||||||
#
|
|
||||||
# Guarantees locked here:
|
|
||||||
# 1. REGRESSION BAR — no --class => preamble byte-for-byte identical to classic.
|
|
||||||
# 2. --class <c> => ` class=<c>` token emitted inside the bracket.
|
|
||||||
# 3. --class=<c> (equals form) parses identically to the space form.
|
|
||||||
# 4. -C <c> short form parses identically.
|
|
||||||
# 5. invalid class => exit 3, nothing sent.
|
|
||||||
# 6. --class with no value => exit 3.
|
|
||||||
# 7. the documented consumer regex parses producer output for every class.
|
|
||||||
set -uo pipefail
|
|
||||||
|
|
||||||
HERE=$(cd -- "$(dirname -- "$0")" && pwd)
|
|
||||||
TOOL="$HERE/agent-send.sh"
|
|
||||||
|
|
||||||
# Capture stub: stands in for send-message.sh. Decodes -b and prints the payload.
|
|
||||||
STUB=$(mktemp)
|
|
||||||
trap 'rm -f "$STUB"' EXIT
|
|
||||||
cat >"$STUB" <<'STUB_EOF'
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -uo pipefail
|
|
||||||
b64=""
|
|
||||||
while getopts "t:b:r:v" o; do case "$o" in b) b64=$OPTARG ;; *) : ;; esac; done
|
|
||||||
printf '%s' "$b64" | base64 -d
|
|
||||||
STUB_EOF
|
|
||||||
chmod +x "$STUB"
|
|
||||||
|
|
||||||
PASS=0; FAIL=0
|
|
||||||
ok() { PASS=$((PASS+1)); printf 'ok %s\n' "$1"; }
|
|
||||||
no() { FAIL=$((FAIL+1)); printf 'FAIL %s\n %s\n' "$1" "$2"; }
|
|
||||||
|
|
||||||
# Run the tool with the stub injected; echoes captured payload on stdout.
|
|
||||||
run() { AGENT_SEND_SENDER="$STUB" bash "$TOOL" -S a:src -n dsthost "$@"; }
|
|
||||||
|
|
||||||
# Documented consumer grammar — the daemon will mirror exactly this.
|
|
||||||
GRAMMAR='^\[(\S+) -> (\S+) class=(terminal-log|actionable|human|reaction)\] (.*)$'
|
|
||||||
GRAMMAR_NOCLASS='^\[(\S+) -> (\S+)\] (.*)$'
|
|
||||||
|
|
||||||
# 1. REGRESSION BAR: classic preamble, byte-for-byte.
|
|
||||||
got=$(run -s mos -m "hello world")
|
|
||||||
want='[a:src -> dsthost:mos] hello world'
|
|
||||||
[ "$got" = "$want" ] && ok "regression: no --class is byte-identical" \
|
|
||||||
|| no "regression: no --class is byte-identical" "got=[$got] want=[$want]"
|
|
||||||
|
|
||||||
# 2. --class space form emits the token.
|
|
||||||
got=$(run -s mos --class terminal-log -m "ACK")
|
|
||||||
want='[a:src -> dsthost:mos class=terminal-log] ACK'
|
|
||||||
[ "$got" = "$want" ] && ok "--class terminal-log emits token" \
|
|
||||||
|| no "--class terminal-log emits token" "got=[$got] want=[$want]"
|
|
||||||
|
|
||||||
# 3. --class=value equals form.
|
|
||||||
got=$(run -s mos --class=actionable -m "decide X")
|
|
||||||
want='[a:src -> dsthost:mos class=actionable] decide X'
|
|
||||||
[ "$got" = "$want" ] && ok "--class=actionable (equals form)" \
|
|
||||||
|| no "--class=actionable (equals form)" "got=[$got] want=[$want]"
|
|
||||||
|
|
||||||
# 4. -C short form.
|
|
||||||
got=$(run -s mos -C human -m "from a person")
|
|
||||||
want='[a:src -> dsthost:mos class=human] from a person'
|
|
||||||
[ "$got" = "$want" ] && ok "-C human (short form)" \
|
|
||||||
|| no "-C human (short form)" "got=[$got] want=[$want]"
|
|
||||||
|
|
||||||
# 5. invalid class => exit 3, no send.
|
|
||||||
if out=$(run -s mos --class bogus -m "x" 2>/dev/null); then
|
|
||||||
no "invalid class rejected" "expected non-zero exit, got 0 (out=[$out])"
|
|
||||||
else
|
|
||||||
rc=$?
|
|
||||||
[ "$rc" = 3 ] && [ -z "$out" ] && ok "invalid class => exit 3, nothing sent" \
|
|
||||||
|| no "invalid class => exit 3, nothing sent" "rc=$rc out=[$out]"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 6. --class with no value => exit 3.
|
|
||||||
if run -s mos -m "x" --class 2>/dev/null; then
|
|
||||||
no "--class with no value rejected" "expected non-zero exit, got 0"
|
|
||||||
else
|
|
||||||
[ "$?" = 3 ] && ok "--class with no value => exit 3" || no "--class with no value => exit 3" "wrong rc"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 7. consumer grammar parses every class + classic line.
|
|
||||||
for c in terminal-log actionable human reaction; do
|
|
||||||
line=$(run -s mos --class "$c" -m "body $c")
|
|
||||||
[[ "$line" =~ $GRAMMAR ]] && [ "${BASH_REMATCH[3]}" = "$c" ] && [ "${BASH_REMATCH[4]}" = "body $c" ] \
|
|
||||||
&& ok "grammar parses class=$c" || no "grammar parses class=$c" "line=[$line]"
|
|
||||||
done
|
|
||||||
classic=$(run -s mos -m "plain body")
|
|
||||||
[[ "$classic" =~ $GRAMMAR_NOCLASS ]] && [ "${BASH_REMATCH[3]}" = "plain body" ] \
|
|
||||||
&& ok "grammar (no-class) parses classic line" || no "grammar (no-class) parses classic line" "line=[$classic]"
|
|
||||||
|
|
||||||
echo "---"
|
|
||||||
echo "PASS=$PASS FAIL=$FAIL"
|
|
||||||
[ "$FAIL" -eq 0 ]
|
|
||||||
@@ -30,7 +30,6 @@ import {
|
|||||||
refreshActiveFleetUnits,
|
refreshActiveFleetUnits,
|
||||||
readRosterAgentNames,
|
readRosterAgentNames,
|
||||||
buildRelaunchCommands,
|
buildRelaunchCommands,
|
||||||
checkFrameworkDrift,
|
|
||||||
FRAMEWORK_RESEED_PACKAGE,
|
FRAMEWORK_RESEED_PACKAGE,
|
||||||
} from './runtime/update-checker.js';
|
} from './runtime/update-checker.js';
|
||||||
import { runWizard } from './wizard.js';
|
import { runWizard } from './wizard.js';
|
||||||
@@ -419,48 +418,6 @@ program
|
|||||||
// checkForAllUpdates imported statically above
|
// checkForAllUpdates imported statically above
|
||||||
const { execSync } = await import('node:child_process');
|
const { execSync } = await import('node:child_process');
|
||||||
|
|
||||||
// Re-seed the framework from the freshly-installed package, propagate shipped
|
|
||||||
// systemd unit fixes to the active units, and (opt-in) relaunch durable
|
|
||||||
// agents. Shared by the "packages updated" and the "framework drift" paths.
|
|
||||||
const reseedFramework = (reason: string): void => {
|
|
||||||
console.log(reason);
|
|
||||||
const reseed = runFrameworkReseed();
|
|
||||||
if (!reseed.ok) {
|
|
||||||
console.error(
|
|
||||||
`\n⚠ Framework re-seed skipped: ${reseed.reason ?? 'unknown'}.\n` +
|
|
||||||
' Activate manually: bash "$(npm root -g)/@mosaicstack/mosaic/framework/install.sh" ' +
|
|
||||||
'(MOSAIC_SYNC_ONLY=1 MOSAIC_INSTALL_MODE=keep)',
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
console.log('✔ Framework re-seeded.');
|
|
||||||
// Propagate shipped systemd unit fixes to the ACTIVE units (re-seed only
|
|
||||||
// touches ~/.config/mosaic/systemd/user; systemd runs ~/.config/systemd/user).
|
|
||||||
const units = refreshActiveFleetUnits();
|
|
||||||
if (units.refreshed.length > 0) {
|
|
||||||
console.log(`✔ Refreshed ${units.refreshed.length} active systemd unit(s).`);
|
|
||||||
}
|
|
||||||
const agents = readRosterAgentNames();
|
|
||||||
if (agents.length === 0) return;
|
|
||||||
if (opts.relaunch) {
|
|
||||||
console.log(`\nRelaunching ${agents.length} fleet agent(s) to pick up the new runtime…`);
|
|
||||||
for (const restart of buildRelaunchCommands(agents)) {
|
|
||||||
try {
|
|
||||||
execSync(restart.join(' '), { stdio: 'inherit', timeout: 30_000 });
|
|
||||||
} catch {
|
|
||||||
console.error(` ⚠ failed to restart agent — run: ${restart.join(' ')}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
console.log('✔ Agents relaunched.');
|
|
||||||
} else {
|
|
||||||
console.log(
|
|
||||||
`\nℹ ${agents.length} fleet agent(s) are still running the previous runtime. ` +
|
|
||||||
'Restart them to activate the update:\n mosaic update --relaunch ' +
|
|
||||||
'(or: mosaic fleet restart <agent>)',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
console.log('Checking for updates…');
|
console.log('Checking for updates…');
|
||||||
const results = checkForAllUpdates({ skipCache: true });
|
const results = checkForAllUpdates({ skipCache: true });
|
||||||
|
|
||||||
@@ -475,18 +432,6 @@ program
|
|||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
console.log('\n✔ All packages up to date.');
|
console.log('\n✔ All packages up to date.');
|
||||||
// #642: the CLI may have been upgraded outside `mosaic update` (e.g. a
|
|
||||||
// direct `npm i -g`), leaving the framework files stale even though no
|
|
||||||
// package is reported outdated. Detect that via the framework version and
|
|
||||||
// re-seed so shipped launcher/runtime fixes still activate.
|
|
||||||
const drift = checkFrameworkDrift();
|
|
||||||
if (drift.drifted && opts.reseed !== false) {
|
|
||||||
reseedFramework(
|
|
||||||
`\nFramework drift detected (on-disk v${drift.installed} < bundled v${drift.bundled}) — ` +
|
|
||||||
'the CLI was updated outside `mosaic update`. Re-seeding framework files into ' +
|
|
||||||
'~/.config/mosaic (data-safe; keeps your edits)…',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -511,17 +456,52 @@ program
|
|||||||
// F3-m3 / R13: the CLI is updated, but the framework files in
|
// F3-m3 / R13: the CLI is updated, but the framework files in
|
||||||
// ~/.config/mosaic/ are still the previous version. Re-seed them from the
|
// ~/.config/mosaic/ are still the previous version. Re-seed them from the
|
||||||
// freshly-installed package so shipped launcher/runtime changes ACTIVATE.
|
// freshly-installed package so shipped launcher/runtime changes ACTIVATE.
|
||||||
// Re-seed when the framework-bearing package itself updated OR the on-disk
|
// Only when the framework-bearing package itself updated.
|
||||||
// framework is older than the freshly-installed one (#642 — e.g. only
|
|
||||||
// sibling packages were outdated but the CLI was already ahead).
|
|
||||||
const mosaicUpdated = outdated.some(
|
const mosaicUpdated = outdated.some(
|
||||||
(r: { package: string }) => r.package === FRAMEWORK_RESEED_PACKAGE,
|
(r: { package: string }) => r.package === FRAMEWORK_RESEED_PACKAGE,
|
||||||
);
|
);
|
||||||
const drift = checkFrameworkDrift();
|
if (mosaicUpdated && opts.reseed !== false) {
|
||||||
if ((mosaicUpdated || drift.drifted) && opts.reseed !== false) {
|
console.log(
|
||||||
reseedFramework(
|
|
||||||
'\nRe-seeding framework files into ~/.config/mosaic (data-safe; keeps your edits)…',
|
'\nRe-seeding framework files into ~/.config/mosaic (data-safe; keeps your edits)…',
|
||||||
);
|
);
|
||||||
|
const reseed = runFrameworkReseed();
|
||||||
|
if (reseed.ok) {
|
||||||
|
console.log('✔ Framework re-seeded.');
|
||||||
|
// Propagate shipped systemd unit fixes to the ACTIVE units (re-seed only
|
||||||
|
// touches ~/.config/mosaic/systemd/user; systemd runs ~/.config/systemd/user).
|
||||||
|
const units = refreshActiveFleetUnits();
|
||||||
|
if (units.refreshed.length > 0) {
|
||||||
|
console.log(`✔ Refreshed ${units.refreshed.length} active systemd unit(s).`);
|
||||||
|
}
|
||||||
|
const agents = readRosterAgentNames();
|
||||||
|
if (agents.length > 0) {
|
||||||
|
if (opts.relaunch) {
|
||||||
|
console.log(
|
||||||
|
`\nRelaunching ${agents.length} fleet agent(s) to pick up the new runtime…`,
|
||||||
|
);
|
||||||
|
for (const restart of buildRelaunchCommands(agents)) {
|
||||||
|
try {
|
||||||
|
execSync(restart.join(' '), { stdio: 'inherit', timeout: 30_000 });
|
||||||
|
} catch {
|
||||||
|
console.error(` ⚠ failed to restart agent — run: ${restart.join(' ')}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
console.log('✔ Agents relaunched.');
|
||||||
|
} else {
|
||||||
|
console.log(
|
||||||
|
`\nℹ ${agents.length} fleet agent(s) are still running the previous runtime. ` +
|
||||||
|
'Restart them to activate the update:\n mosaic update --relaunch ' +
|
||||||
|
'(or: mosaic fleet restart <agent>)',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.error(
|
||||||
|
`\n⚠ Framework re-seed skipped: ${reseed.reason ?? 'unknown'}.\n` +
|
||||||
|
' Activate manually: bash "$(npm root -g)/@mosaicstack/mosaic/framework/install.sh" ' +
|
||||||
|
'(MOSAIC_SYNC_ONLY=1 MOSAIC_INSTALL_MODE=keep)',
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -8,9 +8,6 @@ import {
|
|||||||
readRosterAgentNames,
|
readRosterAgentNames,
|
||||||
runFrameworkReseed,
|
runFrameworkReseed,
|
||||||
refreshActiveFleetUnits,
|
refreshActiveFleetUnits,
|
||||||
readInstalledFrameworkVersion,
|
|
||||||
readBundledFrameworkVersion,
|
|
||||||
checkFrameworkDrift,
|
|
||||||
} from './update-checker.js';
|
} from './update-checker.js';
|
||||||
import { existsSync, readFileSync } from 'node:fs';
|
import { existsSync, readFileSync } from 'node:fs';
|
||||||
|
|
||||||
@@ -126,73 +123,3 @@ describe('refreshActiveFleetUnits', () => {
|
|||||||
expect(existsSync(join(configHome, 'systemd', 'user', 'mosaic-agent@.service'))).toBe(false);
|
expect(existsSync(join(configHome, 'systemd', 'user', 'mosaic-agent@.service'))).toBe(false);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
|
||||||
* #642: re-seed when the on-disk framework is older than the bundled one even
|
|
||||||
* if no package is reported outdated (CLI upgraded outside `mosaic update`).
|
|
||||||
*/
|
|
||||||
describe('framework drift detection', () => {
|
|
||||||
let home: string; // stand-in for ~/.config/mosaic
|
|
||||||
let fw: string; // stand-in for the bundled framework root
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
const root = mkdtempSync(join(tmpdir(), 'mosaic-drift-'));
|
|
||||||
home = join(root, 'mosaic');
|
|
||||||
fw = join(root, 'framework');
|
|
||||||
mkdirSync(home, { recursive: true });
|
|
||||||
mkdirSync(fw, { recursive: true });
|
|
||||||
});
|
|
||||||
afterEach(() => {
|
|
||||||
rmSync(join(home, '..'), { recursive: true, force: true });
|
|
||||||
});
|
|
||||||
|
|
||||||
const writeInstalled = (v: string) => writeFileSync(join(home, '.framework-version'), v);
|
|
||||||
const writeBundled = (v: string) =>
|
|
||||||
writeFileSync(join(fw, 'install.sh'), `#!/usr/bin/env bash\nFRAMEWORK_VERSION=${v}\n`);
|
|
||||||
|
|
||||||
describe('readInstalledFrameworkVersion', () => {
|
|
||||||
it('returns undefined when the version file is absent', () => {
|
|
||||||
expect(readInstalledFrameworkVersion(home)).toBeUndefined();
|
|
||||||
});
|
|
||||||
it('parses the integer (tolerating surrounding whitespace)', () => {
|
|
||||||
writeInstalled(' 3\n');
|
|
||||||
expect(readInstalledFrameworkVersion(home)).toBe(3);
|
|
||||||
});
|
|
||||||
it('returns undefined for non-numeric content', () => {
|
|
||||||
writeInstalled('not-a-number\n');
|
|
||||||
expect(readInstalledFrameworkVersion(home)).toBeUndefined();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('readBundledFrameworkVersion', () => {
|
|
||||||
it('returns undefined when install.sh is absent', () => {
|
|
||||||
expect(readBundledFrameworkVersion(fw)).toBeUndefined();
|
|
||||||
});
|
|
||||||
it('parses FRAMEWORK_VERSION=<n> from install.sh', () => {
|
|
||||||
writeBundled('4');
|
|
||||||
expect(readBundledFrameworkVersion(fw)).toBe(4);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('checkFrameworkDrift', () => {
|
|
||||||
it('reports drift when on-disk is older than bundled', () => {
|
|
||||||
writeInstalled('3');
|
|
||||||
writeBundled('4');
|
|
||||||
expect(checkFrameworkDrift(home, fw)).toEqual({ drifted: true, installed: 3, bundled: 4 });
|
|
||||||
});
|
|
||||||
it('no drift when versions match', () => {
|
|
||||||
writeInstalled('4');
|
|
||||||
writeBundled('4');
|
|
||||||
expect(checkFrameworkDrift(home, fw)).toMatchObject({ drifted: false });
|
|
||||||
});
|
|
||||||
it('no drift when on-disk is newer than bundled', () => {
|
|
||||||
writeInstalled('5');
|
|
||||||
writeBundled('4');
|
|
||||||
expect(checkFrameworkDrift(home, fw)).toMatchObject({ drifted: false });
|
|
||||||
});
|
|
||||||
it('no drift (conservative) when a version cannot be read', () => {
|
|
||||||
writeBundled('4'); // installed version file missing
|
|
||||||
expect(checkFrameworkDrift(home, fw)).toMatchObject({ drifted: false, bundled: 4 });
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -521,75 +521,6 @@ export function runFrameworkReseed(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ─── Framework drift detection (#642) ────────────────────────────────────────
|
|
||||||
//
|
|
||||||
// `mosaic update` only re-seeds the framework when the @mosaicstack/mosaic
|
|
||||||
// package itself is upgraded *within that command*. When the CLI is upgraded
|
|
||||||
// some OTHER way — a direct `npm i -g @mosaicstack/mosaic`, or an upgrade run
|
|
||||||
// where only sibling packages were outdated — the framework files in
|
|
||||||
// ~/.config/mosaic stay stale and shipped launcher/runtime fixes never
|
|
||||||
// activate. Comparing the on-disk framework schema version against the version
|
|
||||||
// bundled in the installed package detects exactly that situation.
|
|
||||||
|
|
||||||
/** Read the framework schema version recorded on disk (~/.config/mosaic/.framework-version). */
|
|
||||||
export function readInstalledFrameworkVersion(
|
|
||||||
mosaicHome = join(homedir(), '.config', 'mosaic'),
|
|
||||||
): number | undefined {
|
|
||||||
const vf = join(mosaicHome, '.framework-version');
|
|
||||||
if (!existsSync(vf)) return undefined;
|
|
||||||
try {
|
|
||||||
const n = parseInt(readFileSync(vf, 'utf-8').trim(), 10);
|
|
||||||
return Number.isFinite(n) ? n : undefined;
|
|
||||||
} catch {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Read the framework schema version shipped in the installed package by parsing
|
|
||||||
* `FRAMEWORK_VERSION=<n>` out of the bundled install.sh (the authoritative
|
|
||||||
* source the installer writes to .framework-version).
|
|
||||||
*/
|
|
||||||
export function readBundledFrameworkVersion(
|
|
||||||
frameworkRoot = resolveBundledFrameworkRoot(),
|
|
||||||
): number | undefined {
|
|
||||||
const installer = join(frameworkRoot, 'install.sh');
|
|
||||||
if (!existsSync(installer)) return undefined;
|
|
||||||
try {
|
|
||||||
const m = readFileSync(installer, 'utf-8').match(/^\s*FRAMEWORK_VERSION=(\d+)/m);
|
|
||||||
const raw = m?.[1];
|
|
||||||
if (!raw) return undefined;
|
|
||||||
const n = parseInt(raw, 10);
|
|
||||||
return Number.isFinite(n) ? n : undefined;
|
|
||||||
} catch {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface FrameworkDrift {
|
|
||||||
/** True only when both versions are known AND the on-disk one is older. */
|
|
||||||
drifted: boolean;
|
|
||||||
installed?: number;
|
|
||||||
bundled?: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Detect whether the on-disk framework is older than the framework bundled in
|
|
||||||
* the installed CLI (#642). Conservative: if either version can't be read the
|
|
||||||
* result is no-drift, so a missing/unreadable version file never triggers an
|
|
||||||
* unexpected re-seed.
|
|
||||||
*/
|
|
||||||
export function checkFrameworkDrift(
|
|
||||||
mosaicHome = join(homedir(), '.config', 'mosaic'),
|
|
||||||
frameworkRoot = resolveBundledFrameworkRoot(),
|
|
||||||
): FrameworkDrift {
|
|
||||||
const installed = readInstalledFrameworkVersion(mosaicHome);
|
|
||||||
const bundled = readBundledFrameworkVersion(frameworkRoot);
|
|
||||||
const drifted =
|
|
||||||
typeof installed === 'number' && typeof bundled === 'number' && installed < bundled;
|
|
||||||
return { drifted, installed, bundled };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Best-effort parse of the fleet roster for agent names (used to relaunch
|
* Best-effort parse of the fleet roster for agent names (used to relaunch
|
||||||
* durable agents after a re-seed). Returns [] when no roster exists.
|
* durable agents after a re-seed). Returns [] when no roster exists.
|
||||||
|
|||||||
Reference in New Issue
Block a user