coder-mos1
b238e0a8b1
CHECKPOINT ONLY — not a deliverable, not reviewed, not complete.
Committed by mos-remediation as TRANSPORT after the authoring seat (coder-mos1) became
unable to act: its context window was exceeded at 102.6%/372k AND its overflow-recovery
path failed ("Turn prefix summarization failed: servers overloaded"). The seat could not
process instructions or commit its own work, leaving 28 modified files durable only on
local disk.
Authorship preserved as coder-mos1 — this is transport, not authorship. The work is the
seat's; committing it is the only way to make it survive the rotation that must follow.
Scope note, unresolved: this diff spans the queue-guard tools (9 files under
framework/tools/git) AND 5 framework guides plus 11 agent templates. RM-03 was scoped to
ci-queue-wait.sh and its tests. Whether the doc/template edits are consequential to the
tri-state change or drive-by was queried and never answered — the seat was bricked before
it could reply. That question stays open and must be resolved before any of this is
reviewed; the wider edits may need splitting out.
Direct instance of D-31: commit-then-rotate works, rotate-without-commit loses everything.
67 lines
2.0 KiB
Bash
67 lines
2.0 KiB
Bash
#!/usr/bin/env bash
|
|
# RM-03: pr-merge must guard the PR head branch, not its main base branch.
|
|
|
|
set -euo pipefail
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
WORK_DIR="${MOSAIC_TEST_WORK_DIR:-$PWD/.mosaic-test-work/pr-merge-queue-branch}"
|
|
FIXTURE_DIR="$WORK_DIR/tools/git"
|
|
CALL_LOG="$WORK_DIR/queue-call.log"
|
|
|
|
rm -rf "$WORK_DIR"
|
|
mkdir -p "$FIXTURE_DIR"
|
|
cp "$SCRIPT_DIR/pr-merge.sh" "$FIXTURE_DIR/pr-merge.sh"
|
|
cp "$SCRIPT_DIR/detect-platform.sh" "$FIXTURE_DIR/detect-platform.sh"
|
|
|
|
cat > "$FIXTURE_DIR/pr-metadata.sh" <<'SH'
|
|
#!/usr/bin/env bash
|
|
printf '%s\n' '{"baseRefName":"main","headRefName":"fix/rm-03-fixture","headRefOid":"0123456789abcdef0123456789abcdef01234567","headRepository":"contributor/widgets-fork"}'
|
|
SH
|
|
|
|
cat > "$FIXTURE_DIR/ci-queue-wait.sh" <<'SH'
|
|
#!/usr/bin/env bash
|
|
printf '%s\n' "$*" > "${MOSAIC_QUEUE_CALL_LOG:?}"
|
|
exit 42
|
|
SH
|
|
chmod +x "$FIXTURE_DIR"/*.sh
|
|
|
|
set +e
|
|
(
|
|
cd "$WORK_DIR"
|
|
export MOSAIC_QUEUE_CALL_LOG="$CALL_LOG"
|
|
"$FIXTURE_DIR/pr-merge.sh" -n 123
|
|
) >/dev/null 2>&1
|
|
rc=$?
|
|
set -e
|
|
|
|
if [[ "$rc" -ne 42 ]]; then
|
|
echo "FAIL: expected queue stub rc=42 to propagate, got $rc" >&2
|
|
exit 1
|
|
fi
|
|
if [[ ! -s "$CALL_LOG" ]]; then
|
|
echo "FAIL: merge wrapper did not invoke the queue guard" >&2
|
|
exit 1
|
|
fi
|
|
if ! grep -q -- '-B fix/rm-03-fixture' "$CALL_LOG"; then
|
|
echo "FAIL: merge queue guard did not receive PR head branch" >&2
|
|
cat "$CALL_LOG" >&2
|
|
exit 1
|
|
fi
|
|
if grep -q -- '-B main' "$CALL_LOG"; then
|
|
echo "FAIL: merge queue guard still received the main base branch" >&2
|
|
cat "$CALL_LOG" >&2
|
|
exit 1
|
|
fi
|
|
if ! grep -q -- '-R contributor/widgets-fork' "$CALL_LOG"; then
|
|
echo "FAIL: merge queue guard did not receive the fork head repository" >&2
|
|
cat "$CALL_LOG" >&2
|
|
exit 1
|
|
fi
|
|
if ! grep -q -- '--sha 0123456789abcdef0123456789abcdef01234567' "$CALL_LOG"; then
|
|
echo "FAIL: merge queue guard did not receive the exact PR head SHA" >&2
|
|
cat "$CALL_LOG" >&2
|
|
exit 1
|
|
fi
|
|
|
|
echo "pr-merge queue branch/repository/SHA regression passed"
|