Browser-based graphical shell and control plane for a Linux server you own — real terminal, file manager, live metrics and BYOK AI in one mobile-first workspace. Next.js 16 · React 19 · node-pty · Tailwind v4 · shadcn/ui. Public alpha, self-hosted.
TypeScript browser-shellcontrol-planefile-managerhomelabmobile-firstnextjsptyreactself-hostedserver-managementshadcn-uisysadmintailwindcssterminaltypescriptvpsweb-desktopweb-terminal
fix(ship): amend on retry, and collapse a repeated subject in the changelog
Rahman966ac8f78a9d
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.mdindex b83db0d7..88b6c27d 100644--- a/docs/CHANGELOG.md+++ b/docs/CHANGELOG.md@@ -8,12 +8,12 @@ this is the *what*, and it is what Settings → About shows as “What's new”.**Added**-- `ship` one command that changelogs, pushes, rebuilds and verifies- `ship` one command that changelogs, pushes, rebuilds and verifies- `shells` Windows/iOS/Android to their 2026 specs, plus a backup for local state**Fixed**+- `ship` amend on retry, and collapse a repeated subject in the changelog- `ai` Codex DOES do tool calling — implement it instead of announcing it cannot- `pwa,chat` notch clearance, a doubled iOS inset, and an assistant that was lyingdiff --git a/scripts/gen-changelog.mjs b/scripts/gen-changelog.mjsindex 43e161e8..2a52251f 100644--- a/scripts/gen-changelog.mjs+++ b/scripts/gen-changelog.mjs@@ -60,6 +60,23 @@ for (const line of RAW.split("\n").filter(Boolean)) {byDay.get(date).push({ hash, type, scope: m?.[2] ?? "", subject: m?.[3] ?? subject ?? "" });}+// Collapse identical (type, scope, subject) within a day. A retried ship, a+// squash-that-was-not, or a revert-and-reapply all leave the same subject in+// history twice — and this file having listed one change twice is what surfaced+// it. History keeps both commits; the reader does not need to see both.+for (const [date, list] of byDay) {+ const seen = new Set();+ byDay.set(+ date,+ list.filter((c) => {+ const key = `${c.type}\u0000${c.scope}\u0000${c.subject}`;+ if (seen.has(key)) return false;+ seen.add(key);+ return true;+ }),+ );+}+const days = [...byDay.keys()].sort().reverse().slice(0, MAX_DAYS);const out = ["# Changelog",diff --git a/scripts/ship.sh b/scripts/ship.shindex aac65d4e..81c47855 100755--- a/scripts/ship.sh+++ b/scripts/ship.sh@@ -28,11 +28,21 @@ MSG="${1:-}"echo "▶ 1/5 commit"git add -A-if git diff --cached --quiet; then+# A failed push leaves the commit behind — the gates run AFTER it. Re-running with+# the same message would then stack a duplicate, which is exactly what happened the+# first time this script ran: two identical subjects, and the changelog listed the+# change twice. Amend instead, but ONLY when HEAD is unpushed and carries the same+# subject, so this can never rewrite something already on origin.+AMEND=""+if [ "$(git rev-parse HEAD)" != "$(git rev-parse origin/main 2>/dev/null || echo none)" ] && [ "$(git log -1 --format=%s)" = "$(printf '%s' "$MSG" | head -1)" ]; then+ echo " HEAD is an unpushed commit with this subject — amending rather than duplicating"+ AMEND="--amend"+fi+if [ -z "$AMEND" ] && git diff --cached --quiet; thenecho " nothing staged — skipping commit"COMMITTED=0else- git commit -q -m "$MSG"+ git commit -q $AMEND -m "$MSG"COMMITTED=1fi