Merge origin/main into feat/dns-domain-resolution

Resolve ComposeUp.swift conflicts:
- getIPForRunningService: keep containerName(for:) helper, retain main's
  container-address comment (Mcrich23#100).
- waitUntilServiceIsRunning: adopt main's ActivityClock idle/maxWait
  signature (Mcrich23#112); keep containerName(for:) helper in place of the
  silent guard-let-projectName return.
- configService: keep BOTH Mcrich23#97's --dns-domain args and main's compose
  project/service labels (Mcrich23#110) — independent features at the same site.
- Failed-wait teardown: call stopExistingContainers([containerName]) (Mcrich23#97
  rename) instead of main's stopOldStuff([serviceName]); pass the actual
  launched name so dotted/explicit names are torn down correctly.

Builds clean; 63 static tests pass (DNS helpers, parsing, volumes, helpers).

Co-Authored-By: Claude <noreply@anthropic.com>

Author: Cyb3rDudu

.github/workflows/tests.yml

@@ -35,7 +35,7 @@ jobs:
       run: swift build --build-tests
 
     - name: Run static tests
-      run: swift test --filter Container-Compose-StaticTests.
+      run: swift test --filter Container_Compose_StaticTests
 
     - name: Upload static test results
       uses: actions/upload-artifact@v4

Package.resolved

@@ -8,8 +8,8 @@ let package = Package(
     platforms: [.macOS(.v15)],
     dependencies: [
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.1"),
-        .package(url: "https://github.com/mcrich23/container", branch: "add-command-option-group-function-macro"),
-        .package(url: "https://github.com/jpsim/Yams.git", from: "5.0.6"),
+        .package(url: "https://github.com/apple/container", from: "1.0.0"),
+        .package(url: "https://github.com/jpsim/Yams.git", from: "6.0.0"),
         .package(url: "https://github.com/onevcat/Rainbow", .upToNextMajor(from: "4.0.0")),
     ],
     targets: [

Package.swift

@@ -0,0 +1,46 @@
+//===----------------------------------------------------------------------===//
+// Copyright © 2025 Morris Richman and the Container-Compose project authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//===----------------------------------------------------------------------===//
+
+import Foundation
+
+/// Thread-safe timestamp of the most recent output from a service's
+/// `container run` subprocess. Written from the streaming `Task` and read by
+/// the readiness wait to tell "slow but progressing" apart from "stuck".
+///
+/// The clock is injectable so the idle-window logic can be exercised in tests
+/// without leaning on real wall-clock time.
+final class ActivityClock: @unchecked Sendable {
+    private let lock = NSLock()
+    private let now: @Sendable () -> Date
+    private var _lastActivity: Date
+
+    init(now: @escaping @Sendable () -> Date = { Date() }) {
+        self.now = now
+        self._lastActivity = now()
+    }
+
+    func touch() {
+        lock.lock()
+        _lastActivity = now()
+        lock.unlock()
+    }
+
+    var lastActivity: Date {
+        lock.lock()
+        defer { lock.unlock() }
+        return _lastActivity
+    }
+}

Sources/Container-Compose/ActivityClock.swift

@@ -19,7 +19,7 @@ import ArgumentParser
 
 public struct Main: AsyncParsableCommand {
     private static let commandName: String = "container-compose"
-    private static let version: String = "0.11.0"
+    private static let version: String = "1.0.0"
     public static var versionString: String {
         "\(commandName) version \(version)"
     }
@@ -33,6 +33,9 @@ public struct Main: AsyncParsableCommand {
             ComposeBuild.self,
             Version.self
         ])
+    
+    @OptionGroup
+    var composeFileOptions: ComposeFileOptions
 
     public init() {}
 }