ship
Validate state and merge branch to main for production deployment. Use as final ZTE step after all checks pass.
What this skill does
# Ship
Validate workflow state and merge to main for production deployment.
## Arguments
- `$1`: Branch name to merge
## Instructions
You are the ship command - the final step in Zero-Touch Engineering. Validate everything is ready, then merge to main.
### Step 1: Validate State Completeness
Before shipping, ALL these fields must be populated:
- [ ] `adw_id` - Workflow identifier
- [ ] `issue_number` - GitHub issue being resolved
- [ ] `branch_name` - Branch with changes
- [ ] `plan_file` - Implementation plan path
- [ ] `issue_class` - Task classification
- [ ] `worktree_path` - Isolated environment path (if using worktrees)
If any field is missing or empty, ABORT and report what's missing.
### Step 2: Validate Worktree (if applicable)
If using worktrees, perform three-way validation:
1. State has `worktree_path` field
2. Directory exists on filesystem
3. Git recognizes worktree (`git worktree list`)
If validation fails, ABORT and report the issue.
### Step 3: Validate Branch Exists
```bash
git branch --list $1
```
If branch doesn't exist, ABORT.
### Step 4: Fetch Latest Main
```bash
git fetch origin
```
### Step 5: Checkout Main
```bash
git checkout main
```
### Step 6: Pull Latest
```bash
git pull origin main
```
### Step 7: Merge Branch
Merge with no-fast-forward to preserve commit history:
```bash
git merge $1 --no-ff -m "Merge branch '$1' into main"
```
If merge conflicts occur, ABORT and report conflicts.
### Step 8: Push to Origin
```bash
git push origin main
```
### Step 9: Post Completion
Report successful ship:
```text
Shipped: Branch $1 merged to main and pushed to origin
```
## Output
Return structured result:
```json
{
"success": true,
"branch": "$1",
"merged_to": "main",
"commit": "{merge_commit_hash}",
"pushed": true
}
```
Or on failure:
```json
{
"success": false,
"reason": "{failure_reason}",
"step_failed": "{step_name}",
"remediation": "{suggested_fix}"
}
```
## Safety Gates
This command has multiple abort points:
1. **State validation** - Missing fields block merge
2. **Worktree validation** - Invalid environment blocks merge
3. **Branch validation** - Non-existent branch blocks merge
4. **Merge conflicts** - Conflicts block push
## Notes
- Ship happens in MAIN repository, not worktree
- Always fetch/pull before merge to avoid conflicts
- Use `--no-ff` to preserve full commit history
- This is the final step - validate EVERYTHING before executing
Related in General
modeling-omnistudio-epc-catalog
IncludedSalesforce Industries CME EPC product-modeling skill for Product2-based catalog creation. Use when creating EPC products, configuring product attributes, building offer bundles with Product Child Items, or reviewing EPC DataPack JSON metadata for product catalog changes. TRIGGER when: user creates or updates Product2 EPC records, AttributeAssignment payloads, AttributeMetadata/AttributeDefaultValues, Offer bundles, or ProductChildItem relationships. DO NOT TRIGGER when: designing OmniScripts/FlexCards/Integration Procedures (use building-omnistudio-omniscript, building-omnistudio-flexcard, or building-omnistudio-integration-procedure), implementing Apex business logic (use generating-apex), or troubleshooting deployment pipelines (use deploying-metadata).
relationship-science-coach
IncludedUse this skill for direct, practical adult relationship coaching: couples conflict, repair, trust, marriage, dating, flirting, attachment patterns, emotional connection, sex, desire differences, eroticism, kink negotiation, affection, love languages, breakups, and long-term passion. Draw on Gottman, EFT and Hold Me Tight, attachment science, modern sex research, Perel, Nagoski, Kerner, Schnarch, Love and Stosny, and flexible love-language tools. Be concrete and low-hedge. Redirect only for imminent danger, abuse, coercive control, minors, non-consent, self-harm, stalking, or medical/legal/psychiatric decisions.
building-sf-integrations
IncludedSalesforce integration architecture and runtime plumbing with 120-point scoring. Use this skill to set up Named Credentials, External Credentials, External Services, REST/SOAP callout patterns, Platform Events, and Change Data Capture. TRIGGER when: user sets up Named Credentials, External Services, REST/SOAP callouts, Platform Events, CDC, or touches .namedCredential-meta.xml files. DO NOT TRIGGER when: Connected App/OAuth config (use configuring-connected-apps), Apex-only logic (use generating-apex), or data import/export (use handling-sf-data).
venue-templates
IncludedAccess comprehensive LaTeX templates, formatting requirements, and submission guidelines for major scientific publication venues (Nature, Science, PLOS, IEEE, ACM), academic conferences (NeurIPS, ICML, CVPR, CHI), research posters, and grant proposals (NSF, NIH, DOE, DARPA). This skill should be used when preparing manuscripts for journal submission, conference papers, research posters, or grant proposals and need venue-specific formatting requirements and templates.
let-fate-decide
IncludedDraws the 12 Houses of the Zodiac Tarot spread to inject entropy into planning when prompts are vague, ambiguous, or casually delegated. Interprets the spread to guide next steps. Use when the user says 'let fate decide', 'YOLO', 'whatever', 'idk', or other nonchalant phrases, makes Yu-Gi-Oh references, or when you are about to arbitrarily pick between multiple reasonable approaches. Prefer over ask-questions-if-underspecified when the user's tone is casual or playful rather than precision-seeking.
net-ops
IncludedCross-platform network troubleshooting (Windows, macOS, Linux) via local or remote shell. Use for: DNS broken, can't resolve hostnames, nslookup/dig works but apps fail, NRPT, WFP, scutil, /etc/resolver, systemd-resolved, /etc/resolv.conf, NetworkManager, VPN DNS leak residue (ProtonVPN/Mullvad/WireGuard/AnyConnect), AV/firewall blocking DNS or DoH, Tailscale DNS interaction, intermittent connectivity, remote diagnostics over SSH.