fix(oci): keep the tag of a tag@digest Feature reference

.github/workflows/go-cli.yml

@@ -166,7 +166,7 @@ jobs:
       - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
         if: always()
         with:
-          name: parity-contract-network-v0.89.0
+          name: parity-contract-network-v0.90.0
           path: artifacts/
           if-no-files-found: error
       - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
@@ -269,7 +269,7 @@ jobs:
       - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
         if: always() && steps.plan.outputs.run == 'true'
         with:
-          name: parity-runtime-v0.89.0-shard-${{ matrix.shard }}
+          name: parity-runtime-v0.90.0-shard-${{ matrix.shard }}
           path: artifacts/
           if-no-files-found: error
       # daily only: covdata slice for the cross-lane merge (distinct name per shard).

README.md

@@ -121,7 +121,7 @@ GitHub Releases are not supported targets. “Compatible” means compatibility
 this scope; it does not mean that every platform or historical upstream behavior is
 implemented.
 
-A pinned official TypeScript CLI (`reference/`, currently v0.89.0) is the behavioral
+A pinned official TypeScript CLI (`reference/`, currently v0.90.0) is the behavioral
 oracle. Roughly 200 cases run commands through both CLIs and compare exit status,
 normalized output, and relevant container or registry state. See the
 [parity matrix](docs/parity/parity-matrix.yaml) and

docs/DIVERGENCES.md

@@ -1,7 +1,7 @@
 # Divergences, decisions & accepted limitations
 
 This CLI is validated for behavioral parity with the reference TypeScript
-`@devcontainers/cli` (pinned at **v0.89.0**, see [`parity/`](parity/)). Where it
+`@devcontainers/cli` (pinned at **v0.90.0**, see [`parity/`](parity/)). Where it
 deliberately differs, the difference is recorded here — this is the durable record of
 *intentional* departures from the oracle, not a backlog. User-facing additions are
 documented in [`go-only-features.md`](go-only-features.md).
@@ -71,9 +71,9 @@ touches a compared surface, reflected in the parity matrix.
   earlier unconditional build-arg.
 - **Two upstream fixes newer than the pinned reference are already ported.** A
   `${localEnv:VAR:default}` or `${containerEnv:VAR:default}` default keeps its colons
-  (`my.registry.io:5000/img`; upstream #1213), where v0.89.0 keeps the text up to the next
+  (`my.registry.io:5000/img`; upstream #1213), where v0.90.0 keeps the text up to the next
   colon. A read-only mount keeps `:ro` in the Compose override (upstream #881), where
-  v0.89.0's `convertMountToVolume` drops `readonly`. The `testdata/ts-oracle` goldens
+  v0.90.0's `convertMountToVolume` drops `readonly`. The `testdata/ts-oracle` goldens
   record both as divergence cases.
 - **Dockerfile instructions are read with BuildKit's parser**, not with the reference's
   regular expressions, when resolving the base image and the `USER` of a Dockerfile.

internal/oci/ref.go

@@ -65,6 +65,10 @@ func ParseRef(input string) (*Ref, error) {
 
 	if indexOfLastAt != -1 {
 		resource = input[:indexOfLastAt]
+		if sep := strings.LastIndex(resource, ":"); sep > strings.LastIndex(resource, "/") {
+			tag = resource[sep+1:]
+			resource = resource[:sep]
+		}
 		digestWithAlgo := input[indexOfLastAt+1:]
 		parts := strings.Split(digestWithAlgo, ":")
 		if len(parts) != 2 {

internal/oci/ref_test.go

@@ -15,7 +15,8 @@ func tsRef(r *Ref) map[string]string {
 	}
 	if r.Digest != "" {
 		out["digest"] = r.Digest
-	} else {
+	}
+	if r.Tag != "" || r.Digest == "" {
 		out["tag"] = r.Tag
 	}
 	return out

internal/oci/testdata/ts-oracle/ref.json

@@ -721,7 +721,18 @@
       "args": [
         "ghcr.io/x/y/z:1@sha256:1234567890123456789012345678901234567890123456789012345678901234"
       ],
-      "result": null
+      "result": {
+        "scheme": "https",
+        "id": "z",
+        "owner": "x",
+        "namespace": "x/y",
+        "registry": "ghcr.io",
+        "resource": "ghcr.io/x/y/z",
+        "path": "x/y/z",
+        "version": "sha256:1234567890123456789012345678901234567890123456789012345678901234",
+        "tag": "1",
+        "digest": "sha256:1234567890123456789012345678901234567890123456789012345678901234"
+      }
     },
     {
       "name": "ghcr.io devcontainers/templates",
@@ -966,6 +977,44 @@
         "a/b/c/d"
       ],
       "result": "a/b/c/d"
+    },
+    {
+      "name": "tag and digest",
+      "fn": "getRef",
+      "args": [
+        "mcr.microsoft.com/devcontainers/go:2.3.1-1.27-bookworm@sha256:adc326255c019241228f9da4a1cb5d6a89abaaa0eb8d926a355b00af7daafd00"
+      ],
+      "result": {
+        "scheme": "https",
+        "id": "go",
+        "owner": "devcontainers",
+        "namespace": "devcontainers",
+        "registry": "mcr.microsoft.com",
+        "resource": "mcr.microsoft.com/devcontainers/go",
+        "path": "devcontainers/go",
+        "version": "sha256:adc326255c019241228f9da4a1cb5d6a89abaaa0eb8d926a355b00af7daafd00",
+        "tag": "2.3.1-1.27-bookworm",
+        "digest": "sha256:adc326255c019241228f9da4a1cb5d6a89abaaa0eb8d926a355b00af7daafd00"
+      }
+    },
+    {
+      "name": "registry port, tag and digest",
+      "fn": "getRef",
+      "args": [
+        "docker.io:8001/devcontainers/templates/docker-from-docker:1.3.4@sha256:4ef08c9c3b708f3c2faecc5a898b39736423dd639f09f2a9f8bf9b0b9252ef0a"
+      ],
+      "result": {
+        "scheme": "https",
+        "id": "docker-from-docker",
+        "owner": "devcontainers",
+        "namespace": "devcontainers/templates",
+        "registry": "docker.io:8001",
+        "resource": "docker.io:8001/devcontainers/templates/docker-from-docker",
+        "path": "devcontainers/templates/docker-from-docker",
+        "version": "sha256:4ef08c9c3b708f3c2faecc5a898b39736423dd639f09f2a9f8bf9b0b9252ef0a",
+        "tag": "1.3.4",
+        "digest": "sha256:4ef08c9c3b708f3c2faecc5a898b39736423dd639f09f2a9f8bf9b0b9252ef0a"
+      }
     }
   ]
 }