feat(o3): implement Invocation-Aware Scoped Guard for orchestrator role scoping (100% PASS)

2026-08-07 10:09:14 +09:00
parent 5ab76874e4
commit 1f8622e077
13 changed files with 428 additions and 20 deletions
@@ -19,7 +19,10 @@
 #   4  = agent-sessions.yaml append failure
 set -euo pipefail

-source "$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)/lib.sh"
+_script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+_lib_sh="$(cd "$_script_dir/../.." 2>/dev/null || pwd)/lib.sh"
+[ -f "$_lib_sh" ] || _lib_sh="${WORKSPACE_ROOT:-$PWD}/.agents/skills/lib.sh"
+source "$_lib_sh"

 usage() {
  cat <<EOF
@@ -18,6 +18,7 @@ metadata:

 > **Companion skills**: `multi-agent-mux-create` (start), `multi-agent-mux-resume` (re-attach), `multi-agent-mux-delegate-job` (delegate).
 > **Safety Guard**: `--max-loop`, `--max-rebut`, and `--plan-talk` restrict API cost runaways.
+> **Scope Guard (O-3)**: Intercepts direct orchestrator mutations when `/multi-agent-mux-loop` is active. See [.agents/MULTI_AGENT_RULES.md #3.2](.agents/MULTI_AGENT_RULES.md#32-invocation-aware-scoped-guard-o-3).
 > **Single source of truth**: `./.mam/agent-sessions.yaml`.

 수동 템플릿 작성 및 수동 프롬프트 환류는 폐지되었습니다. Planner, Creator, Reviewer 간의 모든 협업 피드백 루프는 본 스킬(`run_loop.sh`)만을 단독으로 사용하여 자동으로 오케스트레이션합니다.
@@ -79,6 +79,15 @@ if [ -z "$TARGET_AGENT" ] || [ -z "$TASK" ]; then
  echo "ERROR: --target-agent and --task are mandatory fields."
  usage
 fi
+
+MAM_LOOP_MARKER="$REPO_ROOT/.mam/loop-guard-active"
+mkdir -p "$(dirname "$MAM_LOOP_MARKER")"
+_mam_lstart() { ps -p "$1" -o lstart= 2>/dev/null | tr -s ' ' | sed 's/^ *//;s/ *$//'; }
+printf 'pid=%s\nlstart=%s\nstarted=%s\n' \
+  "$$" "$(_mam_lstart $$)" "$(date -u +%Y-%m-%dT%H:%M:%SZ)" > "$MAM_LOOP_MARKER"
+_mam_release_guard() { rm -f "$MAM_LOOP_MARKER"; }
+trap _mam_release_guard EXIT INT TERM HUP
+
 delegate_job_safe() {
  local orig_script="$REPO_ROOT/.agents/skills/multi-agent-mux-delegate-job/multi-agent-mux-delegate-job"
  local tmp_script
@@ -88,7 +97,7 @@ delegate_job_safe() {
  local rc=0
  bash "$tmp_script" "$@" || rc=$?
  rm -f "$tmp_script"
-  trap - EXIT INT TERM HUP
+  trap _mam_release_guard EXIT INT TERM HUP
  return $rc
 }

@@ -15,8 +15,10 @@
 # Exit codes: 0 = ok | 1 = YAML not found | 2 = error
 set -euo pipefail

-SKILLS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SKILLS_DIR="$(cd "$SCRIPT_DIR/../.." 2>/dev/null || pwd)"
 LIB_SH="$SKILLS_DIR/lib.sh"
+[ -f "$LIB_SH" ] || LIB_SH="${WORKSPACE_ROOT:-$PWD}/.agents/skills/lib.sh"
 source "$LIB_SH"
 if [ -n "${AGENT_SESSIONS_STATE_DIR:-}" ]; then
  echo "Notice: AGENT_SESSIONS_STATE_DIR is set but has no effect; the monitor keeps no state directory (C-2)." >&2
@@ -2,7 +2,10 @@
 # resume_session.sh — resume a stopped session
 set -euo pipefail

-source "$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)/lib.sh"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+LIB_SH="$(cd "$SCRIPT_DIR/../.." 2>/dev/null || pwd)/lib.sh"
+[ -f "$LIB_SH" ] || LIB_SH="${WORKSPACE_ROOT:-$PWD}/.agents/skills/lib.sh"
+source "$LIB_SH"

 usage() {
  cat <<EOF
@@ -31,7 +31,10 @@
 set -euo pipefail

 # shellcheck disable=SC1091
-source "$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)/lib.sh"
+_script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+_lib_sh="$(cd "$_script_dir/../.." 2>/dev/null || pwd)/lib.sh"
+[ -f "$_lib_sh" ] || _lib_sh="${WORKSPACE_ROOT:-$PWD}/.agents/skills/lib.sh"
+source "$_lib_sh"

 usage() {
  cat <<EOF