From 655b65b7eabc398ed066aab4d27dc61543515092 Mon Sep 17 00:00:00 2001
From: Chase Naples <Cnaples79@gmail.com>
Date: Mon, 6 Oct 2025 21:45:06 -0400
Subject: [PATCH] cli: accept global flags after subcommands

---
 Sources/CLI/ContainerCLI.swift | 38 +++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/Sources/CLI/ContainerCLI.swift b/Sources/CLI/ContainerCLI.swift
index d838500d..17d65cdc 100644
--- a/Sources/CLI/ContainerCLI.swift
+++ b/Sources/CLI/ContainerCLI.swift
@@ -32,8 +32,44 @@ public struct ContainerCLI: AsyncParsableCommand {
     }
 
     public func run() async throws {
-        var application = try Application.parse(arguments)
+        let normalizedArguments = Self.normalizeGlobalFlags(arguments)
+        var application = try Application.parse(normalizedArguments)
         try application.validate()
         try application.run()
     }
+
+    // ArgumentParser expects global flags to appear before the subcommand they
+    // apply to. Users frequently pass `--debug` after the subcommand (for example
+    // `container run --debug …`), which previously triggered the unhelpful
+    // "Unknown option" error. To provide the desired UX, collect any known
+    // global flags before that subcommand while respecting `--` passthrough so
+    // container process arguments remain untouched.
+    private static func normalizeGlobalFlags(_ arguments: [String]) -> [String] {
+        var collectedGlobals: [String] = []
+        var remaining: [String] = []
+        var passthrough = false
+
+        for argument in arguments {
+            if !passthrough {
+                if argument == "--" {
+                    passthrough = true
+                    remaining.append(argument)
+                    continue
+                }
+
+                if Self.globalFlags.contains(argument) {
+                    collectedGlobals.append(argument)
+                    continue
+                }
+            }
+
+            remaining.append(argument)
+        }
+
+        return collectedGlobals + remaining
+    }
+
+    private static var globalFlags: Set<String> {
+        ["--debug"]
+    }
 }