Tighten agy launcher edge cases

Author: Dicklesworthstone

scripts/generated/internal_checksums.sh

@@ -10,7 +10,7 @@
 declare -gA ACFS_INTERNAL_CHECKSUMS=(
   [scripts/lib/security.sh]="95366fc1c2497ff0e36a1f59f34621fdcec06f4da0ed439828ad601a626f4f75"
   [scripts/lib/agents.sh]="a6485afa0cf17d636ad7f049796a23821fb9c5dbf3640ec42ee9b1bb0a8628b4"
-  [scripts/lib/update.sh]="2ae92228e90810354ad392d8d5763b1ef14686ea61a95d63e0304eed5060c418"
+  [scripts/lib/update.sh]="b693b08ec49e822dcb540e94f8e8c6c6616ce79f31ac95d95cebcc4125d773d8"
   [scripts/lib/doctor.sh]="0bb0626aba495c6688c2880db3306ff9a7f9b803d6ebf9d8ff8ddcc931e4ea79"
   [scripts/lib/doctor_fix.sh]="31a44ab36fe980d5c41edc6d25d88280f6d8d6bd1abc40ecac1a8e3e74bb864c"
   [scripts/lib/offline_artifact_pack.sh]="5f6fa7e5a9e115904656a627853b2c7d556183532a3d8fd42a0363bf3570c7eb"

scripts/lib/agy_locked.py

@@ -191,40 +191,40 @@ def command_parts(tokens):
 def env_invokes_dcg(tokens, depth):
     index = 0
     while index < len(tokens):
-        token = tokens[index]
-        if token == "--":
+        arg = tokens[index]
+        if arg in {"--"}:
             index += 1
             break
-        if is_assignment(token):
+        if is_assignment(arg):
             index += 1
             continue
-        if token in {"-i", "-0", "--ignore-environment", "--null"}:
+        if arg in {"-i", "-0", "--ignore-environment", "--null"}:
             index += 1
             continue
-        if token in {"-u", "--unset", "-C", "--chdir"}:
+        if arg in {"-u", "--unset", "-C", "--chdir"}:
             index += 2
             continue
-        if token in {"-S", "--split-string"}:
+        if arg in {"-S", "--split-string"}:
             if index + 1 >= len(tokens):
                 return False
             try:
                 split_tokens = shlex.split(tokens[index + 1])
             except ValueError:
                 return False
             return tokens_invoke_dcg(split_tokens, depth)
-        if token.startswith("-u") and len(token) > 2:
+        if arg.startswith("-u") and len(arg) > 2:
             index += 1
             continue
-        if token.startswith("--split-string="):
+        if arg.startswith("--split-string="):
             try:
-                split_tokens = shlex.split(token.partition("=")[2])
+                split_tokens = shlex.split(arg.partition("=")[2])
             except ValueError:
                 return False
             return tokens_invoke_dcg(split_tokens, depth)
-        if token.startswith("--unset=") or token.startswith("--chdir="):
+        if arg.startswith("--unset=") or arg.startswith("--chdir="):
             index += 1
             continue
-        if token.startswith("-"):
+        if arg.startswith("-"):
             return False
         break
     return tokens_invoke_dcg(tokens[index:], depth) if index < len(tokens) else False
@@ -233,17 +233,17 @@ def env_invokes_dcg(tokens, depth):
 def shell_invokes_dcg(tokens, depth):
     index = 0
     while index < len(tokens):
-        token = tokens[index]
-        if token == "-c" or (token.startswith("-") and "c" in token[1:]):
+        arg = tokens[index]
+        if arg.startswith("-") and "c" in arg[1:]:
             if index + 1 >= len(tokens):
                 return False
             try:
-                script_tokens = shlex.split(tokens[index + 1])
+                script_args = shlex.split(tokens[index + 1])
             except ValueError:
                 return False
-            if script_tokens and script_tokens[0] == "exec":
-                script_tokens = script_tokens[1:]
-            return tokens_invoke_dcg(script_tokens, depth)
+            if script_args and script_args[0] == "exec":
+                script_args = script_args[1:]
+            return tokens_invoke_dcg(script_args, depth)
         index += 1
     return False
 
@@ -265,8 +265,8 @@ def tokens_invoke_dcg(tokens, depth=0):
         return shell_invokes_dcg(remaining, depth + 1)
     if executable.startswith("python"):
         return any(
-            pathlib.Path(os.path.expanduser(token)).name == "dcg-antigravity-hook.py"
-            for token in remaining
+            pathlib.Path(os.path.expanduser(arg)).name == "dcg-antigravity-hook.py"
+            for arg in remaining
         )
     return False
 
@@ -376,21 +376,21 @@ def filtered_args(argv):
 
 
 def run_real_agy(args):
-    proc = subprocess.Popen(args)
-    previous_handlers = {}
-    for sig in (signal.SIGINT, signal.SIGQUIT):
-        previous_handlers[sig] = signal.getsignal(sig)
-        signal.signal(sig, signal.SIG_IGN)
-    try:
-        status = proc.wait()
-    finally:
-        for sig, handler in previous_handlers.items():
-            signal.signal(sig, handler)
+    with subprocess.Popen(args) as proc:
+        previous_handlers = {}
+        for sig in (signal.SIGINT, signal.SIGQUIT):
+            previous_handlers[sig] = signal.getsignal(sig)
+            signal.signal(sig, signal.SIG_IGN)
+        try:
+            status = proc.wait()
+        finally:
+            for sig, handler in previous_handlers.items():
+                signal.signal(sig, handler)
     return 128 - status if status < 0 else status
 
 
 def main():
-    if PRIME_SETTINGS_FLAG in sys.argv[1:]:
+    if sys.argv[1:] == [PRIME_SETTINGS_FLAG]:
         ensure_settings()
         ensure_dcg_hook()
         return 0

scripts/lib/update.sh

@@ -5116,7 +5116,11 @@ update_agents() {
     local bun_bin=""
     bun_bin="$(update_binary_path bun 2>/dev/null || true)"
     if [[ -z "$bun_bin" ]]; then
-        log_item "fail" "Bun not installed" "required for Codex updates"
+        if update_binary_exists codex || [[ "$FORCE_MODE" == "true" ]]; then
+            log_item "fail" "Bun not installed" "required for Codex updates"
+        else
+            log_item "skip" "Bun" "not installed; Codex CLI not installed"
+        fi
     fi
 
     # Codex CLI via bun (--trust allows postinstall scripts)

tests/unit/test_agy_install.sh

@@ -62,8 +62,12 @@ check "agy locked launcher installs dcg hook support" \
   "grep -q 'dcg-antigravity-hook.py' scripts/lib/agy_locked.py"
 check "agy locked launcher supports installer priming" \
   "grep -q -- '--acfs-prime-settings' scripts/lib/agy_locked.py"
+check "agy locked launcher only treats priming as an exact invocation" \
+  "grep -Fq 'sys.argv[1:] == [PRIME_SETTINGS_FLAG]' scripts/lib/agy_locked.py"
 check "agy locked launcher is valid Python" \
   "python3 -m py_compile scripts/lib/agy_locked.py"
+check "agents-only update does not fail on missing Bun when Codex is absent" \
+  "grep -q 'not installed; Codex CLI not installed' scripts/lib/update.sh"
 check "doctor checks for the agy alias" \
   "grep -q 'agent.alias.agy' scripts/lib/doctor.sh"