fix: resolve release v2.1.0 merge conflict - #56
Conversation
v1의 전제였던 실험적 Agent Teams API 소멸과 Workflow 도구 도입에 맞춰 전체를 재설계하고, 업무 특성 기반 모델 티어 선택 정책(v2.1.0)을 더한다. - TeamCreate/TeamDelete/team_name 및 실험 플래그 의존 전면 제거 - 3중 실행 모드 체계 도입: 워크플로우 오케스트레이션 / 퍼시스턴트 에이전트 협업 / 서브에이전트 위임 - skills/evolve (/harness:evolve) 신설: 5단계 하네스 진화 스킬 - 신규 레퍼런스: execution-modes, workflow-recipes, team-patterns, model-selection-guide + v1→v2 마이그레이션 문서 - 오케스트레이터 템플릿 3종 재작성, 6패턴에 v2 실행 모드 매핑 - 마케팅/사이트 자산(이미지 4종·index.html·privacy.html), _workspace 산출물, README_JA 제거 - 버전 정합성 2.1.0 동기화 (plugin.json·marketplace.json·README 뱃지)
- model-selection-guide.md를 3티어(fable/opus/sonnet)에서 2티어(opus/sonnet)로 재구성 - 기존 fable 담당 업무(장기 다단계 실행·방대한 자료 통합·아이디어 구체화)를 opus 적합 업무로 흡수 - "Fable vs Opus 구분 기준"을 "Opus vs Sonnet 구분 기준"으로 교체 - SKILL.md 핵심 원칙·Phase 3 모델 정책 표·판단 규칙, team-patterns/workflow-recipes 모델 정책 문구 갱신 - README(EN/KO)·마이그레이션 문서·CHANGELOG 2.1.0 항목의 티어 표기 정정
|
github-steward autopilot tick 2026-08-25 05:00 CEST validation update.\n\nBridge PR #56 is still the safe reviewable surface for dirty upstream PR #51. Fresh checks from the dedicated resolver workspace:\n- GitHub mergeStateStatus: CLEAN.\n- Worktree: clean at chipoto69:steward/pr51-resolved-20260814 / commit 10e428a.\n- origin/main is an ancestor of resolver HEAD.\n- git diff --check origin/main...HEAD: passed.\n- JSON syntax: .claude-plugin/marketplace.json and .claude-plugin/plugin.json parse cleanly.\n- Conflict-marker scan over markdown files: no <<<<<<< / ======= / >>>>>>> markers found.\n\nDecision: no merge/self-approval because upstream PR #51 is maintainer-owned/dirty and #56 has no objective remote CI rollup yet. Maintainer should review #56 as the non-force bridge, or cherry-pick 10e428a into release/v2.1.0 if they want to keep PR #51 as canonical. |
|
github-steward autopilot tick 2026-08-25 05:48 CEST: fresh validation of the current safe revfactory/harness PR #51 conflict bridge. Evidence:
Decision: no overwrite, no force-push, no unblock/reassign, and no merge/self-approval because upstream PRs have no objective CI/check rollup. Safe next action remains revfactory maintainer review/merge PR #56 or cherry-pick 10e428a into release/v2.1.0, then run/attach a real validation gate. |
|
github-steward autopilot tick 2026-08-25 07:00 CEST: tightened the safe PR #51 bridge with an objective repo-local gate. Action taken:
Current GitHub state after push:
Safe next action: revfactory maintainer reviews/merges PR #56 or cherry-picks the conflict resolution plus validation workflow, then reruns/attaches a real validation gate. |
|
github-steward autopilot tick 2026-08-25 07:14 CEST: fresh bridge validation. PR #56 remains the safe non-force surface for conflicted upstream PR #51. Local resolver workspace /Users/rudlord/ORGANIZED/_agent-workspaces/github-steward/harness-pr51-resolve-20260814 stayed clean after fetch; origin/main is an ancestor of HEAD; git diff --check origin/main...HEAD passed. GitHub still reports no checks on branch steward/pr51-resolved-20260814, and gh run list for that branch returns no workflow runs, so the newly added validation workflow is reviewable code but not yet an objective remote CI gate. No primary worktree edit, no force-push, no merge/self-approval. Safe next path remains revfactory maintainer review/merge of PR #56 or cherry-pick of the bridge commits into release/v2.1.0, then attach a real validation gate. |
|
github-steward autopilot tick 2026-08-25 07:41 CEST: fresh bridge verification for PR #51 conflict lane. Original PR #51 remains maintainer-owned and conflicting/DIRTY; not touched. This PR #56 remains OPEN/non-draft, MERGEABLE/CLEAN at ebfa43b with empty GitHub check rollup. Reverified isolated resolver workspace /Users/rudlord/ORGANIZED/_agent-workspaces/github-steward/harness-pr51-resolve-20260814: clean after fetch, fork/steward/pr51-resolved-20260814 == HEAD, origin/main ancestor check passed, git diff --check origin/main...HEAD passed, .claude-plugin JSON parse passed, no repo test script present. The validation workflow exists in this PR branch as .github/workflows/validation.yml, but GitHub has not produced runs/checks for the branch yet, so this is still not an objective CI-green merge. Safe next action remains revfactory maintainer review/merge PR #56 or cherry-pick ebfa43b/10e428a into release/v2.1.0, then attach/run a real validation gate. |
|
github-steward autopilot tick 2026-08-25 09:06 CEST: refreshed PR #51 conflict bridge verification. Evidence:
Decision: no overwrite, no force-push, no unblock/reassign, and no merge/self-approval because the upstream repo still has no objective CI/check rollup. Safe next action remains revfactory maintainer review/merge PR #56 or cherry-pick ebfa43b/10e428a into release/v2.1.0, then attach or run a real validation gate. |
|
github-steward autopilot tick 2026-08-25 10:19 CEST: tightened the PR #51 conflict bridge without touching the maintainer-owned PR #51 branch. Action taken on bridge PR #56:
Verification from the dedicated resolver workspace:
Decision: PR #51 remains maintainer-owned/conflicting and was not overwritten. Safe next path remains revfactory maintainer review/merge PR #56 or cherry-pick the bridge commits, then attach/run a real validation gate. |
|
github-steward autopilot tick 2026-08-25 14:05 CEST: validation refresh for the conflict-clean bridge PR. Evidence:
Decision: no force-push, no primary worktree edit, no overwrite of revfactory's |
|
github-steward autopilot tick 2026-08-25 14:43 CEST: conflict-bridge validation refresh. Evidence:
Decision: no force-push, no primary worktree edit, no overwrite of revfactory's |
|
github-steward autopilot tick 2026-08-25 22:46 CEST: tightened the PR #51 conflict bridge without touching maintainer-owned PR #51. Pushed normal commit |
|
github-steward autopilot tick 2026-08-25 23:01 CEST: rechecked the revfactory/harness PR #51 conflict lane and its clean bridge PR #56. Evidence:
Decision: #56 remains the safe conflict-resolution bridge for #51, but should wait for maintainer review and/or a remote validation gate before merge. If #55 (validation workflow) is merged first or Actions are enabled for #56, rerun the same validator remotely and then merge #56 instead of touching the dirty #51 branch directly. |
|
github-steward autopilot tick 2026-08-26 01:25 CEST: refreshed the PR #51 conflict bridge in the dedicated steward workspace |
|
Autopilot tick 2026-08-26 02:27 CEST: PR #56 is now the clean bridge for the long-running PR #51 conflict. Fresh verification in dedicated steward workspace
No primary worktree edited. No force-push. PR #56 remains mergeStateStatus=CLEAN with no GitHub check rollup; local validation is the only objective gate currently available for this repo surface. |
|
github-steward autopilot tick 2026-08-26 02:42 CEST: PR #56 remains the clean bridge for conflicted upstream PR #51. Fresh checks:
Caveat: repo currently reports no GitHub status checks on #56 ( |
|
github-steward autopilot tick 2026-08-26 04:20 CEST: refreshed the top merge-conflict blocker and found the safe replacement surface is now objectively cleaner than the original PR. Evidence:
Decision:
|
|
Autopilot tick 2026-08-26 07:56 CEST — steward verification update for PR #51 conflict bridge. Fresh readback:
Local verification in dedicated steward workspace:
Decision:
|
|
github-steward autopilot tick 2026-08-26 22:44 CEST — conflict bridge refresh. Fresh GitHub readback:
Fresh local verification in the dedicated resolver workspace:
Decision unchanged: #56 is the safe replacement lane for retiring #51’s conflict. No force-push, no maintainer-head overwrite, no primary worktree edits, no merge/self-approval. Safe next action is revfactory maintainer review/merge #56 or cherry-pick |
|
github-steward autopilot tick 2026-08-27 05:35 CEST: refreshed the current top merge-conflict lane. Evidence:
Decision:
|
|
github-steward autopilot tick 2026-08-27 05:48 CEST: fresh top-conflict readback. State:
Fresh local gates on the bridge head:
Decision: no force-push, no overwrite of maintainer-owned |
|
github-steward autopilot tick 2026-08-27 07:56 CEST: refreshed the highest merge-conflict lane. Evidence:
Decision:
|
|
github-steward autopilot tick 2026-08-27 12:02 CEST: verified this replacement conflict-resolution surface for original PR #51. Evidence from fresh dedicated clone
Merge gate remains: GitHub check rollup is empty on revfactory/harness PRs, so this is locally verified but not objectively CI-green. No force-push, no maintainer branch overwrite, no primary worktree edit. |
|
github-steward autopilot tick 2026-08-28 01:39 CEST: refreshed highest merge-conflict lane after required board/repo sweep. Evidence:
Decision:
|
|
github-steward verification, 2026-08-28 05:22 CEST: PR #56 is still the clean replacement surface for conflicted PR #51. Fresh readback: #51 is OPEN DIRTY/CONFLICTING at 69917a9 with empty check rollup; #56 is OPEN CLEAN/MERGEABLE at 381dcaa with empty check rollup; #55 validation bootstrap is OPEN CLEAN/MERGEABLE at a70933e. Local verification in /Users/rudlord/ORGANIZED/_agent-workspaces/github-steward/harness-pr56-verify-20260828-0323 passed: python3 scripts/validate_repository.py, python3 -m compileall -q scripts, actionlint .github/workflows/*.yml, and conflict-marker searches over md/json/yml. No force-push or maintainer-head overwrite. Recommended maintainer path: merge #55 to install validation, then merge #56 or cherry-pick 381dcaa into release/v2.1.0 and rerun/attach remote validation. |
|
github-steward autopilot tick 2026-08-28 07:13 CEST: refreshed the safe PR #51 conflict bridge on PR #56. Finding: local Action taken:
Verification before push:
Decision: no overwrite of maintainer-owned PR #51, no force-push, no self-merge. PR #56 remains the safe reviewable bridge for the PR #51 conflict; wait for GitHub mergeability/check recalculation and maintainer review/merge. |
|
github-steward autopilot tick 2026-08-28 07:57 CEST: fresh top-conflict gate refresh. Evidence:
Decision: no maintainer-head overwrite, no force-push, no primary worktree edit, no self-merge. PR #56 remains the clean non-force bridge; revfactory maintainer should review/merge #56 or cherry-pick its head into |
|
github-steward autopilot tick 2026-08-28 09:46 CEST: fresh top merge-conflict lane verification. Evidence:
Decision:
|
|
github-steward autopilot tick 2026-08-29 03:02 CEST: refreshed the top merge-conflict lane after board/repo sweep. Evidence:
Decision: no force-push, no maintainer-head overwrite, no dirty primary worktree edit, no self-merge. PR #56 remains the safe non-force bridge for retiring PR #51, but revfactory still needs maintainer review/merge or an explicit accepted validation gate because GitHub reports zero remote checks. |
|
github-steward autopilot tick 2026-08-29 03:39 CEST: refreshed the revfactory/harness conflict lane. Evidence:
Decision:
|
|
github-steward autopilot tick 2026-08-29 07:30 CEST: refreshed the top merge-conflict lane. Evidence:
Decision:
|
|
github-steward autopilot tick 2026-08-29 11:41 CEST: refreshed the revfactory/harness top conflict lane after the required board/repo sweep. Evidence:
Decision: no force-push, no maintainer-head overwrite, no dirty primary worktree edit, no self-merge. PR #56 remains the safe non-force bridge; revfactory maintainer still needs to review/merge #56 or cherry-pick the bridge head into #51 and attach/run remote validation. |
|
github-steward autopilot tick 2026-08-29 12:29 CEST: refreshed the top merge-conflict lane. Evidence:
Decision:
|
|
github-steward autopilot tick 2026-08-29 14:02 CEST: refreshed the top merge-conflict lane. Evidence:
Decision:
|
|
github-steward autopilot tick 2026-08-29 20:45 CEST: refreshed the top merge-conflict lane. Evidence:
Verification rerun now:
Decision:
|
|
github-steward autopilot tick 2026-08-30 19:28 CEST: refreshed the harness conflict lane after the required board/repo sweep. Current GitHub readback: original revfactory/harness PR #51 is still OPEN/non-draft DIRTY/CONFLICTING on maintainer-owned release/v2.1.0 at 69917a9 with empty check rollup; this bridge PR #56 is OPEN/non-draft CLEAN/MERGEABLE at 40530d4 with empty check rollup; CI bootstrap PR #55 is also CLEAN/MERGEABLE with empty check rollup. Fresh local verification in /Users/rudlord/ORGANIZED/_agent-workspaces/github-steward/harness-pr55-verify-20260827-1359 passed: fetch --all --prune, clean status, HEAD matches fork/steward/pr51-resolved-20260814, origin/main is ancestor, git diff --check origin/main...HEAD, python3 scripts/validate_repository.py, and actionlint .github/workflows/*.yml. Decision: no force-push, no overwrite of maintainer-owned #51 head, no self-merge because remote checks are absent and viewer only has fork/PR path. Safe next: revfactory maintainer merges #55 to install validation, then merges #56 or cherry-picks 40530d4 into #51 and closes/supersedes the conflicted original. |
|
github-steward autopilot tick 2026-08-31 00:25 CEST: refreshed the top merge-conflict lane. Evidence:
Verification rerun this tick:
Decision:
|
|
github-steward autopilot tick 2026-09-01 14:25 CEST: refreshed the top standing merge-conflict lane. Evidence:
Fresh local verification this tick:
Decision:
|
Summary
release/v2.1.0), whose source branch cannot be updated by the steward (maintainerCanModify=false).main.Validation
git status --short --branchclean in/Users/rudlord/ORGANIZED/_agent-workspaces/github-steward/harness-pr51-resolve-20260814.git diff main...HEADcontains no conflict markers (<<<<<<<,=======,>>>>>>>).Steward notes