Skip to content

feat: add trap cleanup for all mktemp temp files (t135.9) #801

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

Closed
marcusquinn wants to merge 2 commits into from
Closed

feat: add trap cleanup for all mktemp temp files (t135.9) #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ece0554
feat: add trap cleanup for temp files across 13 scripts (t135.9)
marcusquinn Feb 9, 2026
94cfc1c
feat: add trap cleanup for remaining mktemp usages (t135.9)
marcusquinn Feb 9, 2026
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
1 change: 1 addition & 0 deletions .agents/scripts/_archive/add-missing-returns.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ add_returns_to_file() {
local file="$1"
local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
local changes_made=0

print_info "Processing: $file"
Expand Down
1 change: 1 addition & 0 deletions .agents/scripts/_archive/fix-common-strings.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ fix_common_strings_in_file() {
local backup_file="${file}.backup"
local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
local changes_made=0

print_info "Processing: $file"
Expand Down
1 change: 1 addition & 0 deletions .agents/scripts/_archive/fix-s131-default-cases.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ add_default_case() {
# Create temp file and insert default case
local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN

head -n $((esac_line - 1)) "$file" > "$temp_file"
{
Expand Down
1 change: 1 addition & 0 deletions .agents/scripts/_archive/fix-sc2155-simple.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ fix_sc2155_simple() {
local file="$1"
local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
local changes_made=0

print_info "Processing: $file"
Expand Down
2 changes: 2 additions & 0 deletions .agents/scripts/_archive/fix-shellcheck-critical.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ fix_sc2155_in_file() {
local file="$1"
local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
local changes_made=0

# Create backup
Expand Down Expand Up @@ -70,6 +71,7 @@ fix_sc2181_in_file() {
local file="$1"
local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
local changes_made=0

# Fix common SC2181 patterns
Expand Down
2 changes: 2 additions & 0 deletions .agents/scripts/_archive/fix-string-literals.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ analyze_repeated_strings() {

local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN

# Find all shell files and extract string literals
find "$target_dir" -name "*.sh" -type f | while read -r file; do
Expand Down Expand Up @@ -89,6 +90,7 @@ create_string_constants() {

local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
local constants_added=0
local replacements_made=0

Expand Down
1 change: 1 addition & 0 deletions .agents/scripts/add-skill-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ register_skill() {
log_info "Updating existing skill registration: $name"
local tmp_file
tmp_file=$(mktemp)
trap 'rm -f "$tmp_file"' RETURN
jq --arg name "$name" '.skills = [.skills[] | select(.name != $name)]' "$SKILL_SOURCES" > "$tmp_file" && mv "$tmp_file" "$SKILL_SOURCES"
rm -f "$tmp_file"
Copy link

@gemini-code-assist gemini-code-assist bot Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The explicit rm -f "$tmp_file" is now redundant. The trap you've added on line 439 will handle the cleanup of the temporary file automatically when the register_skill function exits, regardless of success or failure. You can safely remove this line.

fi
Expand Down
1 change: 1 addition & 0 deletions .agents/scripts/agent-test-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ run_prompt_opencode_cli() {
local stderr_file raw_output
stderr_file=$(mktemp)
raw_output=$(mktemp)
trap 'rm -f "$stderr_file" "$raw_output"' RETURN

local exit_code=0
portable_timeout "${timeout}" "${cmd[@]}" "$prompt" >"$raw_output" 2>"$stderr_file" || {
Expand Down
2 changes: 2 additions & 0 deletions .agents/scripts/coderabbit-collector-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ collect_reviews() {
local jq_filter_file sql_file
jq_filter_file=$(mktemp)
sql_file=$(mktemp)
trap 'rm -f "$jq_filter_file" "$sql_file"' RETURN

cat > "$jq_filter_file" << 'JQ_EOF'
def sql_str: gsub("'"; "''") | "'" + . + "'";
Expand Down Expand Up @@ -451,6 +452,7 @@ collect_comments() {
local jq_filter_file sql_file
jq_filter_file=$(mktemp)
sql_file=$(mktemp)
trap 'rm -f "$jq_filter_file" "$sql_file"' RETURN

cat > "$jq_filter_file" << 'JQ_EOF'
def sql_str: gsub("'"; "''") | "'" + . + "'";
Expand Down
3 changes: 3 additions & 0 deletions .agents/scripts/coderabbit-task-creator-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@ scan_db_findings() {
# Write comments to temp file for process substitution (avoids subshell)
local tmp_file
tmp_file=$(mktemp)
trap 'rm -f "$tmp_file"' RETURN
echo "$comments_json" | jq -c '.[]' > "$tmp_file"

local total=0
Expand Down Expand Up @@ -504,6 +505,7 @@ scan_pulse_findings() {
# Write findings to temp file to avoid subshell variable loss
local tmp_file
tmp_file=$(mktemp)
trap 'rm -f "$tmp_file"' RETURN
jq -c '.findings[]' "$latest_findings" > "$tmp_file"

while IFS= read -r finding; do
Expand Down Expand Up @@ -705,6 +707,7 @@ cmd_create() {
# Write findings to temp file to avoid subshell variable loss
local tmp_create
tmp_create=$(mktemp)
trap 'rm -f "$tmp_create"' RETURN
echo "$findings_json" | jq -c '.[]' > "$tmp_create"

while IFS= read -r finding; do
Expand Down
4 changes: 4 additions & 0 deletions .agents/scripts/cron-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ cmd_add() {
# Add job to config
local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
jq --arg id "$job_id" \
--arg name "$name" \
--arg schedule "$schedule" \
Expand Down Expand Up @@ -359,6 +360,7 @@ cmd_remove() {
# Remove from config
local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
jq --arg id "$job_id" '.jobs = [.jobs[] | select(.id != $id)]' "$CONFIG_FILE" > "$temp_file"
mv "$temp_file" "$CONFIG_FILE"

Expand Down Expand Up @@ -393,6 +395,7 @@ cmd_pause() {
# Update status
local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
jq --arg id "$job_id" '(.jobs[] | select(.id == $id)).status = "paused"' "$CONFIG_FILE" > "$temp_file"
mv "$temp_file" "$CONFIG_FILE"

Expand Down Expand Up @@ -429,6 +432,7 @@ cmd_resume() {
# Update status
local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
jq --arg id "$job_id" '(.jobs[] | select(.id == $id)).status = "active"' "$CONFIG_FILE" > "$temp_file"
mv "$temp_file" "$CONFIG_FILE"

Expand Down
1 change: 1 addition & 0 deletions .agents/scripts/full-loop-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ remove_headless_todo_guard() {
# Use sed to remove the guard block
local tmp_file
tmp_file=$(mktemp)
trap 'rm -f "$tmp_file"' RETURN
awk '/# t173-headless-todo-guard/{skip=1} /^fi$/ && skip{skip=0; next} !skip' "$hook_file" > "$tmp_file"
mv "$tmp_file" "$hook_file"
chmod +x "$hook_file"
Expand Down
4 changes: 4 additions & 0 deletions .agents/scripts/loop-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ loop_set_state() {

local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN

# Determine value type and update
if [[ "$value" =~ ^[0-9]+$ ]]; then
Expand Down Expand Up @@ -522,6 +523,7 @@ EOF

local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
jq ".receipts += [\"$(basename "$receipt_file")\"]" "$LOOP_STATE_FILE" > "$temp_file"
mv "$temp_file" "$LOOP_STATE_FILE"

Expand Down Expand Up @@ -642,6 +644,7 @@ loop_track_attempt() {

local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
jq ".attempts[\"$task_id\"] = $new_attempts" "$LOOP_STATE_FILE" > "$temp_file"
mv "$temp_file" "$LOOP_STATE_FILE"

Expand Down Expand Up @@ -685,6 +688,7 @@ loop_block_task() {

local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
jq ".blocked_tasks += [{\"id\": \"$task_id\", \"reason\": \"$reason\", \"blocked_at\": \"$(date -u +"%Y-%m-%dT%H:%M:%SZ")\"}]" "$LOOP_STATE_FILE" > "$temp_file"
mv "$temp_file" "$LOOP_STATE_FILE"

Expand Down
3 changes: 3 additions & 0 deletions .agents/scripts/matrix-dispatch-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ cmd_setup() {
# Save config
local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
jq -n \
--arg homeserverUrl "$homeserver" \
--arg accessToken "$access_token" \
Expand Down Expand Up @@ -768,6 +769,7 @@ cmd_map() {

local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
jq --arg room "$room_id" --arg runner "$runner_name" \
'.roomMappings[$room] = $runner' "$CONFIG_FILE" > "$temp_file"
mv "$temp_file" "$CONFIG_FILE"
Expand Down Expand Up @@ -799,6 +801,7 @@ cmd_unmap() {

local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
jq --arg room "$room_id" 'del(.roomMappings[$room])' "$CONFIG_FILE" > "$temp_file"
mv "$temp_file" "$CONFIG_FILE"
chmod 600 "$CONFIG_FILE"
Expand Down
1 change: 1 addition & 0 deletions .agents/scripts/objective-runner-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ update_state() {

local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN

# Build jq expression from key=value pairs
local jq_expr="."
Expand Down
3 changes: 3 additions & 0 deletions .agents/scripts/quality-fix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ fix_return_statements() {
# Find functions that don't end with return statement
local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
local in_function=false
local function_name=""
local brace_count=0
Expand Down Expand Up @@ -141,6 +142,7 @@ fix_positional_parameters() {
if [[ -f "$file" ]]; then
local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN


# Process main() functions specifically
Expand Down Expand Up @@ -178,6 +180,7 @@ analyze_string_literals() {

local constants_file
constants_file=$(mktemp)
trap 'rm -f "$constants_file"' RETURN

for file in .agents/scripts/*.sh; do
if [[ -f "$file" ]]; then
Expand Down
1 change: 1 addition & 0 deletions .agents/scripts/ralph-loop-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,7 @@ increment_iteration() {

local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
sed "s/^iteration: .*/iteration: $next_iteration/" "$RALPH_STATE_FILE" > "$temp_file"
mv "$temp_file" "$RALPH_STATE_FILE"

Expand Down
2 changes: 2 additions & 0 deletions .agents/scripts/schema-validator-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,14 @@ install_deps() {
if command_exists jq; then
local tmp
tmp=$(mktemp)
trap 'rm -f "$tmp"' RETURN
jq '. + {"type": "module"}' "$TOOL_DIR/package.json" > "$tmp" && mv "$tmp" "$TOOL_DIR/package.json"
rm -f "$tmp"
Copy link

@gemini-code-assist gemini-code-assist bot Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The explicit rm -f "$tmp" is now redundant. The trap you've added on line 64 will handle the cleanup of the temporary file automatically when the install_deps function exits. You can safely remove this line.

else
# Fallback: write "type": "module" into package.json without jq
local tmp
tmp=$(mktemp)
trap 'rm -f "$tmp"' RETURN
printf '{\n "type": "module",\n' > "$tmp"
# Append everything after the opening brace
tail -n +2 "$TOOL_DIR/package.json" >> "$tmp" && mv "$tmp" "$TOOL_DIR/package.json"
Expand Down
1 change: 1 addition & 0 deletions .agents/scripts/site-crawler-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,7 @@ crawl_with_crawl4ai() {
if [[ ${#batch_urls[@]} -gt 0 ]]; then
local new_queue
new_queue=$(mktemp)
trap 'rm -f "$new_queue"' RETURN
while IFS= read -r queue_url; do
if ! grep -qxF "$queue_url" "$visited_file" 2>/dev/null; then
echo "$queue_url"
Expand Down
1 change: 1 addition & 0 deletions .agents/scripts/sops-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ cmd_install() {
local latest_url="https://github.com/getsops/sops/releases/latest/download/sops_3.9.4_${arch}.deb"
local tmp_deb
tmp_deb=$(mktemp /tmp/sops-XXXXXX.deb)
trap 'rm -f "$tmp_deb"' RETURN
curl -fsSL "$latest_url" -o "$tmp_deb"
sudo dpkg -i "$tmp_deb"
rm -f "$tmp_deb"
Copy link

@gemini-code-assist gemini-code-assist bot Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The explicit rm -f "$tmp_deb" is now redundant. The trap you've added on line 107 will handle the cleanup of the temporary file automatically when the cmd_install function exits. You can safely remove this line.

Expand Down
5 changes: 5 additions & 0 deletions .agents/scripts/supervisor-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3365,6 +3365,7 @@ check_model_health() {
else
local probe_pid probe_tmpfile
probe_tmpfile=$(mktemp)
trap 'rm -f "$probe_tmpfile"' RETURN
("${probe_cmd[@]}" > "$probe_tmpfile" 2>&1) &
Comment on lines 3367 to 3369
Copy link
Contributor

@coderabbitai coderabbitai bot Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Avoid leaking RETURN traps (can break set -u on later returns)

These trap 'rm -f "$tmp"' RETURN lines persist beyond the function, clobber any existing RETURN traps and, with set -u, will later error when the local temp var is out of scope. That can hard-exit the supervisor unexpectedly. Please chain/restore the prior RETURN trap (or clear it) in each block. Apply the same pattern to all newly added mktemp traps.

✅ Suggested pattern (chain + restore the previous RETURN trap) 
-            probe_tmpfile=$(mktemp)
-            trap 'rm -f "$probe_tmpfile"' RETURN
+            local _prev_return_trap
+            _prev_return_trap=$(trap -p RETURN)
+            probe_tmpfile=$(mktemp)
+            trap 'rm -f "$probe_tmpfile"; eval "$_prev_return_trap"' RETURN
@@
-            probe_result=$(cat "$probe_tmpfile" 2>/dev/null || true)
-            rm -f "$probe_tmpfile"
+            probe_result=$(cat "$probe_tmpfile" 2>/dev/null || true)
+            rm -f "$probe_tmpfile"
+            eval "$_prev_return_trap"

Also applies to: 3397-3399, 4374-4376, 7412-7414, 7947-7949

🤖 Prompt for AI Agents 
In @.agents/scripts/supervisor-helper.sh around lines 3367 - 3369, The RETURN
trap for cleaning up mktemp (e.g., probe_tmpfile created before running
("${probe_cmd[@]}" > "$probe_tmpfile" 2>&1) &) is clobbering existing RETURN
traps and will fail with set -u when the temp var goes out of scope; fix by
saving the previous RETURN trap (e.g., prev_trap=$(trap -p RETURN)), installing
a new RETURN trap that removes the temp file and then restores/evaluates the
saved prev_trap (or clears it if empty), and ensure this pattern is applied to
every mktemp/trap pair (probe_tmpfile/probe_cmd and the other mktemp uses noted)
so the original RETURN trap is preserved/restored after cleanup.

probe_pid=$!
local waited=0
Expand Down Expand Up @@ -3394,6 +3395,7 @@ check_model_health() {
else
local probe_pid probe_tmpfile
probe_tmpfile=$(mktemp)
trap 'rm -f "$probe_tmpfile"' RETURN
("${probe_cmd[@]}" > "$probe_tmpfile" 2>&1) &
probe_pid=$!
local waited=0
Expand Down Expand Up @@ -4370,6 +4372,7 @@ extract_log_metadata() {
# Only the final lines contain actual execution status/errors.
local log_tail_file
log_tail_file=$(mktemp)
trap 'rm -f "$log_tail_file"' RETURN
tail -20 "$log_file" > "$log_tail_file" 2>/dev/null || true

local rate_limit_count=0 auth_error_count=0 conflict_count=0 timeout_count=0 oom_count=0
Expand Down Expand Up @@ -7407,6 +7410,7 @@ populate_verify_queue() {
# Insert before the end marker
local temp_file
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' RETURN
awk -v entry="$entry" '
/<!-- VERIFY-QUEUE-END -->/ {
print entry
Expand Down Expand Up @@ -7942,6 +7946,7 @@ generate_verify_entry() {
# Insert before marker using temp file (portable across macOS/Linux)
local tmp_file
tmp_file=$(mktemp)
trap 'rm -f "$tmp_file"' RETURN
awk -v entry="$full_entry" -v mark="$marker" '{
if (index($0, mark) > 0) { print entry; }
print;
Expand Down
1 change: 1 addition & 0 deletions .agents/scripts/verify-run-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ update_verify_status() {
# Write the replacement using awk (sed delimiters conflict with | in content)
local tmp_file
tmp_file=$(mktemp)
trap 'rm -f "$tmp_file"' RETURN
awk -v ln="$line_num" -v rep="$new_line" 'NR==ln{print rep; next}{print}' "$verify_file" > "$tmp_file"
mv "$tmp_file" "$verify_file"

Expand Down
3 changes: 3 additions & 0 deletions aidevops.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,7 @@ cmd_update() {
print_error "Failed to create temp file for setup script"
return 1
}
trap 'rm -f "$tmp_setup"' RETURN
if curl -fsSL "https://raw.githubusercontent.com/marcusquinn/aidevops/main/setup.sh" -o "$tmp_setup" 2>/dev/null && [[ -s "$tmp_setup" ]]; then
chmod +x "$tmp_setup"
bash "$tmp_setup"
Expand Down Expand Up @@ -1484,6 +1485,7 @@ cmd_upgrade_planning() {
local temp_file="${todo_file}.merge"
local tasks_file
tasks_file=$(mktemp)
trap 'rm -f "$tasks_file"' RETURN
printf '%s\n' "$existing_tasks" > "$tasks_file"
# Use while-read to avoid BSD awk "newline in string" warning with -v
local in_backlog=false
Expand Down Expand Up @@ -1548,6 +1550,7 @@ cmd_upgrade_planning() {
local temp_file="${plans_file}.merge"
local plans_content_file
plans_content_file=$(mktemp)
trap 'rm -f "$plans_content_file"' RETURN
printf '%s\n' "$existing_plans" > "$plans_content_file"
# Use while-read to avoid BSD awk "newline in string" warning with -v
local in_active=false
Expand Down
Loading
Loading