From b2053d46fce3f45bdc199a723b1086435b42f138 Mon Sep 17 00:00:00 2001
From: Jaewon Hur <hurjaewon@snu.ac.kr>
Date: Fri, 7 Aug 2026 09:55:25 -0700
Subject: [PATCH 1/3] Return nil if no local image of matching label found

---
 .../Services/ContainerAPIService/Client/ClientImage.swift   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Sources/Services/ContainerAPIService/Client/ClientImage.swift b/Sources/Services/ContainerAPIService/Client/ClientImage.swift
index 3516d0ef9..72d7745d9 100644
--- a/Sources/Services/ContainerAPIService/Client/ClientImage.swift
+++ b/Sources/Services/ContainerAPIService/Client/ClientImage.swift
@@ -185,7 +185,7 @@ extension ClientImage {
     public static func get(reference: String, containerSystemConfig: ContainerSystemConfig) async throws -> ClientImage {
         let all = try await self.list()
         guard let found = try self._search(reference: reference, in: all, containerSystemConfig: containerSystemConfig) else {
-            throw ContainerizationError(.notFound, message: "image with reference \(reference)")
+            throw ContainerizationError(.notFound, message: "image with reference \(reference) not found")
         }
         return found
     }
@@ -226,10 +226,6 @@ extension ClientImage {
             let withDefaultTag = r.description
 
             let localImageMatches = all.filter { $0.description.nameFromAnnotation() == withDefaultTag }
-            guard localImageMatches.count > 1 else {
-                return localImageMatches.first
-            }
-            // More than one image matched. Check against the tagged reference
             return localImageMatches.first { $0.reference == withDefaultTag }
         }()
         if let locallyBuiltImage {

From 26faa652cc12d31fedf2886c464b9235a493c491 Mon Sep 17 00:00:00 2001
From: Jaewon Hur <hurjaewon@snu.ac.kr>
Date: Wed, 12 Aug 2026 14:23:49 -0700
Subject: [PATCH 2/3] Update command reference

---
 docs/command-reference.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/command-reference.md b/docs/command-reference.md
index 7a9a3a04d..de04e4398 100644
--- a/docs/command-reference.md
+++ b/docs/command-reference.md
@@ -653,7 +653,7 @@ No options.
 
 ### `container image delete (rm)`
 
-Deletes one or more images. If no images are provided, `--all` can be used to delete all images. Images currently referenced by running containers cannot be deleted without first removing those containers.
+Deletes one or more images. If no images are provided, `--all` can be used to delete all images. Images currently referenced by running containers cannot be deleted without first removing those containers. When multiple images match the given name, locally built image is deleted first.
 
 **Usage**
 

From 1b198f43bcc7452bdecf5c5aa08672f76c05f918 Mon Sep 17 00:00:00 2001
From: Jaewon Hur <hurjaewon@snu.ac.kr>
Date: Wed, 12 Aug 2026 14:24:31 -0700
Subject: [PATCH 3/3] Add test

---
 .../Build/TestCLIBuilder.swift                 | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Tests/IntegrationTests/Build/TestCLIBuilder.swift b/Tests/IntegrationTests/Build/TestCLIBuilder.swift
index 95d4f74f8..934b4de7d 100644
--- a/Tests/IntegrationTests/Build/TestCLIBuilder.swift
+++ b/Tests/IntegrationTests/Build/TestCLIBuilder.swift
@@ -1001,6 +1001,24 @@ struct TestCLIBuilder {
         }
     }
 
+    @Test func testImageRmAfterRetagFails() async throws {
+        try await ContainerFixture.with { f in
+            let dir = try f.createTempDir()
+            try f.createContext(dir: dir, dockerfile: "FROM scratch")
+            let image = "scratch:\(UUID().uuidString)"
+            let newImage = "scratch-new:\(UUID().uuidString)"
+
+            try f.build(tag: image, contextDir: dir)
+            try f.assertImageBuilt(image)
+
+            try f.doImageTag(image, newName: newImage)
+            try f.doRemoveImages([image])
+
+            let result = try f.run(["image", "rm", image])
+            #expect(result.status != 0, "expected removing an already-removed image to fail")
+        }
+    }
+
     /// Regression test: the context *root* itself (not an entry inside it) is a
     /// symlink to a sibling directory, e.g. `context -> real-context`. The build
     /// must resolve the symlink and use the real directory's contents.