From 36b3910ff2a205c251ed061abbcf06f58045fb83 Mon Sep 17 00:00:00 2001
From: Godopu <godopu16@gmail.com>
Date: Sat, 18 Jul 2026 23:23:40 +0900
Subject: [PATCH] fix(mac-compat): bypass keyring auth check hang and link
 macOS Library/Keychains to isolated home

---
 .agents/skills/lib.sh                                     | 8 ++++++++
 .../multi-agent-mux-create/scripts/create_session.sh      | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.agents/skills/lib.sh b/.agents/skills/lib.sh
index 6e34f33..4a8dd8d 100644
--- a/.agents/skills/lib.sh
+++ b/.agents/skills/lib.sh
@@ -838,6 +838,14 @@ provision_isolation() {
       for f in antigravity-oauth-token installation_id settings.json; do
         if [ -e "$HOME/.gemini/antigravity-cli/$f" ]; then ln -sfn "$HOME/.gemini/antigravity-cli/$f" "$root/.gemini/antigravity-cli/$f"; seeded="${seeded:+$seeded,}.gemini/antigravity-cli/$f"; fi
       done
+      # On macOS, seed ~/Library/Keychains to allow isolated agy to query Keychain Access credentials
+      if [ "$(uname)" = "Darwin" ]; then
+        mkdir -p "$root/Library"
+        if [ -d "$HOME/Library/Keychains" ]; then
+          ln -sfn "$HOME/Library/Keychains" "$root/Library/Keychains"
+          seeded="${seeded:+$seeded,}Library/Keychains"
+        fi
+      fi
       ;;
     hermes)
       mkdir -p "$root/.hermes"
diff --git a/.agents/skills/multi-agent-mux-create/scripts/create_session.sh b/.agents/skills/multi-agent-mux-create/scripts/create_session.sh
index 455757e..c0b19f7 100755
--- a/.agents/skills/multi-agent-mux-create/scripts/create_session.sh
+++ b/.agents/skills/multi-agent-mux-create/scripts/create_session.sh
@@ -89,7 +89,10 @@ if [ "$AGENT" = "claude" ]; then
     exit 1
   fi
 elif [ "$AGENT" = "agy" ]; then
-  if ! agy models >/dev/null 2>&1; then
+  # Fast, non-blocking check: if token or credentials exist on disk, assume authenticated to prevent keyring hang
+  if [ -f "$HOME/.gemini/oauth_creds.json" ] || [ -f "$HOME/.gemini/antigravity-cli/antigravity-oauth-token" ]; then
+    true
+  elif ! agy models >/dev/null 2>&1; then
     echo "ERROR: agy is not authenticated. Please log in first." >&2
     exit 1
   fi