Add support for container restart policy

Sources/ContainerCommands/Builder/BuilderStart.swift

@@ -173,7 +173,7 @@ extension Application {
                     // If they changed, stop and delete the existing builder
                     try await client.stop(id: existingContainer.id)
                     try await client.delete(id: existingContainer.id)
-                case .stopped:
+                case .stopped, .bootstrapped:
                     // If the builder is stopped and matches our requirements, start it
                     // Otherwise, delete it and create a new one
                     guard imageChanged || cpuChanged || memChanged || envChanged || dnsChanged else {
@@ -186,7 +186,7 @@ extension Application {
                         .invalidState,
                         message: "builder is stopping, please wait until it is fully stopped before proceeding"
                     )
-                case .unknown:
+                case .unknown, .restarting:
                     break
                 }
             }

Sources/ContainerCommands/Container/ContainerCreate.swift

@@ -82,7 +82,7 @@ extension Application {
                 log: log
             )
 
-            let options = ContainerCreateOptions(autoRemove: managementFlags.remove)
+            let options = ContainerCreateOptions(autoRemove: managementFlags.remove, restartPolicy: managementFlags.restart)
             let client = ContainerClient()
             try await client.create(configuration: ck.0, options: options, kernel: ck.1, initImage: ck.2)
 

Sources/ContainerCommands/Container/ContainerList.swift

@@ -99,7 +99,7 @@ extension ContainerSnapshot {
 }
 
 struct PrintableContainer: Codable {
-    let status: RuntimeStatus
+    let status: ContainerStatus
     let configuration: ContainerConfiguration
     let networks: [Attachment]
     let startedDate: Date?

Sources/ContainerCommands/Container/ContainerRun.swift

@@ -109,7 +109,7 @@ extension Application {
 
             progress.set(description: "Starting container")
 
-            let options = ContainerCreateOptions(autoRemove: managementFlags.remove)
+            let options = ContainerCreateOptions(autoRemove: managementFlags.remove, restartPolicy: managementFlags.restart)
             try await client.create(
                 configuration: ck.0,
                 options: options,

Sources/ContainerResource/Container/ContainerCreateOptions.swift

@@ -14,13 +14,32 @@
 // limitations under the License.
 //===----------------------------------------------------------------------===//
 
+public enum RestartPolicy: String, Sendable, Codable {
+    case no
+    case onFailure
+    case always
+}
+
 public struct ContainerCreateOptions: Codable, Sendable {
     public let autoRemove: Bool
+    public let restartPolicy: RestartPolicy
 
-    public init(autoRemove: Bool) {
+    public init(autoRemove: Bool, restartPolicy: RestartPolicy) {
         self.autoRemove = autoRemove
+        self.restartPolicy = restartPolicy
+    }
+
+    public static let `default` = ContainerCreateOptions(autoRemove: false, restartPolicy: .no)
+
+    enum CodingKeys: String, CodingKey {
+        case autoRemove
+        case restartPolicy
     }
 
-    public static let `default` = ContainerCreateOptions(autoRemove: false)
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
 
+        autoRemove = try container.decode(Bool.self, forKey: .autoRemove)
+        restartPolicy = try container.decodeIfPresent(RestartPolicy.self, forKey: .restartPolicy) ?? .no
+    }
 }

Sources/ContainerResource/Container/ContainerListFilters.swift

@@ -21,7 +21,7 @@ public struct ContainerListFilters: Sendable, Codable {
     /// Filter by container IDs. If non-empty, only containers with matching IDs are returned.
     public var ids: [String]
     /// Filter by container status.
-    public var status: RuntimeStatus?
+    public var status: ContainerStatus?
     /// Filter by labels. All specified labels must match.
     public var labels: [String: String]
 
@@ -30,7 +30,7 @@ public struct ContainerListFilters: Sendable, Codable {
 
     public init(
         ids: [String] = [],
-        status: RuntimeStatus? = nil,
+        status: ContainerStatus? = nil,
         labels: [String: String] = [:]
     ) {
         self.ids = ids

Sources/ContainerResource/Container/ContainerSnapshot.swift

@@ -34,15 +34,15 @@ public struct ContainerSnapshot: Codable, Sendable {
     }
 
     /// The runtime status of the container.
-    public var status: RuntimeStatus
+    public var status: ContainerStatus
     /// Network interfaces attached to the sandbox that are provided to the container.
     public var networks: [Attachment]
     /// When the container was started.
     public var startedDate: Date?
 
     public init(
         configuration: ContainerConfiguration,
-        status: RuntimeStatus,
+        status: ContainerStatus,
         networks: [Attachment],
         startedDate: Date? = nil
     ) {

Sources/ContainerResource/Container/ContainerStatus.swift

@@ -0,0 +1,33 @@
+//===----------------------------------------------------------------------===//
+// Copyright © 2026 Apple Inc. and the container project authors.
+//
+// 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
+
+/// Runtime status for a sandbox or container.
+public enum ContainerStatus: String, CaseIterable, Sendable, Codable {
+    /// The object is in an unknown status.
+    case unknown
+    /// The object is currently stopped.
+    case stopped
+    /// The object is waiting to be restarted.
+    case restarting
+    /// The object is currently bootstrapped.
+    case bootstrapped
+    /// The object is currently running.
+    case running
+    /// The object is currently stopping.
+    case stopping
+}

Sources/ContainerResource/Container/RuntimeStatus.swift → Sources/ContainerResource/Container/SandboxStatus.swift

@@ -17,7 +17,7 @@
 import Foundation
 
 /// Runtime status for a sandbox or container.
-public enum RuntimeStatus: String, CaseIterable, Sendable, Codable {
+public enum SandboxStatus: String, CaseIterable, Sendable, Codable {
     /// The object is in an unknown status.
     case unknown
     /// The object is currently stopped.

Sources/Helpers/APIServer/APIServer+Start.swift

@@ -61,7 +61,7 @@ extension APIServer {
                 var routes = [XPCRoute: XPCServer.RouteHandler]()
                 let pluginLoader = try initializePluginLoader(log: log)
                 try await initializePlugins(pluginLoader: pluginLoader, log: log, routes: &routes)
-                let containersService = try initializeContainersService(
+                let containersService = try await initializeContainersService(
                     pluginLoader: pluginLoader,
                     log: log,
                     routes: &routes
@@ -261,7 +261,7 @@ extension APIServer {
             routes[XPCRoute.getDefaultKernel] = harness.getDefaultKernel
         }
 
-        private func initializeContainersService(pluginLoader: PluginLoader, log: Logger, routes: inout [XPCRoute: XPCServer.RouteHandler]) throws -> ContainersService {
+        private func initializeContainersService(pluginLoader: PluginLoader, log: Logger, routes: inout [XPCRoute: XPCServer.RouteHandler]) async throws -> ContainersService {
             log.info("initializing containers service")
 
             let service = try ContainersService(
@@ -288,6 +288,8 @@ extension APIServer {
             routes[XPCRoute.containerDiskUsage] = harness.diskUsage
             routes[XPCRoute.containerExport] = harness.export
 
+            async let _ = try service.runRestartScheduler()
+
             return service
         }
 

Sources/Services/ContainerAPIService/Client/Flags.swift

@@ -15,9 +15,12 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
+import ContainerResource
 import ContainerizationError
 import Foundation
 
+extension RestartPolicy: ExpressibleByArgument {}
+
 public struct Flags {
     public struct Logging: ParsableArguments {
         public init() {}
@@ -304,6 +307,9 @@ public struct Flags {
         @Flag(name: [.customLong("rm"), .long], help: "Remove the container after it stops")
         public var remove = false
 
+        @Option(name: .long, help: "Restart policy when the container exits")
+        public var restart: RestartPolicy = .no
+
         @Flag(name: .long, help: "Enable Rosetta in the container")
         public var rosetta = false