Skip to content

chore: Sync main back to dev after v0.8.0 release#258

Merged
mpaulosky merged 7 commits into
devfrom
squad/sync-main-to-dev
Apr 13, 2026
Merged

chore: Sync main back to dev after v0.8.0 release#258
mpaulosky merged 7 commits into
devfrom
squad/sync-main-to-dev

Conversation

@mpaulosky
Copy link
Copy Markdown
Owner

@mpaulosky mpaulosky commented Apr 13, 2026

Syncs the review fixes from PR #257 and release v0.8.0 back to dev.

Resolves merge conflicts by taking the main (corrected) versions of:

  • .copilot/skills/pre-push-test-gate/SKILL.md
  • .github/workflows/squad-promote.yml
  • .squad/playbooks/pr-merge-process.md
  • .squad/playbooks/pre-push-process.md
  • .squad/playbooks/release-issuetracker.md
  • .squad/ceremonies.md

mpaulosky and others added 6 commits April 12, 2026 13:24
* chore: merge release-process skill review decisions, update agent histories, archive aged decisions

- Merged three inbox decision entries (Aragorn/Boromir/Frodo) into decisions.md
- Updated agent history files with 2026-04-12 team sync learnings
- Archived pre-April-1 decisions to decisions-archive.md for operational clarity
- Released context by condensing aged decision records

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* .squad: Scribe logs for Frodo release-process legacy stub

Session: 2026-04-12T19:57:04Z

Tasks completed:
1. Orchestration log: frodo agent release-process deprecation task
2. Session log: release-skill-legacy-stub work summary
3. Decision inbox merged: frodo-release-process-legacy-stub.md → decisions.md
4. Frodo history.md updated: Added legacy stub deprecation entry
5. Inbox file deleted after merge

Outputs:
- .squad/orchestration-log/2026-04-12T19-57-04Z-frodo.md (new)
- .squad/log/2026-04-12T19-57-04Z-release-skill-legacy-stub.md (new)
- .squad/decisions.md (appended, 92896 bytes)
- .squad/agents/frodo/history.md (updated with team context)

No archival needed (92896 bytes < 20KB threshold would trigger archive,
but this represents 2026-04 additions; all old decisions within 30d window).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* .squad: History file summarization (aragorn, frodo, legolas, pippin)

Task 7: Summarized old entries (>30d) to '## Core Context' section.

Files:
- aragorn: 29KB → 21KB (kept March 28+ recent entries)
- frodo: 16KB → 6KB (kept April 12+ recent entries)
- legolas: 14KB → 4KB (consolidated CSS, styling, theme learnings)
- pippin: 12KB → 4KB (consolidated Aspire, Playwright, team rule learnings)

All summarized files now <12KB threshold except Aragorn (21KB still acceptable
with Core Context structure). Maintains full context while improving readability.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Update MCP server configurations and squad export

- Update .copilot/mcp-config.json with enhanced MCP server definitions
- Add .mcp.json for MCP client integration (untracked)
- Update squad-export.json with latest team metadata

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* chore: update frodo agent history

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* scribe: Log PR flow and merge decisions inbox

- Added orchestration log for Boromir PR creation/merge attempt (PR #246)
- Added session log for PR workflow (squad/scribe-log-mcp-export)
- Merged 3 decision inbox files into decisions.md:
  * Boromir: Branch strategy (dev/main model) feasibility audit
  * Boromir: MCP config commit safety assessment
  * Frodo: Documentation audit for dev/main branch model
- Cleared .squad/decisions/inbox/ (all inbox files processed)

This completes the spawn manifest processing for Boromir's two-pass PR flow attempt.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* scribe: Add Aragorn adoption decision to decisions.md

- Merged Aragorn's comprehensive two-branch strategy assessment
- Includes GitVersion.yml configuration recommendations
- Provides phased implementation roadmap (Phase 1 infrastructure, Phase 2 docs)
- Clearcut approval gate: requires Matthew Paulosky sign-off
- All decision inbox files now processed and cleared

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
v3.1.11 and v3 tags only support GitVersion <6.1.0, but 6.x now
resolves to 6.7.0 which is out of range. Upgrade all four release
workflows to gittools/actions@v4.5.0.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* chore: Sync dev with main (2 missing commits) (#248)

Sync dev with main: brings in commits b529234 (#246) and 1c3b613 (#247). Establishes clean baseline for dev/main branching model.

* chore: Sync dev with main (2 missing commits — #246, #247) (#249)

* chore: Update MCP server configurations and squad export (#246)

* chore: merge release-process skill review decisions, update agent histories, archive aged decisions

- Merged three inbox decision entries (Aragorn/Boromir/Frodo) into decisions.md
- Updated agent history files with 2026-04-12 team sync learnings
- Archived pre-April-1 decisions to decisions-archive.md for operational clarity
- Released context by condensing aged decision records

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* .squad: Scribe logs for Frodo release-process legacy stub

Session: 2026-04-12T19:57:04Z

Tasks completed:
1. Orchestration log: frodo agent release-process deprecation task
2. Session log: release-skill-legacy-stub work summary
3. Decision inbox merged: frodo-release-process-legacy-stub.md → decisions.md
4. Frodo history.md updated: Added legacy stub deprecation entry
5. Inbox file deleted after merge

Outputs:
- .squad/orchestration-log/2026-04-12T19-57-04Z-frodo.md (new)
- .squad/log/2026-04-12T19-57-04Z-release-skill-legacy-stub.md (new)
- .squad/decisions.md (appended, 92896 bytes)
- .squad/agents/frodo/history.md (updated with team context)

No archival needed (92896 bytes < 20KB threshold would trigger archive,
but this represents 2026-04 additions; all old decisions within 30d window).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* .squad: History file summarization (aragorn, frodo, legolas, pippin)

Task 7: Summarized old entries (>30d) to '## Core Context' section.

Files:
- aragorn: 29KB → 21KB (kept March 28+ recent entries)
- frodo: 16KB → 6KB (kept April 12+ recent entries)
- legolas: 14KB → 4KB (consolidated CSS, styling, theme learnings)
- pippin: 12KB → 4KB (consolidated Aspire, Playwright, team rule learnings)

All summarized files now <12KB threshold except Aragorn (21KB still acceptable
with Core Context structure). Maintains full context while improving readability.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Update MCP server configurations and squad export

- Update .copilot/mcp-config.json with enhanced MCP server definitions
- Add .mcp.json for MCP client integration (untracked)
- Update squad-export.json with latest team metadata

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* chore: update frodo agent history

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* chore: scribe log and decisions export (#247)

* scribe: Log PR flow and merge decisions inbox

- Added orchestration log for Boromir PR creation/merge attempt (PR #246)
- Added session log for PR workflow (squad/scribe-log-mcp-export)
- Merged 3 decision inbox files into decisions.md:
  * Boromir: Branch strategy (dev/main model) feasibility audit
  * Boromir: MCP config commit safety assessment
  * Frodo: Documentation audit for dev/main branch model
- Cleared .squad/decisions/inbox/ (all inbox files processed)

This completes the spawn manifest processing for Boromir's two-pass PR flow attempt.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* scribe: Add Aragorn adoption decision to decisions.md

- Merged Aragorn's comprehensive two-branch strategy assessment
- Includes GitVersion.yml configuration recommendations
- Provides phased implementation roadmap (Phase 1 infrastructure, Phase 2 docs)
- Clearcut approval gate: requires Matthew Paulosky sign-off
- All decision inbox files now processed and cleared

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* chore: Update MCP server configurations and squad export (#246) (#250)

Adopts dev/main two-branch model across all infrastructure (workflows, dependabot, pre-push, GitVersion, docs, skills). Replaces squad-promote from Node.js to .NET/GitVersion.

* Add pre-push and merge playbooks, fix process documentation (#251)

Add pre-push and merge playbooks, fix process documentation

- New .squad/playbooks/pre-push-process.md (5-gate walkthrough)
- New .squad/playbooks/pr-merge-process.md (8-step merge lifecycle)
- Fix release-issuetracker.md (NBGV→GitVersion, two-branch model)
- Rewrite pre-push-test-gate skill (all 5 gates, 10 test projects)
- Flag 3 Squad CLI skills as non-applicable to IssueTrackerApp
- Update routing.md with playbook-aware routing
- Add playbook cross-references to ceremonies.md

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>"

* chore: disable prerelease SDK in global.json (#254)

Set allowPrerelease to false to use stable .NET SDK only.

* fix: upgrade gittools/actions to v4.5.0 for GitVersion 6.7.0 compat

v3.1.11 and v3 tags only support GitVersion <6.1.0, but 6.x now
resolves to 6.7.0 which is out of range. Upgrade all four release
workflows to gittools/actions@v4.5.0.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* fix: upgrade gittools/actions to v4.5.0 for GitVersion 6.7.0 compat (#255)

v3.1.11 and v3 tags only support GitVersion <6.1.0, but 6.x now
resolves to 6.7.0 which is out of range. Upgrade all four release
workflows to gittools/actions@v4.5.0.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* docs: address 10 Copilot review items on PR #257

- Add configFilePath: GitVersion.yml to squad-promote.yml execute step
- Fix shell-escaping risk: use --body-file instead of inline --body with command substitution
- Replace stale embedded GitVersion YAML with link to actual file
- Update Last Updated dates to 2026-04-13
- Fix Gate 0 docs: blocks main AND dev, not just main
- Fix branch cleanup: reference origin/dev not origin/main (squad PRs merge to dev)
- Fix conflict resolution: merge origin/dev not origin/main
- Clarify tag prefix: lowercase v only triggers release workflow

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
# Conflicts:
#	.copilot/skills/pre-push-test-gate/SKILL.md
#	.github/workflows/squad-promote.yml
#	.squad/playbooks/pr-merge-process.md
#	.squad/playbooks/pre-push-process.md
#	.squad/playbooks/release-issuetracker.md
Copilot AI review requested due to automatic review settings April 13, 2026 01:48
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 13, 2026

Test Results Summary

2 365 tests  ±0   2 365 ✅ ±0   1m 23s ⏱️ ±0s
   10 suites ±0       0 💤 ±0 
   10 files   ±0       0 ❌ ±0 

Results for commit afe8e6b. ± Comparison against base commit 82b2595.

♻️ This comment has been updated with latest results.

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Syncs release v0.8.0 / PR #257 fixes from main back into dev, updating release/process playbooks and the promote workflow to match the corrected GitVersion + branch-protection behavior.

Changes:

  • Updates multiple squad playbooks/skills “Last Updated” dates and aligns branch-protection language to block direct pushes to main/dev.
  • Refines the release playbook’s GitVersion references and tag-prefix guidance to match current workflows.
  • Improves squad-promote.yml PR body creation by writing the body to a temp file and using --body-file.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
.squad/playbooks/release-issuetracker.md Refreshes release playbook metadata and clarifies GitVersion/tag trigger behavior.
.squad/playbooks/pre-push-process.md Updates Gate 0 docs to reflect branch protection for main and dev.
.squad/playbooks/pr-merge-process.md Updates orphan-branch cleanup commands to use dev as the merge base.
.squad/ceremonies.md Aligns merge-conflict and cleanup ceremonies with dev-based workflows (but leaves some inconsistent text/commands).
.github/workflows/squad-promote.yml Uses GitVersion configFilePath and writes PR body via temp file + --body-file.
.copilot/skills/pre-push-test-gate/SKILL.md Updates Gate 0 description to include dev alongside main.

Comment thread .github/workflows/squad-promote.yml
Comment thread .squad/ceremonies.md
Comment thread .squad/ceremonies.md
Comment thread .squad/ceremonies.md
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 13, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 78.52%. Comparing base (82b2595) to head (afe8e6b).
⚠️ Report is 1 commits behind head on dev.

Additional details and impacted files
@@           Coverage Diff           @@
##              dev     #258   +/-   ##
=======================================
  Coverage   78.52%   78.52%           
=======================================
  Files         228      228           
  Lines        8481     8481           
  Branches     1166     1166           
=======================================
  Hits         6660     6660           
  Misses       1284     1284           
  Partials      537      537           
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

- squad-promote.yml: use '// empty' in jq to avoid null PR number
- ceremonies.md: fix conflict trigger wording (main → dev)
- ceremonies.md: fix one-liner cleanup commands (main → dev)
- ceremonies.md: fix Report step branch filter (main → dev)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@mpaulosky mpaulosky merged commit 338a4f2 into dev Apr 13, 2026
19 checks passed
@mpaulosky mpaulosky deleted the squad/sync-main-to-dev branch April 13, 2026 02:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants