refactor(copier): drop install_gh / install_glab questions

Always install gh and glab when add_claude is on. The base image will
ship them on Ubuntu 26.04, at which point the Dockerfile install blocks
can be dropped wholesale; in the meantime, having them unconditional
removes two questions and the matching jinja gating across the
Dockerfile, devcontainer.json, postStart.sh and justfile.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: gilesknap

copier.yml

@@ -121,22 +121,6 @@ add_claude:
         the container, mounts ~/.claude from the host, installs Claude Code
         CLI, and enables `--dangerously-skip-permissions` autopilot mode.
 
-install_gh:
-    type: bool
-    when: "{{ add_claude }}"
-    help: |
-        Install the GitHub CLI (gh) so Claude can push/pull via PAT auth?
-        Only useful inside the Claude sandbox — ordinary users typically
-        rely on SSH keys or VS Code git credentials.
-
-install_glab:
-    type: bool
-    when: "{{ add_claude }}"
-    help: |
-        Install the GitLab CLI (glab) for projects that talk to a GitLab
-        instance (e.g. gitlab.diamond.ac.uk submodules)?
-        Only useful inside the Claude sandbox.
-
 docs_type:
     type: str
     help: |

example-answers.yml

@@ -8,8 +8,6 @@ distribution_name: dls-python-copier-template-example
 docker: true
 docker_debug: true
 add_claude: true
-install_gh: true
-install_glab: true
 docs_type: sphinx
 git_platform: github.com
 github_org: DiamondLightSource

template/.devcontainer/devcontainer.json.jinja

@@ -79,19 +79,19 @@
             "source": "devcontainer-shared-cache",
             "target": "/cache",
             "type": "volume"
-        }{% if install_gh %},
+        }{% if add_claude %},
         // Persist gh auth across container rebuilds with per-repo scoped PAT
         {
             "source": "gh-auth-${localWorkspaceFolderBasename}",
             "target": "/root/.config/gh",
             "type": "volume"
-        }{% endif %}{% if install_glab %},
+        },
         // Persist glab auth across container rebuilds (GitLab CLI)
         {
             "source": "glab-auth-${localWorkspaceFolderBasename}",
             "target": "/root/.config/glab-cli",
             "type": "volume"
-        }{% endif %}{% if add_claude %},
+        },
         // Mount Claude config from host (settings, memory, skills)
         {
             "source": "${localEnv:HOME}/.claude",

template/.devcontainer/{% if add_claude %}postStart.sh{% endif %}.jinja

@@ -12,9 +12,7 @@ set -euo pipefail
 for scope in --system --global; do
     git config $scope --unset-all credential.helper 2>/dev/null || true
     git config $scope --unset-all credential.https://github.com.helper 2>/dev/null || true
-{%- if install_glab %}
     git config $scope --unset-all credential.https://gitlab.diamond.ac.uk.helper 2>/dev/null || true
-{%- endif %}
     git config $scope --unset-all url.ssh://git@github.com/.insteadOf 2>/dev/null || true
 done
 
@@ -28,11 +26,8 @@ rm -f /tmp/vscode-remote-containers-*.js
 # handle auth. This keeps the container SSH-key-free (Claude stays sandboxed)
 # while still allowing push/pull on repos whose remotes are set to git@...:.
 git config --global url."https://github.com/".insteadOf "git@github.com:"
-{%- if install_glab %}
 git config --global url."https://gitlab.diamond.ac.uk/".insteadOf "git@gitlab.diamond.ac.uk:"
-{%- endif %}
 
-{% if install_gh -%}
 # Pin per-host helper to the in-container gh path. The host gitconfig may
 # reference /usr/local/bin/gh which doesn't exist here (apt installs to
 # /usr/bin/gh); without this, git falls through to the next helper.
@@ -45,10 +40,8 @@ fi
 if gh auth status &>/dev/null; then
     gh auth setup-git
 fi
-{%- endif %}
-{% if install_glab %}
+
 # Pin per-host helper to the in-container glab path.
 if command -v glab >/dev/null; then
     git config --global credential.https://gitlab.diamond.ac.uk.helper "!$(command -v glab) auth git-credential"
 fi
-{%- endif %}

template/Dockerfile.jinja

@@ -9,31 +9,26 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
 
 # Node is required by Claude Code's hook runtime; just powers the
 # container's claude/gh-auth/glab-auth recipes in justfile.
-# TODO: nodejs (and gh / glab below) will move into the
-# ubuntu-devcontainer base image once it ships on Ubuntu 26.04, where
-# all three are available from apt at sufficient versions. At that
-# point this block and the install_gh / install_glab copier options
-# can be dropped.
+# TODO: nodejs, just, gh and glab will move into the ubuntu-devcontainer
+# base image once it ships on Ubuntu 26.04, where all are available
+# from apt at sufficient versions. At that point these blocks can be
+# dropped.
 RUN apt-get update -y && apt-get install -y --no-install-recommends \
     nodejs \
     just \
-    && apt-get dist-clean{% endif %}{% if install_gh %}
+    && apt-get dist-clean
 
 # GitHub CLI — used by Claude to authenticate to github.com via PAT.
-# TODO: drop once the ubuntu-devcontainer base ships on Ubuntu 26.04
-# (apt has gh 2.46.0-4 there).
 RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | \
     dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
     chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg && \
     echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" \
         | tee /etc/apt/sources.list.d/github-cli.list > /dev/null && \
     apt-get update && apt-get install -y --no-install-recommends gh && \
-    apt-get dist-clean{% endif %}{% if install_glab %}
+    apt-get dist-clean
 
 # GitLab CLI — used by Claude to authenticate to gitlab instances via PAT.
 # No apt repo, so install from the upstream release tarball.
-# TODO: drop once the ubuntu-devcontainer base ships on Ubuntu 26.04
-# (apt has glab 1.53.0-1build1 there).
 ARG GLAB_VERSION=1.93.0
 RUN curl -fsSL "https://gitlab.com/gitlab-org/cli/-/releases/v${GLAB_VERSION}/downloads/glab_${GLAB_VERSION}_linux_amd64.tar.gz" \
       | tar -xz -C /tmp bin/glab && \

template/{% if add_claude %}justfile{% endif %}.jinja

@@ -1,6 +1,6 @@
 # Start Claude Code in sandbox mode (no SSH agent, skip permission prompts)
 claude:
-    SSH_AUTH_SOCK= IS_SANDBOX=1 VSCODE_GIT_IPC_HANDLE= GIT_ASKPASS= claude --dangerously-skip-permissions{% if install_gh %}
+    SSH_AUTH_SOCK= IS_SANDBOX=1 VSCODE_GIT_IPC_HANDLE= GIT_ASKPASS= claude --dangerously-skip-permissions
 
 
 # Authenticate gh CLI with a GitHub PAT (token not stored in shell history)
@@ -10,7 +10,7 @@ gh-auth:
     echo "$t" | gh auth login --with-token
     unset t
     gh auth setup-git
-    gh auth status{% endif %}{% if install_glab %}
+    gh auth status
 
 
 # Authenticate glab CLI with a GitLab PAT (token not stored in shell history).
@@ -20,4 +20,4 @@ glab-auth hostname="gitlab.com":
     read -sp "GitLab PAT for {{ '{{' }} hostname {{ '}}' }}: " t && echo
     echo "$t" | glab auth login --stdin --hostname {{ '{{' }} hostname {{ '}}' }} --git-protocol https
     unset t
-    glab auth status{% endif %}
+    glab auth status

tests/test_example.py

@@ -215,8 +215,6 @@ def test_meta_matches_no_claude_template(tmp_path: Path):
     copy_project(
         tmp_path,
         add_claude=False,
-        install_gh=False,
-        install_glab=False,
         docker=False,
         docker_debug=False,
     )