From 34016ecdda38c04a478c0a770a772aa0c6b63463 Mon Sep 17 00:00:00 2001
From: Neil Voss <vosslab@NVOSS-MAC02.local>
Date: Fri, 16 Jan 2026 15:02:09 -0600
Subject: [PATCH] Exclude .codex/tmp from backups, preserve symlinks, and make
 restores non-interactive

---
 codex-accounts.sh | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/codex-accounts.sh b/codex-accounts.sh
index 8fdc936..4a0673a 100644
--- a/codex-accounts.sh
+++ b/codex-accounts.sh
@@ -68,13 +68,20 @@ backup_current_to() {
   local dest; dest="$(zip_path_for "$name")"
 
   note "Saving current ~/.codex to ${dest}..."
-  cp -R "$CODEX_HOME" "${tmpdir}/.codex"
+  # -RP: preserve symlinks without following them
+  cp -RP "$CODEX_HOME" "${tmpdir}/.codex"
+  # Remove tmp/ before zipping (temporary patch files, not worth saving)
+  rm -rf "${tmpdir}/.codex/tmp"
+  # Remove old archive (zip -r updates existing archives instead of replacing)
+  rm -f "$dest"
   (
     cd "$tmpdir"
-    zip -r -q "$dest" .codex
+    # -y: store symlinks as symlinks (not their targets)
+    zip -y -r -q "$dest" .codex
   )
   rm -rf "$tmpdir"
-  ok "Saved."
+  local size; size="$(du -h "$dest" | cut -f1)"
+  ok "Saved ${size}."
 }
 
 extract_to_codex() {
@@ -83,11 +90,17 @@ extract_to_codex() {
 
   [[ -f "$zipfile" ]] || die "Account archive not found: $zipfile"
 
+  # Extract into a guaranteed-empty subdir to avoid conflicts with existing entries
   local tmpdir; tmpdir="$(mktemp -d)"
+  local extractdir="${tmpdir}/extract"
+  mkdir -p "$extractdir"
+
   note "Extracting $(basename "$zipfile")..."
-  unzip -q "$zipfile" -d "$tmpdir"
+  # -o: overwrite without prompting (safe since extractdir is empty)
+  # This handles edge cases where zip has symlink + directory entries for same path
+  unzip -o -q "$zipfile" -d "$extractdir"
 
-  local extracted; extracted="$(find "$tmpdir" -type d -name ".codex" | head -n1)"
+  local extracted; extracted="$(find "$extractdir" -type d -name ".codex" | head -n1)"
   [[ -z "${extracted:-}" ]] && { rm -rf "$tmpdir"; die ".codex folder missing inside archive."; }
 
   rm -rf "$CODEX_HOME"