Skip to content

fix: unset PKG_EXECPATH and stale broker token vars in startup-cleanup #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benvinegar merged 1 commit into from
Feb 24, 2026
Merged

fix: unset PKG_EXECPATH and stale broker token vars in startup-cleanup #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions pi/skills/control-agent/startup-cleanup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@

set -euo pipefail

# Prevent varlock SEA binary from misinterpreting argv when called from a
# session that was itself launched via varlock (PKG_EXECPATH leaks into child
# processes and causes `varlock run` to treat subcommands as Node module paths).
unset PKG_EXECPATH 2>/dev/null || true

BRIDGE_POLICY_HELPER="$HOME/runtime/bin/lib/bridge-restart-policy.sh"
if [ -r "$BRIDGE_POLICY_HELPER" ]; then
# shellcheck source=bin/lib/bridge-restart-policy.sh
Expand Down Expand Up @@ -140,6 +145,16 @@ echo "Starting slack-bridge ($BRIDGE_SCRIPT) with PI_SESSION_ID=$MY_UUID..."
mkdir -p "$BRIDGE_LOG_DIR"
(
unset PKG_EXECPATH
# Clear ALL varlock-managed env vars inherited from the parent session.
# varlock run does not override vars already set in the environment, so
# stale values (e.g. expired broker tokens) would leak through. By unsetting
# every key varlock manages, we guarantee varlock run injects fresh values
# from ~/.config/.env on every bridge restart.
if command -v varlock >/dev/null 2>&1; then
while IFS='=' read -r key _; do
[ -n "$key" ] && unset "$key"
done < <(varlock load --path "$HOME/.config/" --format env --compact 2>/dev/null)
fi
export PATH="$HOME/.varlock/bin:$HOME/opt/node/bin:$PATH"
export PI_SESSION_ID="$MY_UUID"
cd /opt/baudbot/current/slack-bridge
Expand Down