Clarify tag-letter convention: suffix is build ordinal, 'a' is never used

Previous phrasing treated the letter suffix as a plain alphabetical sequence, which led to confusion about whether the first rebuild should be 'a' or 'b'. Spell out the intent: the suffix is the build ordinal, and the letter 'a' is reserved to mean '1st build' — which always uses the bare tag (no letter). So letters start at 'b' for the 2nd build, 'c' for the 3rd, and so on. Examples for opencode version 1.14.20: 1st build: v1.14.20 2nd build: v1.14.20b 3rd build: v1.14.20c
Fix [devbox] prompt marker disappearing after 'exec bash'
2026-04-21 23:58:12 +02:00 · 2026-04-21 23:52:03 +02:00 · 2026-04-21 21:16:47 +02:00 · 2026-04-21 21:05:20 +02:00
3 changed files with 31 additions and 10 deletions
@@ -15,7 +15,16 @@ Docker image packaging [opencode](https://opencode.ai) into a production-ready d

 ## Versioning scheme

-Tags follow `v{opencode_version}{letter}` — e.g. `v1.4.3k`. The number matches the opencode npm version. The letter suffix increments for container-level changes (tooling, docs, CVE fixes) on the same opencode version. CI produces four Docker Hub tags per release: `vX.Y.Zn`, `latest`, `vX.Y.Zn-omos`, `latest-omos`.
+Tags follow `v{opencode_version}[letter]` — e.g. `v1.14.20` for the first build on a new opencode release, and `v1.14.20b`, `v1.14.20c`, … for subsequent rebuilds on the same opencode version.
+
+- The number tracks the opencode npm version (see `OPENCODE_VERSION` ARG in `Dockerfile`).
+- **No letter suffix** on the first build of a new opencode version — the bare `v{opencode_version}` tag is the canonical release.
+- **Letter suffix is the build ordinal**, starting at `b` for the second build. The letter `a` is **never used** — think of the suffix as counting rebuilds: `b = 2nd, c = 3rd, d = 4th, …`. For opencode version `1.14.20`: first build `v1.14.20`, second `v1.14.20b`, third `v1.14.20c`, and so on.
+- A letter suffix is only used for container-level rebuilds — tooling changes, CVE fixes, doc-driven rebuilds, entrypoint bugfixes — that don't change the underlying opencode version.
+
+CI produces four Docker Hub tags per release: `vX.Y.Z[n]`, `latest`, `vX.Y.Z[n]-omos`, `latest-omos`.
+
+When bumping the opencode version, also bump `OPENCODE_VERSION` in `Dockerfile` and update the comment in `.env.example` if it names a specific model/version for context.

 ## Critical conventions

@@ -5,7 +5,7 @@ ARG DEBIAN_VERSION=trixie-slim
 FROM debian:${DEBIAN_VERSION} AS base

 ARG TARGETARCH
-ARG OPENCODE_VERSION=1.14.19
+ARG OPENCODE_VERSION=1.14.20

 LABEL maintainer="joakimp"
 LABEL description="Portable opencode developer container"
@@ -16,12 +16,11 @@ export HISTCONTROL=ignoreboth:erasedups
 export HISTTIMEFORMAT='%F %T  '
 shopt -s histappend 2>/dev/null
 shopt -s cmdhist 2>/dev/null
-# Flush every command to disk immediately so reboots don't lose recent work.
-# Guarded so repeated sourcing (e.g. `exec bash`) doesn't stack duplicates.
-if [ -z "${DEVBOX_HIST_SET:-}" ]; then
-  PROMPT_COMMAND="history -a; ${PROMPT_COMMAND:-}"
-  export DEVBOX_HIST_SET=1
-fi
+# Note: PROMPT_COMMAND="history -a" is installed LATER in this file,
+# after zoxide's init runs. Installing it here would create a
+# "history -a;;__zoxide_hook" chain because zoxide's init uses ';'
+# as its separator and prepends itself; two adjacent ';' breaks the
+# parser. See https://github.com/ajeetdsouza/zoxide/issues/722.

 # ── Common aliases ───────────────────────────────────────────────────
 # Prefer eza (modern ls) when available
@@ -65,9 +64,22 @@ if command -v fzf >/dev/null 2>&1; then
  eval "$(fzf --bash)" 2>/dev/null || true
 fi

+# ── PROMPT_COMMAND: flush history every prompt ───────────────────────
+# Installed AFTER zoxide init so zoxide's hook is already in place;
+# we append with a newline separator to avoid the ';;' parse error
+# described at the top of this file. Guarded so repeated sourcing
+# (e.g. `exec bash`) doesn't stack duplicates.
+if [ -z "${DEVBOX_HIST_SET:-}" ]; then
+  PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND$'\n'}history -a"
+  export DEVBOX_HIST_SET=1
+fi
+
 # ── Prompt: show [opencode-devbox] tag so it's obvious you're in the container
 # Preserves the default Debian PS1 logic but prefixes with a container marker.
-if [ -n "${PS1:-}" ] && [ -z "${DEVBOX_PS1_SET:-}" ]; then
+# We check for the literal '[devbox]' substring in PS1 rather than relying on
+# an exported guard variable — otherwise `exec bash` inherits the guard but
+# gets a fresh (prefix-less) PS1 from .bashrc, and the prefix would never be
+# re-added in the new shell.
+if [ -n "${PS1:-}" ] && [[ "$PS1" != *"[devbox]"* ]]; then
  PS1='\[\e[38;5;39m\][devbox]\[\e[0m\] '"${PS1}"
-  export DEVBOX_PS1_SET=1
 fi
Author	SHA1	Message	Date
joakimp	c851b4cc8d	Clarify tag-letter convention: suffix is build ordinal, 'a' is never used Publish Docker Image / build-omos (push) Successful in 43m57s Details Publish Docker Image / build-base (push) Successful in 45m46s Details Publish Docker Image / update-description (push) Successful in 16s Details Previous phrasing treated the letter suffix as a plain alphabetical sequence, which led to confusion about whether the first rebuild should be 'a' or 'b'. Spell out the intent: the suffix is the build ordinal, and the letter 'a' is reserved to mean '1st build' — which always uses the bare tag (no letter). So letters start at 'b' for the 2nd build, 'c' for the 3rd, and so on. Examples for opencode version 1.14.20: 1st build: v1.14.20 2nd build: v1.14.20b 3rd build: v1.14.20c	2026-04-21 23:58:12 +02:00
joakimp	9bb93025f0	Fix [devbox] prompt marker disappearing after 'exec bash' The previous guard used an exported DEVBOX_PS1_SET env var to avoid double-prefixing on re-source. But env vars survive 'exec bash' while PS1 does not — a new bash rebuilds PS1 from .bashrc. Result: the guard saw DEVBOX_PS1_SET=1, skipped the prefix, and the new shell ran with bare PS1 (no [devbox] marker). Replace the env-var guard with a substring check on PS1 itself. If PS1 already contains '[devbox]' we skip, otherwise we prepend. Correct in all three cases: first shell (PS1 has no marker → add), exec bash (fresh PS1 has no marker → add), re-source within same shell (PS1 still has marker → skip, no doubling).	2026-04-21 23:52:03 +02:00
joakimp	c05ec7503c	Bump opencode to 1.14.20 and clarify versioning convention Publish Docker Image / build-omos (push) Successful in 44m59s Details Publish Docker Image / build-base (push) Successful in 45m10s Details Publish Docker Image / update-description (push) Successful in 16s Details Bump OPENCODE_VERSION ARG from 1.14.19 to 1.14.20 to track the new upstream release on npm. Clarify the tagging convention in AGENTS.md: the first build on a new opencode version uses the bare 'v{opencode_version}' tag (no letter suffix). Letter suffixes (a, b, c, ...) are reserved for container- level rebuilds on the same opencode version (CVE fixes, doc changes, entrypoint bugs). The previous wording implied a letter was always required, which was never the actual behaviour.	2026-04-21 21:16:47 +02:00
joakimp	84b5ed4412	Fix PROMPT_COMMAND collision with zoxide causing ';;' parse error Publish Docker Image / update-description (push) Has been cancelled Details Publish Docker Image / build-base (push) Has been cancelled Details Publish Docker Image / build-omos (push) Has been cancelled Details v1.14.19c installed 'history -a; ' at the start of PROMPT_COMMAND before zoxide's init ran. Zoxide's init uses ';' as its separator when prepending __zoxide_hook, producing 'history -a;;__zoxide_hook'. Every interactive prompt then emitted: bash: PROMPT_COMMAND: syntax error near unexpected token ';;' History flushing still worked (the 'history -a' half parsed fine), but the error spam made the shell feel broken. Fix by moving the history-flush PROMPT_COMMAND assignment AFTER zoxide's init, and using a newline separator (via ${PROMPT_COMMAND:+...} parameter expansion) so there's no semicolon involved at all. Each PROMPT_COMMAND line runs as its own statement, no parsing contention. Known upstream issue: https://github.com/ajeetdsouza/zoxide/issues/722	2026-04-21 21:05:20 +02:00