makdoong2-team 1.3.0

package/scripts/release.sh

@@ -0,0 +1,276 @@
+#!/usr/bin/env bash
+# release.sh - makdoong2-team npm 패키지 릴리스 자동화
+#
+# 사용법:
+#   scripts/release.sh <patch|minor|major> [--yes]
+#
+# 워크플로우:
+#   1. Pre-flight 체크 (git 상태, 브랜치, 원격 동기화)
+#   2. 테스트 실행 (build + smoke + gate policy + install-lib)
+#   3. 버전 bump 미리보기
+#   4. **사용자 승인 게이트 #1** (버전 bump 확인)
+#   5. npm version <bump> 실행 (커밋 + 태그 생성)
+#   6. Publish 미리보기 (npm publish --dry-run)
+#   7. **사용자 승인 게이트 #2** (npm 공개 배포 확인)
+#   8. npm publish → public npm registry (registry.npmjs.org)
+#   9. git push --follow-tags
+#
+# 옵션:
+#   --yes: 모든 확인 프롬프트 자동 승인 (CI 전용, 대화형에서는 사용 금지)
+
+set -euo pipefail
+
+RED=$'\033[0;31m'
+GREEN=$'\033[0;32m'
+YELLOW=$'\033[0;33m'
+BLUE=$'\033[0;34m'
+CYAN=$'\033[0;36m'
+BOLD=$'\033[1m'
+RESET=$'\033[0m'
+
+log()    { printf "%s[release]%s %s\n" "$CYAN" "$RESET" "$*"; }
+info()   { printf "%s[info]%s    %s\n" "$BLUE" "$RESET" "$*"; }
+ok()     { printf "%s[ok]%s      %s\n" "$GREEN" "$RESET" "$*"; }
+warn()   { printf "%s[warn]%s    %s\n" "$YELLOW" "$RESET" "$*"; }
+err()    { printf "%s[error]%s   %s\n" "$RED" "$RESET" "$*" >&2; }
+prompt() { printf "%s[confirm]%s %s" "$BOLD" "$RESET" "$*"; }
+
+# ---------- 인자 파싱 ----------
+BUMP="${1:-}"
+AUTO_YES=false
+
+for arg in "$@"; do
+  case "$arg" in
+    --yes|-y) AUTO_YES=true ;;
+  esac
+done
+
+if [[ ! "$BUMP" =~ ^(patch|minor|major)$ ]]; then
+  err "usage: $0 <patch|minor|major> [--yes]"
+  err "  patch: 0.2.3 → 0.2.4 (버그 수정)"
+  err "  minor: 0.2.3 → 0.3.0 (기능 추가, backward-compatible)"
+  err "  major: 0.2.3 → 1.0.0 (breaking change)"
+  exit 1
+fi
+
+# ---------- 프로젝트 루트 이동 ----------
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+cd "$PROJECT_ROOT"
+
+log "프로젝트 루트: $PROJECT_ROOT"
+log "Bump 유형:    $BUMP"
+
+# ---------- 사용자 확인 헬퍼 ----------
+confirm() {
+  local message="$1"
+  if [ "$AUTO_YES" = true ]; then
+    info "[--yes] 자동 승인: $message"
+    return 0
+  fi
+
+  local reply
+  prompt "$message [y/N]: "
+  read -r reply </dev/tty
+  case "$reply" in
+    [yY]|[yY][eE][sS]) return 0 ;;
+    *) return 1 ;;
+  esac
+}
+
+# ---------- STEP 1: Pre-flight 체크 ----------
+log "=========================================="
+log "STEP 1: Pre-flight 체크"
+log "=========================================="
+
+# working tree clean 확인
+if [ -n "$(git status --porcelain)" ]; then
+  err "작업 디렉토리에 커밋되지 않은 변경사항이 있음:"
+  git status --short
+  err "먼저 변경사항을 커밋하거나 stash 하세요."
+  exit 1
+fi
+ok "Working tree clean"
+
+# 현재 브랜치 확인
+CURRENT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+if [ "$CURRENT_BRANCH" != "master" ] && [ "$CURRENT_BRANCH" != "main" ]; then
+  warn "현재 브랜치가 master/main이 아님: $CURRENT_BRANCH"
+  confirm "이 브랜치에서 릴리스를 진행하시겠습니까?" || {
+    err "사용자가 취소함"
+    exit 1
+  }
+fi
+ok "브랜치: $CURRENT_BRANCH"
+
+# 원격과 동기화 확인
+log "원격 저장소 fetch..."
+git fetch origin --quiet
+UPSTREAM="origin/$CURRENT_BRANCH"
+if git rev-parse --verify "$UPSTREAM" >/dev/null 2>&1; then
+  LOCAL="$(git rev-parse HEAD)"
+  REMOTE="$(git rev-parse "$UPSTREAM")"
+  BASE="$(git merge-base HEAD "$UPSTREAM")"
+
+  if [ "$LOCAL" = "$REMOTE" ]; then
+    ok "원격과 동기화됨"
+  elif [ "$LOCAL" = "$BASE" ]; then
+    err "로컬이 원격보다 뒤처져 있음. 먼저 pull 하세요."
+    exit 1
+  elif [ "$REMOTE" = "$BASE" ]; then
+    info "로컬에 push되지 않은 커밋 있음 (release 후 함께 push됨)"
+    git log --oneline "$UPSTREAM..HEAD"
+  else
+    err "로컬과 원격이 diverge됨. 먼저 정리하세요."
+    exit 1
+  fi
+else
+  warn "원격 브랜치 $UPSTREAM 없음 (새 브랜치)"
+fi
+
+# ---------- STEP 2: 테스트 실행 ----------
+log "=========================================="
+log "STEP 2: 전체 테스트 실행"
+log "=========================================="
+log "npm test 실행 중... (build + smoke + gate policy + install-lib)"
+
+if ! npm test; then
+  err "테스트 실패. 릴리스 중단."
+  exit 1
+fi
+ok "모든 테스트 통과"
+
+# ---------- STEP 3: 버전 bump 미리보기 ----------
+log "=========================================="
+log "STEP 3: 버전 bump 미리보기"
+log "=========================================="
+
+CURRENT_VERSION="$(node -p "require('./package.json').version")"
+# 다음 버전 계산 (npm version --dry-run 대체)
+NEXT_VERSION="$(node -e "
+  const semver = '$CURRENT_VERSION'.split('.').map(Number);
+  const bump = '$BUMP';
+  if (bump === 'patch') semver[2]++;
+  else if (bump === 'minor') { semver[1]++; semver[2] = 0; }
+  else if (bump === 'major') { semver[0]++; semver[1] = 0; semver[2] = 0; }
+  console.log(semver.join('.'));
+")"
+
+info "현재 버전: $CURRENT_VERSION"
+info "다음 버전: $NEXT_VERSION"
+
+# 변경 요약 출력
+log "이번 릴리스에 포함될 커밋:"
+LAST_TAG="$(git describe --tags --abbrev=0 2>/dev/null || echo '')"
+if [ -n "$LAST_TAG" ]; then
+  git log --oneline "${LAST_TAG}..HEAD" | head -20
+else
+  git log --oneline -10
+fi
+
+# ---------- STEP 4: 승인 게이트 #1 - 버전 bump ----------
+log "=========================================="
+log "STEP 4: 버전 bump 승인 (게이트 #1)"
+log "=========================================="
+
+confirm "${BOLD}${YELLOW}버전을 $CURRENT_VERSION → $NEXT_VERSION 로 올리시겠습니까?${RESET}" || {
+  err "사용자가 버전 bump를 거부함. 릴리스 중단."
+  exit 1
+}
+
+# ---------- STEP 5: 버전 bump 실행 ----------
+log "=========================================="
+log "STEP 5: npm version $BUMP 실행"
+log "=========================================="
+
+VERSION_OUTPUT="$(npm version "$BUMP")"
+NEW_TAG="$VERSION_OUTPUT"
+ok "버전 bump 완료: $NEW_TAG"
+ok "커밋 및 태그 생성됨"
+
+# rollback 함수 (publish 실패 시)
+rollback_version() {
+  err "롤백 중..."
+  git tag -d "$NEW_TAG" 2>/dev/null || true
+  git reset --hard HEAD~1
+  warn "버전 bump 커밋 및 태그 롤백 완료. 현재 버전: $CURRENT_VERSION"
+}
+
+# ---------- STEP 6: Publish 미리보기 (dry-run) ----------
+log "=========================================="
+log "STEP 6: Publish 미리보기 (dry-run)"
+log "=========================================="
+
+info "npm publish --dry-run 실행..."
+if ! npm publish --dry-run 2>&1 | tail -40; then
+  err "Dry-run 실패. 롤백 필요."
+  rollback_version
+  exit 1
+fi
+ok "Dry-run 통과 - 패키지 구조 이상 없음"
+
+# 패키지 크기 및 파일 수 표시
+info "패키지 정보:"
+node -e "
+  const pkg = require('./package.json');
+  console.log('  name:    ' + pkg.name);
+  console.log('  version: ' + pkg.version);
+  console.log('  target:  ' + (pkg.publishConfig?.registry || 'default'));
+"
+
+# ---------- STEP 7: 승인 게이트 #2 - npm 공개 배포 ----------
+log "=========================================="
+log "STEP 7: npm 공개 배포 승인 (게이트 #2)"
+log "=========================================="
+
+warn "이제 공개 npm registry (registry.npmjs.org) 에 $NEW_TAG 를 배포합니다."
+warn "공개 배포이므로 누구나 설치할 수 있게 됩니다."
+warn "배포 후에는 동일 버전 재-publish 가 registry에 의해 거부됩니다."
+warn "돌이킬 수 없는 작업이므로 신중히 확인하세요."
+
+confirm "${BOLD}${RED}공개 npm registry에 $NEW_TAG 를 배포하시겠습니까?${RESET}" || {
+  warn "사용자가 배포를 거부함. 버전 bump는 유지됩니다."
+  info "나중에 배포하려면: npm publish && git push origin HEAD --follow-tags"
+  info "취소하려면: git tag -d $NEW_TAG && git reset --hard HEAD~1"
+  exit 0
+}
+
+# ---------- STEP 8: npm publish ----------
+log "=========================================="
+log "STEP 8: npm publish (공개 npm registry 배포)"
+log "=========================================="
+
+if ! npm publish; then
+  err "npm publish 실패. 롤백 필요."
+  err "수동 확인 필요:"
+  err "  - npm 로그인 상태 (npm whoami)"
+  err "  - 동일 버전 중복 배포 여부"
+  err ""
+  err "롤백 여부는 상황에 따라 결정하세요."
+  err "  롤백:   git tag -d $NEW_TAG && git reset --hard HEAD~1"
+  err "  재시도: npm publish"
+  exit 1
+fi
+ok "npm 배포 완료: $NEW_TAG"
+
+# ---------- STEP 9: git push ----------
+log "=========================================="
+log "STEP 9: git push --follow-tags"
+log "=========================================="
+
+if ! git push origin "$CURRENT_BRANCH" --follow-tags; then
+  err "git push 실패. 수동으로 push 하세요:"
+  err "  git push origin $CURRENT_BRANCH --follow-tags"
+  exit 1
+fi
+ok "커밋 및 태그 원격 push 완료"
+
+# ---------- 완료 ----------
+log "=========================================="
+ok "${BOLD}${GREEN}릴리스 완료: $NEW_TAG${RESET}"
+log "=========================================="
+info ""
+info "다음 단계 (사용자 환경 업데이트):"
+info "  npm install -g makdoong2-team@${NEXT_VERSION}"
+info "  makdoong2-team install"
+info ""

package/scripts/rollback-commits.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+# rollback-commits.sh <issue>
+#   6단계 시작점(base_sha)으로 worktree HEAD를 soft reset 하여
+#   이번 단계에서 만든 모든 커밋을 취소한다. working tree와 index의 변경 내용은 보존되므로
+#   동일 변경을 다시 쪼개어 1 commit = 1 change로 재커밋할 수 있다.
+# 사용: rollback-commits.sh <issue>
+set -euo pipefail
+ISSUE="${1:?usage: $0 <issue>}"
+HERE="$(cd "$(dirname "$0")" && pwd)"
+
+WT="$("$HERE/state.sh" get "$ISSUE" '.worktree' 2>/dev/null | tr -d '"')"
+[ -n "$WT" ] && [ -d "$WT" ] || { echo "[rollback] worktree 확인 실패: $WT" >&2; exit 1; }
+
+BASE="$("$HERE/state.sh" get "$ISSUE" '.stages."3_delivery".substages."commit".base_sha' 2>/dev/null | tr -d '"')"
+{ [ -n "$BASE" ] && [ "$BASE" != "null" ] && [ "$BASE" != "__MISSING__" ]; } || {
+  echo "[rollback] base_sha 미기록 — rollback할 기준점이 없다. 3_delivery.commit 단계에서 base_sha를 먼저 기록하라." >&2
+  exit 1
+}
+
+# 안전 확인: BASE가 HEAD의 조상이어야 함 (임의 sha로 reset되지 않게)
+git -C "$WT" merge-base --is-ancestor "$BASE" HEAD 2>/dev/null || {
+  echo "[rollback] base_sha($BASE)가 현재 HEAD의 조상이 아님 — 수동 확인 필요" >&2
+  exit 1
+}
+
+# 커밋만 취소, 변경은 보존 (soft reset)
+N=$(git -C "$WT" rev-list --count "$BASE..HEAD" 2>/dev/null || echo 0)
+git -C "$WT" reset --soft "$BASE"
+echo "[rollback] HEAD를 $BASE 로 soft-reset 완료 (취소된 커밋 $N개, working tree/index 변경은 보존됨)"
+
+# 3_delivery.commit 관련 state 초기화 (base_sha는 보존 — 동일 기준점으로 재커밋)
+"$HERE/state.sh" set "$ISSUE" '.stages."3_delivery".substages."commit".done' 'false' >/dev/null
+"$HERE/state.sh" set "$ISSUE" '.stages."3_delivery".substages."commit".atomic_review' 'null' >/dev/null
+"$HERE/state.sh" set "$ISSUE" '.stages."3_delivery".substages."commit".head_sha' 'null' >/dev/null
+echo "[rollback] 3_delivery.commit state 초기화 완료. commit 단계를 처음부터 다시 진행하라."

package/scripts/smoke-test.mjs

@@ -0,0 +1,194 @@
+// smoke-test.mjs — Node 18+ compatible smoke test for the model-fallback-policy logic.
+// Mirrors src/model-fallback-policy.ts via scripts/model-policy.mjs so we can
+// validate without bun/typescript installed.
+//
+// Run: node scripts/smoke-test.mjs
+// Exits 0 on all-pass, 1 on any failure.
+
+import {
+  DEFAULT_ALLOWED_PRIMARIES,
+  DEFAULT_POLICIES,
+  nextModel,
+  validatePolicies,
+  buildPoliciesFromConfig,
+} from "./model-policy.mjs";
+
+let passed = 0, failed = 0;
+const t = (name, fn) => {
+  try { fn(); console.log(`  ✓ ${name}`); passed++; }
+  catch (e) { console.error(`  ✗ ${name}: ${e.message}`); failed++; }
+};
+const eq = (a, b, msg) => {
+  if (JSON.stringify(a) !== JSON.stringify(b)) {
+    throw new Error(`${msg}\n    expected: ${JSON.stringify(b)}\n    got:      ${JSON.stringify(a)}`);
+  }
+};
+const assertThrows = (fn, matcher, msg) => {
+  let thrown = null;
+  try { fn(); } catch (e) { thrown = e; }
+  if (!thrown) throw new Error(`${msg}: expected throw, got none`);
+  if (matcher && !matcher.test(thrown.message)) {
+    throw new Error(`${msg}: message did not match ${matcher}\n    got: ${thrown.message}`);
+  }
+};
+
+console.log("\n[smoke-test] model-fallback-policy chain logic\n");
+
+// ── Default chain semantics ──
+
+t("makdoong2-team-leader: qwen → haiku on first failure", () => {
+  const r = nextModel({ agent: "makdoong2-team-leader", current: "local/qwen3.6-27b", reason: "rate_limit" });
+  eq(r.exhausted, false, "should not be exhausted");
+  eq(r.next.id, "github-copilot/claude-haiku-4.5", "next should be haiku-4.5");
+});
+
+t("makdoong2-team-leader: haiku → exhausted after second failure", () => {
+  const r = nextModel({ agent: "makdoong2-team-leader", current: "github-copilot/claude-haiku-4.5" });
+  eq(r.exhausted, true, "should be exhausted");
+  eq(r.next, null, "next should be null");
+});
+
+t("makdoong2-planner: qwen → haiku", () => {
+  const r = nextModel({ agent: "makdoong2-planner", current: "local/qwen3.6-27b", reason: "5xx" });
+  eq(r.next.id, "github-copilot/claude-haiku-4.5", "planner fallback should be haiku");
+});
+
+t("makdoong2-engineer: qwen → haiku (lower-tier degrade)", () => {
+  const r = nextModel({ agent: "makdoong2-engineer", current: "local/qwen3.6-27b", reason: "context_exceeded" });
+  eq(r.next.id, "github-copilot/claude-haiku-4.5", "engineer fallback should be haiku");
+});
+
+t("makdoong2-publisher: qwen → haiku", () => {
+  const r = nextModel({ agent: "makdoong2-publisher", current: "local/qwen3.6-27b" });
+  eq(r.next.id, "github-copilot/claude-haiku-4.5", "publisher fallback should be haiku");
+});
+
+t("makdoong2-verifier: qwen → haiku", () => {
+  const r = nextModel({ agent: "makdoong2-verifier", current: "local/qwen3.6-27b" });
+  eq(r.next.id, "github-copilot/claude-haiku-4.5", "verifier fallback should be haiku");
+});
+
+t("unknown agent returns exhausted", () => {
+  const r = nextModel({ agent: "stage99-fictional", current: "any" });
+  eq(r.exhausted, true, "unknown agent should be exhausted");
+});
+
+t("unknown current model starts from primary", () => {
+  const r = nextModel({ agent: "makdoong2-team-leader", current: "anthropic/claude-fictional" });
+  eq(r.next.id, "local/qwen3.6-27b", "unknown current should start at primary");
+});
+
+t("all default primaries are in DEFAULT_ALLOWED_PRIMARIES", () => {
+  for (const [agent, policy] of Object.entries(DEFAULT_POLICIES)) {
+    if (!DEFAULT_ALLOWED_PRIMARIES.has(policy.primary.id)) {
+      throw new Error(`'${agent}' primary '${policy.primary.id}' is not allowed`);
+    }
+  }
+});
+
+t("all fallback tiers are strictly lower than primary tier", () => {
+  validatePolicies(DEFAULT_POLICIES, DEFAULT_ALLOWED_PRIMARIES);
+});
+
+// ── Config-driven overrides ──
+
+t("agents block: primary + fallback override (string form, backward-compat)", () => {
+  const { policies } = buildPoliciesFromConfig({
+    agents: {
+      "makdoong2-engineer": {
+        model: "github-copilot/claude-sonnet-4.6",
+        fallback_models: ["github-copilot/claude-haiku-4.5"],
+      },
+    },
+  });
+  eq(policies["makdoong2-engineer"].primary.id, "github-copilot/claude-sonnet-4.6", "primary updated");
+  eq(policies["makdoong2-engineer"].fallbacks.map(f => f.id), ["github-copilot/claude-haiku-4.5"], "fallbacks set");
+  eq(policies["makdoong2-engineer"].fallbacks[0].tier, "low", "string-form fallback defaults to tier=low");
+});
+
+t("agents block: fallback object form {id, tier} accepted", () => {
+  const { policies } = buildPoliciesFromConfig({
+    agents: {
+      "makdoong2-planner": {
+        model: "github-copilot/claude-sonnet-4.6",
+        fallback_models: [{ id: "github-copilot/claude-haiku-4.5", tier: "low" }],
+      },
+    },
+  });
+  eq(policies["makdoong2-planner"].fallbacks[0], { id: "github-copilot/claude-haiku-4.5", tier: "low" }, "object-form preserved");
+});
+
+t("model_policy.allowed_primaries: extends default allow-list", () => {
+  const { policies, allowed } = buildPoliciesFromConfig({
+    model_policy: { allowed_primaries: ["custom-provider/custom-model"] },
+    agents: {
+      "makdoong2-engineer": {
+        model: "custom-provider/custom-model",
+        fallback_models: ["github-copilot/claude-haiku-4.5"],
+      },
+    },
+  });
+  eq(allowed.has("custom-provider/custom-model"), true, "extra primary allowed");
+  eq(allowed.has("local/qwen3.6-27b"), true, "built-in defaults preserved");
+  eq(policies["makdoong2-engineer"].primary.id, "custom-provider/custom-model", "custom primary set");
+});
+
+t("validation rejects primary outside allow-list (no model_policy extension)", () => {
+  assertThrows(
+    () => buildPoliciesFromConfig({
+      agents: { "makdoong2-engineer": { model: "rogue-provider/rogue-model" } },
+    }),
+    /violates policy/,
+    "should reject unlisted primary",
+  );
+});
+
+t("validation rejects fallback tier >= primary tier", () => {
+  assertThrows(
+    () => buildPoliciesFromConfig({
+      agents: {
+        "makdoong2-engineer": {
+          model: "local/qwen3.6-27b",
+          fallback_models: [{ id: "github-copilot/claude-haiku-4.5", tier: "medium" }],
+        },
+      },
+    }),
+    /not strictly lower/,
+    "fallback at primary tier must be rejected",
+  );
+});
+
+t("validation rejects invalid tier label", () => {
+  assertThrows(
+    () => buildPoliciesFromConfig({
+      agents: {
+        "makdoong2-engineer": {
+          model: "local/qwen3.6-27b",
+          fallback_models: [{ id: "github-copilot/claude-haiku-4.5", tier: "ultra" }],
+        },
+      },
+    }),
+    /not a valid tier/,
+    "unknown tier must be rejected",
+  );
+});
+
+t("build is pure: invalid config throws but does not mutate DEFAULT_POLICIES", () => {
+  const before = JSON.stringify(DEFAULT_POLICIES);
+  try {
+    buildPoliciesFromConfig({
+      agents: { "makdoong2-engineer": { model: "rogue-provider/rogue-model" } },
+    });
+  } catch { /* expected */ }
+  const after = JSON.stringify(DEFAULT_POLICIES);
+  eq(after, before, "DEFAULT_POLICIES must remain untouched after a failed override");
+});
+
+t("empty config returns defaults verbatim", () => {
+  const { policies, allowed } = buildPoliciesFromConfig({});
+  eq(Object.keys(policies).sort(), Object.keys(DEFAULT_POLICIES).sort(), "same agent set");
+  eq(allowed.size, DEFAULT_ALLOWED_PRIMARIES.size, "no extra primaries added");
+});
+
+console.log(`\n[smoke-test] ${passed} passed, ${failed} failed\n`);
+process.exit(failed === 0 ? 0 : 1);