internal/storage/image.go (1)

831-837: Minor: unnecessary else after return in PullImage.

Both branches return, so the else is redundant. This is a pre-existing pattern, but a trivial cleanup opportunity.

Optional simplification

 func (svc *imageService) PullImage(ctx context.Context, imageName RegistryImageReference, options *ImageCopyOptions) (*StorageImageID, error) {
 	if options.CgroupPull.UseNewCgroup {
 		return svc.pullImageParent(ctx, imageName, options.CgroupPull.ParentCgroup, options)
-	} else {
-		return pullImageImplementation(ctx, svc.lookup, svc.store, svc.storageTransport, imageName, options)
 	}
+	return pullImageImplementation(ctx, svc.lookup, svc.store, svc.storageTransport, imageName, options)
 }

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@internal/storage/image.go` around lines 831 - 837, In PullImage (method
imageService.PullImage) remove the unnecessary else: since the if branch returns
svc.pullImageParent(...), follow it with a bare return of
pullImageImplementation(ctx, svc.lookup, svc.store, svc.storageTransport,
imageName, options) without wrapping it in an else block; update the function
body to return directly when the if is false, keeping svc.pullImageParent and
pullImageImplementation calls unchanged.

server/image_pull.go (1)

126-146: Clean branching on imageID nilness for regular images vs. OCI artifacts.

The nil check on pullOp.imageID before calling IDStringForOutOfProcessConsumptionOnly() correctly prevents a panic on the value-type method. The OCI artifact fallback via ArtifactStore().Status() is a sensible alternative path.

One consideration: if ArtifactStore().Status() also fails, the error message at line 141 ("get image status after pull") could be confusing since the pull itself succeeded (with a nil imageID). Consider adding context that this is an OCI artifact lookup.

Suggested clarification in error message

-		return nil, fmt.Errorf("get image status after pull: %w", err)
+		return nil, fmt.Errorf("get OCI artifact status after pull: %w", err)

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@server/image_pull.go` around lines 126 - 146, The error returned from
ArtifactStore().Status(...) after a nil pullOp.imageID can be misleading because
the pull succeeded but the OCI artifact lookup failed; update the error returned
from the Status call to include context that this was an OCI artifact lookup
(include the image variable and mention "OCI artifact lookup" in the message) so
callers see "OCI artifact lookup for <image> failed: %w" (or similar) instead of
"get image status after pull"; adjust the fmt.Errorf invocation in the branch
that calls ArtifactStore().Status to provide that clarified message and include
the original error.