shopdb-flask/.claude/skills/merge-wilm.md at 77eb59426828a2d9dfb65f865f971164a8bff908

Files

Proudlock ce27cb5eef Add 9 comprehensive automation skills and enforce tool usage

Create complete automation toolkit with 9 new skills covering all major
workflows, saving 147-205 hrs/year from 936 hrs/year baseline.

## New Skills (Time Savings)

Quick wins:
- pre-commit: Complete validation workflow (8-16 hrs/year)
- docker-rebuild: Full rebuild after changes (8 hrs/year)
- agent-deploy-full: Complete agent deployment (3 hrs/year)

Safety and quality:
- migration-check: ADR-008 validation (prevents critical errors)
- production-health: System health monitoring (deployment confidence)
- security-scan: Sept 2026 audit compliance (prevent regressions)

Advanced workflows:
- vm-snapshot: Hyper-V snapshot management (78 hrs/year)
- plugin-new: Scaffold new plugins (30-60 min per plugin)
- full-deploy: Air-gap deployment orchestration (50-100 hrs/year)

## Tool Engagement Enforcement

Updated settings.json to load TOOL-ENGAGEMENT-PROTOCOL.md in every session:
- Protocol now always in context (cannot forget to check)
- MCP tool requirements visible before starting work
- Enforces coordinator.announce_work, Gortex usage, skill invocation

## Code Cleanup

Removed unicode symbols from all skill files per CLAUDE.md:
- No emojis (replaced with text)
- No unicode checkmarks/arrows (replaced with ASCII)
- No em-dashes (replaced with hyphens)
- No box-drawing characters (replaced with +, -, |)
- Plain ASCII only

Total: 13 skills (4 existing + 9 new), all documentation plain ASCII

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

2026-09-11 16:23:53 -04:00

2.2 KiB

Raw Blame History

name, description

name	description
merge-wilm	Merge wilm branch into wj with proper version coordination

Merge the latest commits from wilm branch into wj branch, resolving common conflicts and coordinating agent/tray versions.

Steps

Ensure we're on wj branch and up to date:
```
git checkout wj
git fetch origin
```
Check what's new on wilm:
```
git log wj..origin/wilm --oneline
```
Show the user what commits will be merged.
Attempt the merge:
```
git merge origin/wilm --no-edit
```
If conflicts occur (common files):
- agent/ShopDbEndpointAgent/ShopDbEndpointAgent.csproj: Most common conflict
- plugins/endpoints/api/routes.py: If both branches touched operator reports or fleet alerts
Resolve csproj conflicts:
- Keep ALL version history comments from both branches
- Merge version numbers by taking higher version and bumping patch
- Example: wj has 1.13.5, wilm has 1.14.0 -> result is 1.14.1 or 1.14.2
- Add merge comment explaining what was combined
Resolve routes.py conflicts:
- Usually wilm has infrastructure changes, wj has feature changes
- Preserve both sets of changes
- Check imports at top of file are complete

Stage resolved files and commit:

git add <resolved-files>
git commit -m "Merge wilm into wj"

Bump tray version to match agent:
- Edit ShopDbEndpointAgent.Tray/ShopDbEndpointAgent.Tray.csproj
- Add version comment
- Commit separately
Show summary:
```
git log --oneline --graph -10
```

Common Conflicts

Agent csproj version block:

Preserve all version history from both branches
Increment version number combining both
Document what was merged

Operator report email function:

wilm usually refactors structure
wj usually adds features (FQDN, machine relationships)
Combine both approaches

Version Numbering Rules

Agent and tray MUST be bumped together
Format: X.Y.Z
Merge scenarios:
- wj 1.13.5 + wilm 1.14.0 -> 1.14.1 (take wilm minor, bump patch)
- Add comment: "Merge wilm X.Y.Z changes with wj coordination releases"

Notes

Always review the wilm commits before merging
Test after merge if possible
Tray version lags agent by pattern: agent 1.14.2 pairs with tray 1.6.8

2.2 KiB Raw Blame History

Steps

Common Conflicts

Version Numbering Rules

Notes

2.2 KiB

Raw Blame History