diff --git a/gsd-core/workflows/ship.md b/gsd-core/workflows/ship.md
index 0f093d720..c54c4a7e8 100644
--- a/gsd-core/workflows/ship.md
+++ b/gsd-core/workflows/ship.md
@@ -402,7 +402,7 @@ would otherwise trigger (GitHub honors `[ci skip]` / `[skip ci]`):
 
 ```bash
 gsd_run query commit "docs(${padded_phase}): ship phase ${PHASE_NUMBER} — PR #${PR_NUMBER} [ci skip]" --files .planning/STATE.md
-git push origin ${CURRENT_BRANCH} 2>&1
+git push origin ${CURRENT_BRANCH} 2>&1 || echo "⚠ track_shipping: ship-note push failed — it is local-only; rerun: git push origin ${CURRENT_BRANCH}"
 ```
 </step>
 
diff --git a/tests/fixtures/golden-install-parity/antigravity.json b/tests/fixtures/golden-install-parity/antigravity.json
index cf0ef4cec..b1519627b 100644
--- a/tests/fixtures/golden-install-parity/antigravity.json
+++ b/tests/fixtures/golden-install-parity/antigravity.json
@@ -292,7 +292,7 @@
   "gsd-core/workflows/settings-advanced.md": "6d25100a9de15b31",
   "gsd-core/workflows/settings-integrations.md": "4d3001ad2b5dad8f",
   "gsd-core/workflows/settings.md": "8258f7bd3700d608",
-  "gsd-core/workflows/ship.md": "e1d993823d06b6b5",
+  "gsd-core/workflows/ship.md": "82a63ca54f4b322f",
   "gsd-core/workflows/sketch-wrap-up.md": "0f842a609851a401",
   "gsd-core/workflows/sketch.md": "314b7d323c6b57eb",
   "gsd-core/workflows/smart-entry.md": "3ce5b6228238fdb6",
diff --git a/tests/fixtures/golden-install-parity/augment.json b/tests/fixtures/golden-install-parity/augment.json
index af785e0e0..66a1211fa 100644
--- a/tests/fixtures/golden-install-parity/augment.json
+++ b/tests/fixtures/golden-install-parity/augment.json
@@ -363,7 +363,7 @@
   "gsd-core/workflows/settings-advanced.md": "414db4dbea97ba44",
   "gsd-core/workflows/settings-integrations.md": "70515c5838fb9826",
   "gsd-core/workflows/settings.md": "d96ddf01fb85e61e",
-  "gsd-core/workflows/ship.md": "c21ceab819ebc0b1",
+  "gsd-core/workflows/ship.md": "b377dab2bc92a6e5",
   "gsd-core/workflows/sketch-wrap-up.md": "5f5ebb6a80d610c6",
   "gsd-core/workflows/sketch.md": "8319cedf3f93fc35",
   "gsd-core/workflows/smart-entry.md": "449238eb94abe187",
diff --git a/tests/fixtures/golden-install-parity/claude-local.json b/tests/fixtures/golden-install-parity/claude-local.json
index d3e13029b..0f81af845 100644
--- a/tests/fixtures/golden-install-parity/claude-local.json
+++ b/tests/fixtures/golden-install-parity/claude-local.json
@@ -362,7 +362,7 @@
   "gsd-core/workflows/settings-advanced.md": "94d61da368e9f85b",
   "gsd-core/workflows/settings-integrations.md": "dfe3672c4fabf139",
   "gsd-core/workflows/settings.md": "acdd79110699a608",
-  "gsd-core/workflows/ship.md": "8671bc09c9daa0f3",
+  "gsd-core/workflows/ship.md": "2e50ecfb12d48282",
   "gsd-core/workflows/sketch-wrap-up.md": "d52a5462bafda830",
   "gsd-core/workflows/sketch.md": "dbe6acc4d976060c",
   "gsd-core/workflows/smart-entry.md": "1850447c045f36d8",
diff --git a/tests/fixtures/golden-install-parity/claude.json b/tests/fixtures/golden-install-parity/claude.json
index 012d75ac1..f017d242d 100644
--- a/tests/fixtures/golden-install-parity/claude.json
+++ b/tests/fixtures/golden-install-parity/claude.json
@@ -291,7 +291,7 @@
   "gsd-core/workflows/settings-advanced.md": "339def28c34b0797",
   "gsd-core/workflows/settings-integrations.md": "53649313d20694ae",
   "gsd-core/workflows/settings.md": "7e7458cdb2b68ec5",
-  "gsd-core/workflows/ship.md": "6afd71143bfc9224",
+  "gsd-core/workflows/ship.md": "63e65d06a6038e8e",
   "gsd-core/workflows/sketch-wrap-up.md": "121ed4b8127abf04",
   "gsd-core/workflows/sketch.md": "737c0492686fea2d",
   "gsd-core/workflows/smart-entry.md": "ad20cf74ae2e8291",
diff --git a/tests/fixtures/golden-install-parity/cline.json b/tests/fixtures/golden-install-parity/cline.json
index 60e673e07..e4dcdab31 100644
--- a/tests/fixtures/golden-install-parity/cline.json
+++ b/tests/fixtures/golden-install-parity/cline.json
@@ -295,7 +295,7 @@
   "gsd-core/workflows/settings-advanced.md": "69f3a19bf2c61160",
   "gsd-core/workflows/settings-integrations.md": "76eee76d6eb57657",
   "gsd-core/workflows/settings.md": "3701faed09d55247",
-  "gsd-core/workflows/ship.md": "42cf1a25d1652a05",
+  "gsd-core/workflows/ship.md": "baf53afdff3601d4",
   "gsd-core/workflows/sketch-wrap-up.md": "1f44789553180d84",
   "gsd-core/workflows/sketch.md": "2226779b6003a71c",
   "gsd-core/workflows/smart-entry.md": "9a64f43927641ca4",
diff --git a/tests/fixtures/golden-install-parity/codebuddy.json b/tests/fixtures/golden-install-parity/codebuddy.json
index eb4a6d098..686f3ca71 100644
--- a/tests/fixtures/golden-install-parity/codebuddy.json
+++ b/tests/fixtures/golden-install-parity/codebuddy.json
@@ -363,7 +363,7 @@
   "gsd-core/workflows/settings-advanced.md": "414db4dbea97ba44",
   "gsd-core/workflows/settings-integrations.md": "70515c5838fb9826",
   "gsd-core/workflows/settings.md": "d96ddf01fb85e61e",
-  "gsd-core/workflows/ship.md": "c21ceab819ebc0b1",
+  "gsd-core/workflows/ship.md": "b377dab2bc92a6e5",
   "gsd-core/workflows/sketch-wrap-up.md": "2aba89ecd8f41a0d",
   "gsd-core/workflows/sketch.md": "5eedd93f9a5b49d5",
   "gsd-core/workflows/smart-entry.md": "449238eb94abe187",
diff --git a/tests/fixtures/golden-install-parity/codex.json b/tests/fixtures/golden-install-parity/codex.json
index b0b7d3e32..982238e6f 100644
--- a/tests/fixtures/golden-install-parity/codex.json
+++ b/tests/fixtures/golden-install-parity/codex.json
@@ -398,7 +398,7 @@
   "gsd-core/workflows/settings-advanced.md": "2431433811616f76",
   "gsd-core/workflows/settings-integrations.md": "77730321d3d6d317",
   "gsd-core/workflows/settings.md": "054c8c31b3905ced",
-  "gsd-core/workflows/ship.md": "e2696f899195b1a0",
+  "gsd-core/workflows/ship.md": "b5ac8caee76f3727",
   "gsd-core/workflows/sketch-wrap-up.md": "07724a390fbb43f6",
   "gsd-core/workflows/sketch.md": "576f300dfdde1b7d",
   "gsd-core/workflows/smart-entry.md": "6f686195ae531b03",
diff --git a/tests/fixtures/golden-install-parity/copilot.json b/tests/fixtures/golden-install-parity/copilot.json
index 88f1e9d87..8415db66f 100644
--- a/tests/fixtures/golden-install-parity/copilot.json
+++ b/tests/fixtures/golden-install-parity/copilot.json
@@ -293,7 +293,7 @@
   "gsd-core/workflows/settings-advanced.md": "230a658de9c017a6",
   "gsd-core/workflows/settings-integrations.md": "a1d146d6bfd14db5",
   "gsd-core/workflows/settings.md": "f611f14f2f447f1e",
-  "gsd-core/workflows/ship.md": "e38a49d94f313286",
+  "gsd-core/workflows/ship.md": "dc4ac0166a559f98",
   "gsd-core/workflows/sketch-wrap-up.md": "f2590cb6ddbfad94",
   "gsd-core/workflows/sketch.md": "e2063966439af8c1",
   "gsd-core/workflows/smart-entry.md": "6c707b959a41900b",
diff --git a/tests/fixtures/golden-install-parity/cursor.json b/tests/fixtures/golden-install-parity/cursor.json
index 65d49ae7c..0fe790b15 100644
--- a/tests/fixtures/golden-install-parity/cursor.json
+++ b/tests/fixtures/golden-install-parity/cursor.json
@@ -363,7 +363,7 @@
   "gsd-core/workflows/settings-advanced.md": "bf8ea69c8f7ae019",
   "gsd-core/workflows/settings-integrations.md": "166ca51b1f33c2a3",
   "gsd-core/workflows/settings.md": "0623c673eaf04799",
-  "gsd-core/workflows/ship.md": "037be3e1598fb3b2",
+  "gsd-core/workflows/ship.md": "8a2504f02df7529d",
   "gsd-core/workflows/sketch-wrap-up.md": "5be73b7bdf96b539",
   "gsd-core/workflows/sketch.md": "373bc0d83368a411",
   "gsd-core/workflows/smart-entry.md": "c8fc316358cdcd7b",
diff --git a/tests/fixtures/golden-install-parity/hermes.json b/tests/fixtures/golden-install-parity/hermes.json
index 99151e8be..84aaff76c 100644
--- a/tests/fixtures/golden-install-parity/hermes.json
+++ b/tests/fixtures/golden-install-parity/hermes.json
@@ -292,7 +292,7 @@
   "gsd-core/workflows/settings-advanced.md": "49be159144d7f426",
   "gsd-core/workflows/settings-integrations.md": "1dce76db0aca08a5",
   "gsd-core/workflows/settings.md": "0845d073009a4619",
-  "gsd-core/workflows/ship.md": "9eef5891f07dec7b",
+  "gsd-core/workflows/ship.md": "f2c98eac4edcd333",
   "gsd-core/workflows/sketch-wrap-up.md": "f1ece50ac65ea281",
   "gsd-core/workflows/sketch.md": "d5887983e62b574a",
   "gsd-core/workflows/smart-entry.md": "47f5c5e8608e5f7a",
diff --git a/tests/fixtures/golden-install-parity/kilo.json b/tests/fixtures/golden-install-parity/kilo.json
index 100828ea5..8fa0f2d67 100644
--- a/tests/fixtures/golden-install-parity/kilo.json
+++ b/tests/fixtures/golden-install-parity/kilo.json
@@ -363,7 +363,7 @@
   "gsd-core/workflows/settings-advanced.md": "edd858cd6cfddaf1",
   "gsd-core/workflows/settings-integrations.md": "3ea8095d5fad891b",
   "gsd-core/workflows/settings.md": "1925ecc2225c2216",
-  "gsd-core/workflows/ship.md": "de464ddc5037eb71",
+  "gsd-core/workflows/ship.md": "8c68f5a43d9fd578",
   "gsd-core/workflows/sketch-wrap-up.md": "888c0548e63197b3",
   "gsd-core/workflows/sketch.md": "34a0c10fa56af7ea",
   "gsd-core/workflows/smart-entry.md": "7ffe4fdb93935400",
diff --git a/tests/fixtures/golden-install-parity/kimi.json b/tests/fixtures/golden-install-parity/kimi.json
index dd19bb5d8..c385bb65d 100644
--- a/tests/fixtures/golden-install-parity/kimi.json
+++ b/tests/fixtures/golden-install-parity/kimi.json
@@ -356,7 +356,7 @@
   "gsd-core/workflows/settings-advanced.md": "414db4dbea97ba44",
   "gsd-core/workflows/settings-integrations.md": "70515c5838fb9826",
   "gsd-core/workflows/settings.md": "d96ddf01fb85e61e",
-  "gsd-core/workflows/ship.md": "c21ceab819ebc0b1",
+  "gsd-core/workflows/ship.md": "b377dab2bc92a6e5",
   "gsd-core/workflows/sketch-wrap-up.md": "b767a1d3db129a8a",
   "gsd-core/workflows/sketch.md": "88cfdf4edcf222ab",
   "gsd-core/workflows/smart-entry.md": "449238eb94abe187",
diff --git a/tests/fixtures/golden-install-parity/opencode.json b/tests/fixtures/golden-install-parity/opencode.json
index 65b7636ec..b287c47cc 100644
--- a/tests/fixtures/golden-install-parity/opencode.json
+++ b/tests/fixtures/golden-install-parity/opencode.json
@@ -363,7 +363,7 @@
   "gsd-core/workflows/settings-advanced.md": "252b0d3edc315339",
   "gsd-core/workflows/settings-integrations.md": "d1711a95f44fdbde",
   "gsd-core/workflows/settings.md": "2e42ee34c791378a",
-  "gsd-core/workflows/ship.md": "61e695596f2dd605",
+  "gsd-core/workflows/ship.md": "3a80ea841f0a81b9",
   "gsd-core/workflows/sketch-wrap-up.md": "681800323681c5c6",
   "gsd-core/workflows/sketch.md": "fcb7af914159ef7b",
   "gsd-core/workflows/smart-entry.md": "2a253fe437496eea",
diff --git a/tests/fixtures/golden-install-parity/pi.json b/tests/fixtures/golden-install-parity/pi.json
index 4e20fdcb7..b5e383e74 100644
--- a/tests/fixtures/golden-install-parity/pi.json
+++ b/tests/fixtures/golden-install-parity/pi.json
@@ -259,7 +259,7 @@
   "gsd-core/workflows/settings-advanced.md": "414db4dbea97ba44",
   "gsd-core/workflows/settings-integrations.md": "70515c5838fb9826",
   "gsd-core/workflows/settings.md": "d96ddf01fb85e61e",
-  "gsd-core/workflows/ship.md": "c21ceab819ebc0b1",
+  "gsd-core/workflows/ship.md": "b377dab2bc92a6e5",
   "gsd-core/workflows/sketch-wrap-up.md": "838c701bd072ae73",
   "gsd-core/workflows/sketch.md": "c7725562b3efd311",
   "gsd-core/workflows/smart-entry.md": "449238eb94abe187",
diff --git a/tests/fixtures/golden-install-parity/qwen.json b/tests/fixtures/golden-install-parity/qwen.json
index 6fda1d4b9..aa86dd712 100644
--- a/tests/fixtures/golden-install-parity/qwen.json
+++ b/tests/fixtures/golden-install-parity/qwen.json
@@ -292,7 +292,7 @@
   "gsd-core/workflows/settings-advanced.md": "5e05212fb5cba531",
   "gsd-core/workflows/settings-integrations.md": "29c5de27fbbb18e9",
   "gsd-core/workflows/settings.md": "26b9b7979d3a5747",
-  "gsd-core/workflows/ship.md": "0355e5b013141ea2",
+  "gsd-core/workflows/ship.md": "cee31be37b2b6c6a",
   "gsd-core/workflows/sketch-wrap-up.md": "89e0eab2af946b04",
   "gsd-core/workflows/sketch.md": "483387542d6fc3af",
   "gsd-core/workflows/smart-entry.md": "d309710bcabd4675",
diff --git a/tests/fixtures/golden-install-parity/trae.json b/tests/fixtures/golden-install-parity/trae.json
index eafe76c1b..0c8dc9d27 100644
--- a/tests/fixtures/golden-install-parity/trae.json
+++ b/tests/fixtures/golden-install-parity/trae.json
@@ -292,7 +292,7 @@
   "gsd-core/workflows/settings-advanced.md": "39e66386f6c48025",
   "gsd-core/workflows/settings-integrations.md": "f8f756709ec02363",
   "gsd-core/workflows/settings.md": "44b10c59215633b8",
-  "gsd-core/workflows/ship.md": "1cc331019d77ec6b",
+  "gsd-core/workflows/ship.md": "da81bf2515257822",
   "gsd-core/workflows/sketch-wrap-up.md": "dbec602d104cb951",
   "gsd-core/workflows/sketch.md": "44ff275150b6d045",
   "gsd-core/workflows/smart-entry.md": "d8018578571f08d5",
diff --git a/tests/fixtures/golden-install-parity/windsurf.json b/tests/fixtures/golden-install-parity/windsurf.json
index 658664115..81e426051 100644
--- a/tests/fixtures/golden-install-parity/windsurf.json
+++ b/tests/fixtures/golden-install-parity/windsurf.json
@@ -292,7 +292,7 @@
   "gsd-core/workflows/settings-advanced.md": "2f86ec7b998f9485",
   "gsd-core/workflows/settings-integrations.md": "b082fc518b484c07",
   "gsd-core/workflows/settings.md": "002eb0ce3c10c741",
-  "gsd-core/workflows/ship.md": "baa55afeba93c687",
+  "gsd-core/workflows/ship.md": "bce39010f9518cf3",
   "gsd-core/workflows/sketch-wrap-up.md": "10063f56c2c7f141",
   "gsd-core/workflows/sketch.md": "25c1f8f7acfb1da9",
   "gsd-core/workflows/smart-entry.md": "bd81482cb6a7ac53",
diff --git a/tests/fixtures/golden-install-parity/zcode.json b/tests/fixtures/golden-install-parity/zcode.json
index b35da0388..f10a04ba9 100644
--- a/tests/fixtures/golden-install-parity/zcode.json
+++ b/tests/fixtures/golden-install-parity/zcode.json
@@ -363,7 +363,7 @@
   "gsd-core/workflows/settings-advanced.md": "414db4dbea97ba44",
   "gsd-core/workflows/settings-integrations.md": "70515c5838fb9826",
   "gsd-core/workflows/settings.md": "d96ddf01fb85e61e",
-  "gsd-core/workflows/ship.md": "c21ceab819ebc0b1",
+  "gsd-core/workflows/ship.md": "b377dab2bc92a6e5",
   "gsd-core/workflows/sketch-wrap-up.md": "86db87b16548117e",
   "gsd-core/workflows/sketch.md": "e96f1866d3e60cab",
   "gsd-core/workflows/smart-entry.md": "449238eb94abe187",
diff --git a/tests/workflow-size-baseline.json b/tests/workflow-size-baseline.json
index d5a2d0243..9e337bb6b 100644
--- a/tests/workflow-size-baseline.json
+++ b/tests/workflow-size-baseline.json
@@ -71,7 +71,7 @@
   "settings-advanced.md": 40019,
   "settings-integrations.md": 15892,
   "settings.md": 33467,
-  "ship.md": 25107,
+  "ship.md": 25222,
   "sketch-wrap-up.md": 14267,
   "sketch.md": 20004,
   "smart-entry.md": 11124,