chore: Sync dev with main (2 missing commits)#248
Merged
Conversation
* 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>
There was a problem hiding this comment.
Pull request overview
Syncs dev with main by bringing in documentation/config updates related to the Squad release-process refactor and MCP configuration standardization, establishing an aligned baseline before the dev/main branching strategy transition.
Changes:
- Added/updated Squad release documentation: deprecated legacy
release-processskill, introduced genericrelease-process-base, and added an IssueTrackerApp release playbook. - Reorganized decision logging by moving older content into
decisions-archive.mdand appending new decision entries todecisions.md. - Updated MCP configuration files (
.mcp.json,.copilot/mcp-config.json) and refreshed Squad agent history exports/state.
Reviewed changes
Copilot reviewed 13 out of 14 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| .squad/skills/release-process/SKILL.md | Adds a deprecation stub pointing to the new generic skill and project playbook. |
| .squad/skills/release-process-base/SKILL.md | Introduces a generic, framework-agnostic release workflow skill. |
| .squad/playbooks/release-issuetracker.md | Adds an IssueTrackerApp-specific release playbook. |
| .squad/decisions.md | Removes large prior sections and appends new release-process / branching / MCP decision entries. |
| .squad/decisions-archive.md | Expands the archive to hold prior decisions content moved out of decisions.md. |
| .squad/agents/pippin/history.md | Updates exported agent history formatting/content. |
| .squad/agents/legolas/history.md | Updates exported agent history formatting/content. |
| .squad/agents/frodo/history.md | Updates exported agent history formatting/content. |
| .squad/agents/boromir/history.md | Updates exported agent history formatting/content. |
| .squad/agents/aragorn/history.md | Updates exported agent history formatting/content. |
| .squad/.ralph-state.json | Adds a new Squad state file. |
| .mcp.json | Adds repo-level MCP server configuration. |
| .copilot/mcp-config.json | Updates Copilot MCP server configuration to the new server definitions. |
Comment on lines
+28
to
+44
| | **Version System** | NBGV | Nerdbank.GitVersioning | | ||
| | **Version File** | `version.json` | At repo root | | ||
| | **Tag Prefix** | `v` | e.g., `v1.0.0` | | ||
| | **Package ID** | IssueTrackerApp | From `.csproj` | | ||
| | **Merge Strategy** | merge | Preserve commit history on main | | ||
|
|
||
| **version.json reference:** | ||
| ```json | ||
| { | ||
| "version": "1.0.0", | ||
| "publicReleaseRefSpec": [ | ||
| "^refs/heads/main$", | ||
| "^refs/tags/v\\d+(?:\\.\\d+)?$" | ||
| ] | ||
| } | ||
| ``` | ||
|
|
Comment on lines
+49
to
+56
| | **Build Verification** | release published | `.github/workflows/build.yml` | (logs only) | | ||
| | **Unit Tests** | release published | `.github/workflows/build.yml` | (logs only) | | ||
| | **Integration Tests** | release published | `.github/workflows/integration-tests.yml` | (logs only) | | ||
| | **Docker Image** | TBD | (not yet configured) | (not yet deployed) | | ||
| | **Documentation** | TBD | (not yet configured) | (not yet deployed) | | ||
| | **NuGet Package** | TBD | (not yet configured) | (not yet deployed) | | ||
|
|
||
| **Status:** Minimal release pipeline. Extend as needed. |
Comment on lines
+14
to
+34
| ### Why Deprecated? | ||
|
|
||
| - Designed for a different repository (upstream fork `FritzAndFriends/BlazorWebFormsComponents`) | ||
| - Does not reflect IssueTrackerApp's release model (single-branch, NBGV, minimal artifacts) | ||
| - Overlaps with the new generic skill and project playbook (see below) | ||
|
|
||
| ### What to Use Instead | ||
|
|
||
| **For generic release workflow patterns (any project):** | ||
| → `.squad/skills/release-process-base/SKILL.md` | ||
| - Framework-agnostic versioning strategies (static file, NBGV, tag-only) | ||
| - Two-branch vs. single-branch models | ||
| - Merge strategies and CI/CD architecture | ||
| - Common troubleshooting | ||
|
|
||
| **For IssueTrackerApp-specific release steps:** | ||
| → `.squad/playbooks/release-issuetracker.md` | ||
| - Single-branch model (all work on `main`) | ||
| - NBGV version management | ||
| - Step-by-step release commands | ||
| - IssueTrackerApp-specific CI/CD configuration |
Comment on lines
+7
to
+18
| ## Decisions | ||
|
|
||
| ### MongoDB Connection String Fallback (2025-03-21) | ||
| ### Process & Planning | ||
| # IssueTrackerApp Decisions | ||
|
|
||
| **Author:** Sam (Backend Developer) | ||
| **Status:** Implemented | ||
| This file records team decisions that affect architecture, scope, and process. | ||
|
|
||
| The Web project crashed at startup with `System.TimeoutException` because the EF Core MongoDB provider reads `MongoDB:ConnectionString` (hardcoded to `mongodb://localhost:27017` in appsettings.Development.json), while the actual Atlas connection string lives in `ConnectionStrings:mongodb` (user secrets / Aspire injection). These two config paths never intersect. | ||
| --- | ||
|
|
||
| **Decision:** Added fallback logic in `AddMongoDbPersistence` that bridges the gap: | ||
| ## Decisions | ||
|
|
||
| 1. Before binding `MongoDbSettings`, check if `MongoDB:ConnectionString` is empty or equals `mongodb://localhost:27017` | ||
| 2. If so, read `ConnectionStrings:mongodb` and overlay it into the MongoDB config section | ||
| 3. Changed `appsettings.Development.json` to use empty string instead of the localhost default | ||
| ### Process & Planning |
Comment on lines
+2043
to
+2057
| - CONTRIBUTING.md: Update 3 sections + new release flow (30 min) | ||
| - docs/New Work process.md: Update 2 sections + release flow (30 min) | ||
| - squad-promote.yml: Replace package.json reads with NBGV (15 min) | ||
| - Dependabot: Verify targets dev (5 min) | ||
| - merged-pr-guard skill: Update refs (5 min) | ||
| - Release playbook: Update single-branch refs (20 min) | ||
|
|
||
| Total estimated effort: ~2 hours (implementation + testing) | ||
|
|
||
| ### Key Risks | ||
|
|
||
| 1. GitVersion pre-release labeling: Builds on dev produce versions like 0.7.0-alpha.3. Ensure CI and consumers handle this. | ||
|
|
||
| 2. squad-promote.yml Node.js artifact: package.json version extraction will fail. Must replace with nbgv get-version. | ||
|
|
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## dev #248 +/- ##
=======================================
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:
|
mpaulosky
added a commit
that referenced
this pull request
Apr 13, 2026
* 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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Syncs
devwithmainby bringing in 2 commits that were merged directly tomain:b529234— chore: Update MCP server configurations and squad export (chore: Update MCP server configurations and squad export #246)1c3b613— chore: scribe log and decisions export (chore: scribe log and decisions export #247)After this merge,
devandmainwill be at the same commit, providing a clean baseline for the new dev/main branching model.Context
This is part of the dev/main branching strategy transition. The implementation PR (
squad/dev-main-branching-strategy) contains all the workflow, documentation, and configuration changes. This PR just ensuresdevis caught up withmainbefore that work lands.