2e5af5dc0e
Non-admins (emo) need current master without manual pulls. Two layers: - t3-provision-users reconcile gains refresh_locked_clone: fetch all remotes + ff-only master, guarded (on master, clean tree, upstream set); dirty/diverged clones are left alone with a WARN. - start-claude.sh freshens ~/code at session launch, 15s-capped so an offline remote never delays the session. Verified live on emo's clone: stale clone ff'd to tip by the reconciler; launcher snippet ff's when clean and refuses while a dirty file exists. Deployed to /usr/local/bin/t3-provision-users, /etc/skel/start-claude.sh, and emo's launcher. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
57 lines
2.4 KiB
Bash
Executable file
57 lines
2.4 KiB
Bash
Executable file
#!/bin/bash
|
|
# Per-user Claude Code Workstation launcher (devvm). Lands the user in their OWN
|
|
# ~/code clone (NOT a hardcoded /home/wizard/code) and names the Claude session
|
|
# after the tmux session so /resume, the prompt box, and the terminal title line
|
|
# up. Deployed via /etc/skel by setup-devvm.sh, so new accounts get it on
|
|
# `useradd -m`. Existing users are repointed to this during their migration.
|
|
echo ""
|
|
echo " Welcome, $(id -un)! 🚀"
|
|
echo ""
|
|
echo " Starting Claude Code in $HOME/code ..."
|
|
echo " (Right-click for tmux menu, or Ctrl+B then | or - to split)"
|
|
echo ""
|
|
|
|
name_args=()
|
|
if [ -n "${TMUX:-}" ]; then
|
|
sess="$(tmux display-message -p '#{session_name}' 2>/dev/null)"
|
|
[ -n "$sess" ] && name_args=(--name "$sess")
|
|
fi
|
|
|
|
cd "$HOME/code" 2>/dev/null || cd "$HOME"
|
|
|
|
# Freshen ~/code at session start so the user begins on current upstream state
|
|
# (the hourly t3-provision-users reconcile does the same in the background).
|
|
# Fast-forward only, and only when safe (on master + clean tree); hard 15s cap so
|
|
# an offline remote never stalls the launch. No-op for repos without remotes.
|
|
if [ -d "$HOME/code/.git" ]; then
|
|
GIT_TERMINAL_PROMPT=0 timeout 15 git -C "$HOME/code" fetch --all --prune --quiet 2>/dev/null || true
|
|
if [ "$(git -C "$HOME/code" symbolic-ref --short -q HEAD)" = master ] \
|
|
&& [ -z "$(git -C "$HOME/code" status --porcelain 2>/dev/null)" ] \
|
|
&& git -C "$HOME/code" rev-parse --verify -q 'master@{upstream}' >/dev/null 2>&1; then
|
|
git -C "$HOME/code" merge --ff-only 'master@{upstream}' >/dev/null 2>&1 || true
|
|
fi
|
|
fi
|
|
|
|
# Prefer the system-wide `claude` (installed by setup-devvm.sh); fall back to npx.
|
|
launch() {
|
|
if command -v claude >/dev/null 2>&1; then
|
|
claude "$@"
|
|
else
|
|
npx @anthropic-ai/claude-code "$@"
|
|
fi
|
|
}
|
|
|
|
# Deliberately not `exec` so we can branch on the exit code: clean quit ends the
|
|
# pane (ttyd closes the terminal); a crash drops to a shell so the tmux session
|
|
# isn't destroyed-and-recreated in a ttyd auto-reconnect loop.
|
|
# No --model flag: inherit the org-wide default from /etc/claude-code/managed-settings.json
|
|
# (an explicit --model would override that managed default for every launched session).
|
|
launch --dangerously-skip-permissions "${name_args[@]}"
|
|
code=$?
|
|
[ "$code" -eq 0 ] && exit 0
|
|
|
|
echo ""
|
|
echo " claude exited abnormally (status $code). Dropping to a shell — your tmux session is preserved."
|
|
echo " Re-launch any time with: ~/start-claude.sh"
|
|
echo ""
|
|
exec "${SHELL:-/bin/bash}" -l
|