Move core actions to a subpackage

Signed-off-by: Helder Correia <174525+helderco@users.noreply.github.com>

tests/plan.bats

@@ -36,6 +36,7 @@ setup() {
   assert_output --partial 'client.filesystem."./test_do".write'
   refute_output --partial "actions.notMe"
   refute_output --partial 'client.filesystem."./dependent_do".write'
+  rm -f ./test_do
 }
 
 @test "plan/do: nice error message for 0.1.0 projects" {

tests/plan/client/commands/test.cue

@@ -3,6 +3,7 @@ package main
 import (
 	"strings"
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
@@ -28,28 +29,28 @@ dagger.#Plan & {
 		invalid: name: "foobar"
 	}
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 		test: {
-			invalid: dagger.#Exec & {
+			invalid: core.#Exec & {
 				input: image.output
 				args: ["echo", client.commands.invalid.stdout]
 			}
 			valid: {
-				normal: dagger.#Exec & {
+				normal: core.#Exec & {
 					input: image.output
 					args: ["test", strings.TrimSpace(client.commands.normal.stdout), "=", "hello europa"]
 				}
-				relative: dagger.#Exec & {
+				relative: core.#Exec & {
 					input: image.output
 					args: ["test", strings.TrimSpace(client.commands.relative.stdout), "=", "test"]
 				}
-				error: dagger.#Exec & {
+				error: core.#Exec & {
 					input: image.output
 					args: ["test", strings.TrimSpace(client.commands.error.stderr), "=", "error"]
 				}
-				secret: dagger.#Exec & {
+				secret: core.#Exec & {
 					input: image.output
 					mounts: secret: {
 						dest:     "/run/secrets/test"

tests/plan/client/env/concrete.cue

@@ -2,16 +2,17 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	client: env: TEST_FAIL: "env"
 
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
-		test: dagger.#Exec & {
+		test: core.#Exec & {
 			input: image.output
 			args: [client.env.TEST_FAIL]
 		}

tests/plan/client/env/usage.cue

@@ -2,6 +2,7 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
@@ -10,15 +11,15 @@ dagger.#Plan & {
 		TEST_SECRET: dagger.#Secret
 	}
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 		test: {
-			string: dagger.#Exec & {
+			string: core.#Exec & {
 				input: image.output
 				args: ["test", client.env.TEST_STRING, "=", "foo"]
 			}
-			secret: dagger.#Exec & {
+			secret: core.#Exec & {
 				input: image.output
 				mounts: secret: {
 					dest:     "/run/secrets/test"

tests/plan/client/filesystem/conflict/test.cue

@@ -2,6 +2,7 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
@@ -11,15 +12,15 @@ dagger.#Plan & {
 		write: contents: actions.test.export.contents
 	}
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 		test: {
-			read: dagger.#Exec & {
+			read: core.#Exec & {
 				input: image.output
 				args: ["echo", client.filesystem."test.txt".read.contents]
 			}
-			write: dagger.#Exec & {
+			write: core.#Exec & {
 				input: image.output
 				args: ["sh", "-c",
 					#"""
@@ -27,7 +28,7 @@ dagger.#Plan & {
 						"""#,
 				]
 			}
-			export: dagger.#ReadFile & {
+			export: core.#ReadFile & {
 				input: write.output
 				path:  "out.txt"
 			}

tests/plan/client/filesystem/read/file/test.cue

@@ -2,6 +2,7 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
@@ -11,20 +12,20 @@ dagger.#Plan & {
 		"secret.txt": read: contents: dagger.#Secret
 	}
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 		test: {
-			concrete: dagger.#Exec & {
+			concrete: core.#Exec & {
 				input: image.output
 				args: ["sh", "-c", client.filesystem."cmd.sh".read.contents]
 			}
 			usage: {
-				string: dagger.#Exec & {
+				string: core.#Exec & {
 					input: image.output
 					args: ["test", client.filesystem."test.txt".read.contents, "=", "foo"]
 				}
-				secret: dagger.#Exec & {
+				secret: core.#Exec & {
 					input: image.output
 					mounts: secret: {
 						dest:     "/run/secrets/test"

tests/plan/client/filesystem/read/fs/relative/test.cue

@@ -2,6 +2,7 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
@@ -10,7 +11,7 @@ dagger.#Plan & {
 		include: ["*.txt"]
 	}
 	actions: test: {
-		[string]: dagger.#ReadFile & {
+		[string]: core.#ReadFile & {
 			input: client.filesystem."../rootfs".read.contents
 		}
 		valid: {

tests/plan/client/filesystem/read/fs/usage/test.cue

@@ -2,6 +2,7 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
@@ -10,7 +11,7 @@ dagger.#Plan & {
 		exclude: ["*.log"]
 	}
 	actions: test: {
-		[string]: dagger.#ReadFile & {
+		[string]: core.#ReadFile & {
 			input: client.filesystem.rootfs.read.contents
 		}
 		valid: {

tests/plan/client/filesystem/read/service/invalid.cue

@@ -2,22 +2,23 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	client: filesystem: "/var/run/docker.soc": read: contents: dagger.#Service
 
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		imageWithDocker: dagger.#Exec & {
+		imageWithDocker: core.#Exec & {
 			input: image.output
 			args: ["apk", "add", "--no-cache", "docker-cli"]
 		}
 
-		test: dagger.#Exec & {
+		test: core.#Exec & {
 			input: imageWithDocker.output
 			mounts: docker: {
 				dest:     "/var/run/docker.sock"

tests/plan/client/filesystem/read/service/valid.cue

@@ -2,22 +2,23 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	client: filesystem: "/var/run/docker.sock": read: contents: dagger.#Service
 
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		imageWithDocker: dagger.#Exec & {
+		imageWithDocker: core.#Exec & {
 			input: image.output
 			args: ["apk", "add", "--no-cache", "docker-cli"]
 		}
 
-		test: dagger.#Exec & {
+		test: core.#Exec & {
 			input: imageWithDocker.output
 			mounts: docker: {
 				dest:     "/var/run/docker.sock"

tests/plan/client/filesystem/read/service/windows.cue

@@ -2,22 +2,23 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	client: filesystem: "//./pipe/docker_engine": read: contents: dagger.#Service
 
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		imageWithDocker: dagger.#Exec & {
+		imageWithDocker: core.#Exec & {
 			input: image.output
 			args: ["apk", "add", "--no-cache", "docker-cli"]
 		}
 
-		test: dagger.#Exec & {
+		test: core.#Exec & {
 			input: imageWithDocker.output
 			mounts: docker: {
 				dest:     "/var/run/docker.sock"

tests/plan/client/filesystem/write/test.cue

@@ -2,6 +2,7 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
@@ -15,30 +16,30 @@ dagger.#Plan & {
 	}
 
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 		test: {
-			fs: data: dagger.#WriteFile & {
+			fs: data: core.#WriteFile & {
 				input:    dagger.#Scratch
 				path:     "/test"
 				contents: "foobar"
 			}
 			file: {
 				// Only using contents for reference in client
-				data: dagger.#WriteFile & {
+				data: core.#WriteFile & {
 					input:    dagger.#Scratch
 					path:     "/test"
 					contents: "foobaz"
 				}
 			}
 			secret: {
-				create: dagger.#WriteFile & {
+				create: core.#WriteFile & {
 					input:    dagger.#Scratch
 					path:     "/test"
 					contents: "foo-barab-oof"
 				}
-				data: dagger.#NewSecret & {
+				data: core.#NewSecret & {
 					input: create.output
 					path:  "/test"
 				}

tests/plan/hello-europa/main.cue

@@ -2,21 +2,21 @@ package main
 
 import (
 	"dagger.io/dagger"
-	// "alpha.dagger.io/os"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: test: {
-		_image: dagger.#Pull & {
+		_image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		_exec: dagger.#Exec & {
+		_exec: core.#Exec & {
 			input: _image.output
 			args: ["sh", "-c", "echo -n Hello Europa > /out.txt"]
 		}
 
-		_verify: dagger.#ReadFile & {
+		_verify: core.#ReadFile & {
 			input: _exec.output
 			path:  "/out.txt"
 		} & {

tests/plan/platform/config_platform_failure_invalid_platform.cue

@@ -1,17 +1,19 @@
 package main
 
 import (
+	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	platform: "linux/unknown"
 
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0"
 		}
 
-		writeArch: dagger.#Exec & {
+		writeArch: core.#Exec & {
 			input:  image.output
 			always: true
 			args: [
@@ -21,7 +23,7 @@ dagger.#Plan & {
 			]
 		}
 
-		verify: dagger.#ReadFile & {
+		verify: core.#ReadFile & {
 			input: writeArch.output
 			path:  "/arch.txt"
 		} & {

tests/plan/platform/config_platform_linux_amd64.cue

@@ -1,17 +1,19 @@
 package main
 
 import (
+	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	platform: "linux/amd64"
 
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0"
 		}
 
-		writeArch: dagger.#Exec & {
+		writeArch: core.#Exec & {
 			input:  image.output
 			always: true
 			args: [
@@ -21,7 +23,7 @@ dagger.#Plan & {
 			]
 		}
 
-		verify: dagger.#ReadFile & {
+		verify: core.#ReadFile & {
 			input: writeArch.output
 			path:  "/arch.txt"
 		} & {

tests/plan/platform/config_platform_linux_arm64.cue

@@ -1,17 +1,19 @@
 package main
 
 import (
+	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	platform: "linux/arm64"
 
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0"
 		}
 
-		writeArch: dagger.#Exec & {
+		writeArch: core.#Exec & {
 			input:  image.output
 			always: true
 			args: [
@@ -21,7 +23,7 @@ dagger.#Plan & {
 			]
 		}
 
-		verify: dagger.#ReadFile & {
+		verify: core.#ReadFile & {
 			input: writeArch.output
 			path:  "/arch.txt"
 		} & {

tests/plan/with/with.cue

@@ -2,18 +2,19 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
 		params: foo: string
 
-		_image: dagger.#Pull & {
+		_image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
 		test: {
-			[string]: dagger.#Exec & {
+			[string]: core.#Exec & {
 				input: _image.output
 				env: FOO: string
 				args: [

tests/tasks.bats

@@ -63,7 +63,7 @@ setup() {
 
 @test "task: #Dockerfile" {
     cd "$TESTDIR"/tasks/dockerfile
-    "$DAGGER" "do" -p ./dockerfile.cue
+    "$DAGGER" "do" -p ./dockerfile.cue verify
     "$DAGGER" "do" -p ./inlined_dockerfile.cue verify
     "$DAGGER" "do" -p ./inlined_dockerfile_heredoc.cue verify
     "$DAGGER" "do" -p ./dockerfile_path.cue verify

tests/tasks/copy/copy_exec.cue

@@ -2,15 +2,16 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		exec: dagger.#Exec & {
+		exec: core.#Exec & {
 			input: image.output
 			args: [
 				"sh", "-c",
@@ -20,7 +21,7 @@ dagger.#Plan & {
 			]
 		}
 		test: {
-			verify_file: dagger.#ReadFile & {
+			verify_file: core.#ReadFile & {
 				input: exec.output
 				path:  "/output.txt"
 			} & {
@@ -28,14 +29,14 @@ dagger.#Plan & {
 				contents: "hello world"
 			}
 
-			copy: dagger.#Copy & {
+			copy: core.#Copy & {
 				input:    image.output
 				contents: exec.output
 				source:   "/output.txt"
 				dest:     "/output.txt"
 			}
 
-			verify_copy: dagger.#ReadFile & {
+			verify_copy: core.#ReadFile & {
 				input: copy.output
 				path:  "/output.txt"
 			} & {

tests/tasks/copy/copy_exec_invalid.cue

@@ -2,15 +2,16 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		exec: dagger.#Exec & {
+		exec: core.#Exec & {
 			input: image.output
 			args: [
 				"sh", "-c",
@@ -21,7 +22,7 @@ dagger.#Plan & {
 		}
 
 		test: {
-			verify_file: dagger.#ReadFile & {
+			verify_file: core.#ReadFile & {
 				input: exec.output
 				path:  "/output.txt"
 			} & {
@@ -29,13 +30,13 @@ dagger.#Plan & {
 				contents: "hello world from dagger"
 			}
 
-			copy: dagger.#Copy & {
+			copy: core.#Copy & {
 				input:    image.output
 				contents: exec.output
 				source:   "/output.txt"
 				dest:     "/output.txt"
 			}
-			verify_copy: dagger.#ReadFile & {
+			verify_copy: core.#ReadFile & {
 				input: copy.output
 				path:  "/output.txt"
 			} & {

tests/tasks/copy/copy_file.cue

@@ -2,20 +2,21 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		alpine3_15_0: dagger.#Pull & {
+		alpine3_15_0: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		busybox1_34_1: dagger.#Pull & {
+		busybox1_34_1: core.#Pull & {
 			source: "busybox:1.34.1-glibc@sha256:ec98391b8f0911db08be2ee6c46813eeac17b9625b402ea1ce45dcfcd05d78d6"
 		}
 
 		test: {
-			verify_alpine_3_15_0: dagger.#ReadFile & {
+			verify_alpine_3_15_0: core.#ReadFile & {
 				input: alpine3_15_0.output
 				path:  "/etc/alpine-release"
 			} & {
@@ -23,14 +24,14 @@ dagger.#Plan & {
 				contents: "3.15.0\n"
 			}
 
-			copy: dagger.#Copy & {
+			copy: core.#Copy & {
 				input:    busybox1_34_1.output
 				contents: alpine3_15_0.output
 				source:   "/etc/alpine-release"
 				dest:     "/alpine3_15_0_release"
 			}
 
-			verify_copy: dagger.#ReadFile & {
+			verify_copy: core.#ReadFile & {
 				input: copy.output
 				path:  "/alpine3_15_0_release"
 			} & {

tests/tasks/diff/diff.cue

@@ -2,18 +2,19 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		alpineBase: dagger.#Pull & {
+		alpineBase: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
-		busyboxBase: dagger.#Pull & {
+		busyboxBase: core.#Pull & {
 			source: "busybox:1.34.1@sha256:1286c6d3c393023ef93c247724a6a2d665528144ffe07bacb741cc2b4edfefad"
 		}
 
-		exec1: dagger.#Exec & {
+		exec1: core.#Exec & {
 			input: alpineBase.output
 			args: [
 				"sh", "-c",
@@ -23,7 +24,7 @@ dagger.#Plan & {
 			]
 		}
 
-		exec2: dagger.#Exec & {
+		exec2: core.#Exec & {
 			input: exec1.output
 			args: [
 				"sh", "-c",
@@ -33,46 +34,46 @@ dagger.#Plan & {
 			]
 		}
 
-		removeme: dagger.#WriteFile & {
+		removeme: core.#WriteFile & {
 			input:    dagger.#Scratch
 			path:     "/removeme"
 			contents: "removeme"
 		}
 
 		test: {
-			diff: dagger.#Diff & {
+			diff: core.#Diff & {
 				lower: alpineBase.output
 				upper: exec2.output
 			}
 
-			verify_diff_foo: dagger.#ReadFile & {
+			verify_diff_foo: core.#ReadFile & {
 				input: diff.output
 				path:  "/dir/foo"
 			} & {
 				contents: "foo"
 			}
-			verify_diff_bar: dagger.#ReadFile & {
+			verify_diff_bar: core.#ReadFile & {
 				input: diff.output
 				path:  "/dir/bar"
 			} & {
 				contents: "bar"
 			}
 
-			mergediff: dagger.#Merge & {
+			mergediff: core.#Merge & {
 				inputs: [
 					busyboxBase.output,
 					removeme.output,
 					diff.output,
 				]
 			}
-			verify_remove: dagger.#Exec & {
+			verify_remove: core.#Exec & {
 				input: mergediff.output
 				args: ["test", "!", "-e", "/removeme"]
 			}
-			verify_no_alpine_base: dagger.#Exec & {
+			verify_no_alpine_base: core.#Exec & {
 				input: mergediff.output
 				// make sure the the Diff actually separated files from the base
-				// by testing the non-existence of a file that only exists in the 
+				// by testing the non-existence of a file that only exists in the
 				// alpine base, not busybox
 				args: ["test", "!", "-e", "/etc/alpine-release"]
 			}

tests/tasks/dockerfile/build_args.cue

@@ -2,12 +2,13 @@ package testing
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	client: filesystem: testdata: read: contents: dagger.#FS
 
-	actions: build: dagger.#Dockerfile & {
+	actions: build: core.#Dockerfile & {
 		source: client.filesystem.testdata.read.contents
 		dockerfile: contents: """
 			FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d

tests/tasks/dockerfile/build_auth.cue

@@ -2,6 +2,7 @@ package testing
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
@@ -15,12 +16,12 @@ dagger.#Plan & {
 	}
 
 	actions: {
-		sopsSecrets: dagger.#DecodeSecret & {
+		sopsSecrets: core.#DecodeSecret & {
 			format: "yaml"
 			input:  client.commands.sops.stdout
 		}
 
-		build: dagger.#Dockerfile & {
+		build: core.#Dockerfile & {
 			source: client.filesystem.testdata.read.contents
 			auth: "daggerio/ci-test:private-pull": {
 				username: "daggertest"

tests/tasks/dockerfile/dockerfile.cue

@@ -2,17 +2,18 @@ package testing
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	client: filesystem: testdata: read: contents: dagger.#FS
 
 	actions: {
-		build: dagger.#Dockerfile & {
+		build: core.#Dockerfile & {
 			source: client.filesystem.testdata.read.contents
 		}
 
-		verify: dagger.#Exec & {
+		verify: core.#Exec & {
 			input: build.output
 			args: ["sh", "-c", "test $(cat /dir/foo) = foobar"]
 		}

tests/tasks/dockerfile/dockerfile_path.cue

@@ -2,18 +2,19 @@ package testing
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	client: filesystem: testdata: read: contents: dagger.#FS
 
 	actions: {
-		build: dagger.#Dockerfile & {
+		build: core.#Dockerfile & {
 			source: client.filesystem.testdata.read.contents
 			dockerfile: path: "./dockerfilepath/Dockerfile.custom"
 		}
 
-		verify: dagger.#Exec & {
+		verify: core.#Exec & {
 			input: build.output
 			args: ["sh", "-c", "test $(cat /test) = dockerfilePath"]
 		}

tests/tasks/dockerfile/image_config.cue

@@ -2,6 +2,7 @@ package testing
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
@@ -9,7 +10,7 @@ dagger.#Plan & {
 
 	actions: {
 		// FIXME: this doesn't test anything beside not crashing
-		build: dagger.#Dockerfile & {
+		build: core.#Dockerfile & {
 			source: client.filesystem.testdata.read.contents
 			dockerfile: contents: """
 				FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d

tests/tasks/dockerfile/inlined_dockerfile.cue

@@ -2,13 +2,14 @@ package testing
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	client: filesystem: testdata: read: contents: dagger.#FS
 
 	actions: {
-		build: dagger.#Dockerfile & {
+		build: core.#Dockerfile & {
 			source: client.filesystem.testdata.read.contents
 			dockerfile: contents: """
 				FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d
@@ -16,7 +17,7 @@ dagger.#Plan & {
 				"""
 		}
 
-		verify: dagger.#Exec & {
+		verify: core.#Exec & {
 			input: build.output
 			args: ["sh", "-c", "test $(cat /output) = foobar"]
 		}

tests/tasks/dockerfile/inlined_dockerfile_heredoc.cue

@@ -2,13 +2,14 @@ package testing
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	client: filesystem: testdata: read: contents: dagger.#FS
 
 	actions: {
-		build: dagger.#Dockerfile & {
+		build: core.#Dockerfile & {
 			source: client.filesystem.testdata.read.contents
 			dockerfile: contents: """
 				# syntax = docker/dockerfile:1.3
@@ -17,7 +18,7 @@ dagger.#Plan & {
 				"""
 		}
 
-		verify: dagger.#Exec & {
+		verify: core.#Exec & {
 			input: build.output
 			args: ["sh", "-c", "test $(cat /output) = foobar"]
 		}

tests/tasks/dockerfile/labels.cue

@@ -2,6 +2,7 @@ package testing
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
@@ -9,7 +10,7 @@ dagger.#Plan & {
 
 	actions: {
 		// FIXME: this doesn't test anything beside not crashing
-		build: dagger.#Dockerfile & {
+		build: core.#Dockerfile & {
 			source: client.filesystem.testdata.read.contents
 			dockerfile: contents: """
 				FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d

tests/tasks/dockerfile/platform.cue

@@ -2,6 +2,7 @@ package testing
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
@@ -9,7 +10,7 @@ dagger.#Plan & {
 
 	actions: {
 		// FIXME: this doesn't test anything beside not crashing
-		build: dagger.#Dockerfile & {
+		build: core.#Dockerfile & {
 			source: client.filesystem.testdata.read.contents
 			dockerfile: contents: """
 				FROM alpine:latest@sha256:ab00606a42621fb68f2ed6ad3c88be54397f981a7b70a79db3d1172b11c4367d

tests/tasks/exec/args.cue

@@ -2,20 +2,21 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		exec: dagger.#Exec & {
+		exec: core.#Exec & {
 			input: image.output
 			args: ["sh", "-c", "echo -n hello world > /output.txt"]
 		}
 
-		verify: dagger.#ReadFile & {
+		verify: core.#ReadFile & {
 			input: exec.output
 			path:  "/output.txt"
 		} & {

tests/tasks/exec/env.cue

@@ -2,15 +2,16 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		verify: dagger.#Exec & {
+		verify: core.#Exec & {
 			input: image.output
 			env: TEST: "hello world"
 			args: [

tests/tasks/exec/env_secret.cue

@@ -2,17 +2,18 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	client: filesystem: "secret.txt": read: contents: dagger.#Secret
 
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		verify: dagger.#Exec & {
+		verify: core.#Exec & {
 			input: image.output
 			env: TEST: client.filesystem."secret.txt".read.contents
 			args: [

tests/tasks/exec/hosts.cue

@@ -2,15 +2,16 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		verify: dagger.#Exec & {
+		verify: core.#Exec & {
 			input: image.output
 			hosts: "unit.test": "1.2.3.4"
 			args: [

tests/tasks/exec/mount_cache.cue

@@ -2,19 +2,20 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		sharedCache: dagger.#CacheDir & {
+		sharedCache: core.#CacheDir & {
 			id: "mycache"
 		}
 
-		exec: dagger.#Exec & {
+		exec: core.#Exec & {
 			input: image.output
 			mounts: cache: {
 				dest:     "/cache"
@@ -29,7 +30,7 @@ dagger.#Plan & {
 		}
 
 		test: {
-			verify: dagger.#Exec & {
+			verify: core.#Exec & {
 				input: image.output
 				mounts: cache: {
 					dest:     "/cache"
@@ -44,10 +45,10 @@ dagger.#Plan & {
 				]
 			}
 
-			otherCache: dagger.#CacheDir & {
+			otherCache: core.#CacheDir & {
 				id: "othercache"
 			}
-			verifyOtherCache: dagger.#Exec & {
+			verifyOtherCache: core.#Exec & {
 				input: image.output
 				mounts: cache: {
 					dest:     "/cache"

tests/tasks/exec/mount_fs.cue

@@ -2,15 +2,16 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		exec: dagger.#Exec & {
+		exec: core.#Exec & {
 			input: image.output
 			args: [
 				"sh", "-c",
@@ -21,7 +22,7 @@ dagger.#Plan & {
 		}
 
 		test: {
-			verify: dagger.#Exec & {
+			verify: core.#Exec & {
 				input: image.output
 				mounts: fs: {
 					dest:     "/target"
@@ -36,7 +37,7 @@ dagger.#Plan & {
 				]
 			}
 
-			verifyRO: dagger.#Exec & {
+			verifyRO: core.#Exec & {
 				input: image.output
 				mounts: fs: {
 					dest:     "/target"
@@ -54,7 +55,7 @@ dagger.#Plan & {
 				]
 			}
 
-			verifySource: dagger.#Exec & {
+			verifySource: core.#Exec & {
 				input: image.output
 				mounts: fs: {
 					dest:     "/target.txt"

tests/tasks/exec/mount_secret.cue

@@ -2,17 +2,18 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	client: env: TESTSECRET: dagger.#Secret
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
 		test: {
-			verify: dagger.#Exec & {
+			verify: core.#Exec & {
 				input: image.output
 				mounts: secret: {
 					dest:     "/run/secrets/test"
@@ -27,7 +28,7 @@ dagger.#Plan & {
 				]
 			}
 
-			verifyPerm: dagger.#Exec & {
+			verifyPerm: core.#Exec & {
 				input: image.output
 				mounts: secret: {
 					dest:     "/run/secrets/test"

tests/tasks/exec/mount_service.cue

@@ -2,22 +2,23 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	client: filesystem: "/var/run/docker.sock": read: contents: dagger.#Service
 
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		imageWithDocker: dagger.#Exec & {
+		imageWithDocker: core.#Exec & {
 			input: image.output
 			args: ["apk", "add", "--no-cache", "docker-cli"]
 		}
 
-		verify: dagger.#Exec & {
+		verify: core.#Exec & {
 			input: imageWithDocker.output
 			mounts: docker: {
 				dest:     "/var/run/docker.sock"

tests/tasks/exec/mount_tmp.cue

@@ -2,19 +2,20 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		exec: dagger.#Exec & {
+		exec: core.#Exec & {
 			input: image.output
 			mounts: temp: {
 				dest:     "/temp"
-				contents: dagger.#TempDir
+				contents: core.#TempDir
 			}
 			args: [
 				"sh", "-c",
@@ -24,7 +25,7 @@ dagger.#Plan & {
 			]
 		}
 
-		verify: dagger.#Exec & {
+		verify: core.#Exec & {
 			input: exec.output
 			args: [
 				"sh", "-c",

tests/tasks/exec/user.cue

@@ -2,20 +2,21 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		addUser: dagger.#Exec & {
+		addUser: core.#Exec & {
 			input: image.output
 			args: ["adduser", "-D", "test"]
 		}
 		test: {
-			verifyUsername: dagger.#Exec & {
+			verifyUsername: core.#Exec & {
 				input: addUser.output
 				user:  "test"
 				args: [
@@ -26,7 +27,7 @@ dagger.#Plan & {
 				]
 			}
 
-			verifyUserID: dagger.#Exec & {
+			verifyUserID: core.#Exec & {
 				input: addUser.output
 				user:  "1000"
 				args: [

tests/tasks/exec/workdir.cue

@@ -2,15 +2,16 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		verify: dagger.#Exec & {
+		verify: core.#Exec & {
 			input:   image.output
 			workdir: "/tmp"
 			args: [

tests/tasks/export/export.cue

@@ -2,21 +2,22 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: test: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15"
 		}
 
-		export: dagger.#Export & {
+		export: core.#Export & {
 			input:  image.output
 			config: image.config
 			tag:    "example"
 		}
 
-		verify: dagger.#Exec & {
+		verify: core.#Exec & {
 			input: image.output
 			mounts: exported: {
 				contents: export.output

tests/tasks/gitpull/bad_ref.cue

@@ -2,10 +2,11 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
-	actions: badref: dagger.#GitPull & {
+	actions: badref: core.#GitPull & {
 		remote: "https://github.com/blocklayerhq/acme-clothing.git"
 		ref:    "lalalalal"
 	}

tests/tasks/gitpull/bad_remote.cue

@@ -2,10 +2,11 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
-	actions: badremote: dagger.#GitPull & {
+	actions: badremote: core.#GitPull & {
 		remote: "https://github.com/blocklayerhq/lalalala.git"
 		ref:    "master"
 	}

tests/tasks/gitpull/exists.cue

@@ -2,10 +2,11 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
-	actions: gitPull: dagger.#GitPull & {
+	actions: gitPull: core.#GitPull & {
 		remote: "https://github.com/blocklayerhq/acme-clothing.git"
 		ref:    "master"
 	}

tests/tasks/gitpull/git_dir.cue

@@ -2,26 +2,27 @@ package testing
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		repo1: dagger.#GitPull & {
+		repo1: core.#GitPull & {
 			remote: "https://github.com/blocklayerhq/acme-clothing.git"
 			ref:    "master"
 		}
 
-		repo2: dagger.#GitPull & {
+		repo2: core.#GitPull & {
 			remote:     "https://github.com/blocklayerhq/acme-clothing.git"
 			ref:        "master"
 			keepGitDir: true
 		}
 
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0"
 		}
 
-		verify: dagger.#Exec & {
+		verify: core.#Exec & {
 			input: image.output
 			args: ["sh", "-c", """
 				set -eu

tests/tasks/gitpull/invalid.cue

@@ -2,8 +2,9 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
-	actions: invalid: dagger.#GitPull & {}
+	actions: invalid: core.#GitPull & {}
 }

tests/tasks/gitpull/private_repo.cue

@@ -2,6 +2,7 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
@@ -13,16 +14,16 @@ dagger.#Plan & {
 
 	actions: {
 
-		alpine: dagger.#Pull & {
+		alpine: core.#Pull & {
 			source: "alpine:3.15.0"
 		}
 
-		sopsSecrets: dagger.#DecodeSecret & {
+		sopsSecrets: core.#DecodeSecret & {
 			format: "yaml"
 			input:  client.commands.sops.stdout
 		}
 
-		testRepo: dagger.#GitPull & {
+		testRepo: core.#GitPull & {
 			remote: "https://github.com/dagger/dagger.git"
 			ref:    "main"
 			auth: {
@@ -31,7 +32,7 @@ dagger.#Plan & {
 			}
 		}
 
-		testContent: dagger.#Exec & {
+		testContent: core.#Exec & {
 			input:  alpine.output
 			always: true
 			args: ["ls", "-l", "/repo/README.md"]

tests/tasks/hidden/hidden.cue

@@ -2,21 +2,22 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 	"testing.dagger.io/hidden"
 )
 
 dagger.#Plan & {
 	actions: {
-		pull: dagger.#Pull & {
+		pull: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
-		_write: dagger.#WriteFile & {
+		_write: core.#WriteFile & {
 			input:       pull.output
 			path:        "/testing"
 			contents:    "1,2,3"
 			permissions: 700
 		}
-		readfile: dagger.#ReadFile & {
+		readfile: core.#ReadFile & {
 			input: _write.output
 			path:  "/testing"
 		} & {

tests/tasks/httpfetch/exist.cue

@@ -2,10 +2,11 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
-	actions: fetch: dagger.#HTTPFetch & {
+	actions: fetch: core.#HTTPFetch & {
 		source: "https://releases.dagger.io/dagger/latest_version"
 		dest:   "/latest.html"
 	}

tests/tasks/httpfetch/not_exist.cue

@@ -2,10 +2,11 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
-	actions: fetch: dagger.#HTTPFetch & {
+	actions: fetch: core.#HTTPFetch & {
 		source: "https://releases.dagger.io/dagger/asfgdsfg"
 		dest:   "/latest.html"
 	}

tests/tasks/merge/merge.cue

@@ -2,15 +2,16 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		exec: dagger.#Exec & {
+		exec: core.#Exec & {
 			input: image.output
 			args: [
 				"sh", "-c",
@@ -20,31 +21,31 @@ dagger.#Plan & {
 			]
 		}
 
-		dir: dagger.#Mkdir & {
+		dir: core.#Mkdir & {
 			input: dagger.#Scratch
 			path:  "/dir"
 		}
 
-		dirfoo: dagger.#WriteFile & {
+		dirfoo: core.#WriteFile & {
 			input:    dir.output
 			path:     "/dir/foo"
 			contents: "foo"
 		}
 
-		dirfoo2: dagger.#WriteFile & {
+		dirfoo2: core.#WriteFile & {
 			input:    dir.output
 			path:     "/dir/foo"
 			contents: "foo2"
 		}
 
-		dirbar: dagger.#WriteFile & {
+		dirbar: core.#WriteFile & {
 			input:    dir.output
 			path:     "/dir/bar"
 			contents: "bar"
 		}
 
 		test: {
-			merge: dagger.#Merge & {
+			merge: core.#Merge & {
 				inputs: [
 					dir.output,
 					dirfoo.output,
@@ -54,19 +55,19 @@ dagger.#Plan & {
 				]
 			}
 
-			verify_merge_output: dagger.#ReadFile & {
+			verify_merge_output: core.#ReadFile & {
 				input: merge.output
 				path:  "/output.txt"
 			} & {
 				contents: "hello world"
 			}
-			verify_merge_dirbar: dagger.#ReadFile & {
+			verify_merge_dirbar: core.#ReadFile & {
 				input: merge.output
 				path:  "/dir/bar"
 			} & {
 				contents: "bar"
 			}
-			verify_merge_dirfoo: dagger.#ReadFile & {
+			verify_merge_dirfoo: core.#ReadFile & {
 				input: merge.output
 				path:  "/dir/foo"
 			} & {

tests/tasks/mkdir/mkdir.cue

@@ -2,27 +2,28 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		mkdir: dagger.#Mkdir & {
+		mkdir: core.#Mkdir & {
 			input: image.output
 			path:  "/test"
 		}
 
-		writeChecker: dagger.#WriteFile & {
+		writeChecker: core.#WriteFile & {
 			input:       mkdir.output
 			path:        "/test/foo"
 			contents:    "bar"
 			permissions: 700
 		}
 
-		readChecker: dagger.#ReadFile & {
+		readChecker: core.#ReadFile & {
 			input: writeChecker.output
 			path:  "/test/foo"
 		} & {

tests/tasks/mkdir/mkdir_failure_disable_parents.cue

@@ -2,28 +2,29 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		mkdir: dagger.#Mkdir & {
+		mkdir: core.#Mkdir & {
 			input:   image.output
 			path:    "/test/baz"
 			parents: false
 		}
 
-		writeChecker: dagger.#WriteFile & {
+		writeChecker: core.#WriteFile & {
 			input:       mkdir.output
 			path:        "/test/baz/foo"
 			contents:    "bar"
 			permissions: 700
 		}
 
-		readChecker: dagger.#ReadFile & {
+		readChecker: core.#ReadFile & {
 			input: writeChecker.output
 			path:  "/test/baz/foo"
 		} & {

tests/tasks/mkdir/mkdir_parents.cue

@@ -2,27 +2,28 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		mkdir: dagger.#Mkdir & {
+		mkdir: core.#Mkdir & {
 			input: image.output
 			path:  "/test/baz"
 		}
 
-		writeChecker: dagger.#WriteFile & {
+		writeChecker: core.#WriteFile & {
 			input:       mkdir.output
 			path:        "/test/baz/foo"
 			contents:    "bar"
 			permissions: 700
 		}
 
-		readChecker: dagger.#ReadFile & {
+		readChecker: core.#ReadFile & {
 			input: writeChecker.output
 			path:  "/test/baz/foo"
 		} & {

tests/tasks/newsecret/newsecret.cue

@@ -2,25 +2,26 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		generate: dagger.#Exec & {
+		generate: core.#Exec & {
 			input: image.output
 			args: ["sh", "-c", "echo test > /secret"]
 		}
 
-		load: dagger.#NewSecret & {
+		load: core.#NewSecret & {
 			input: generate.output
 			path:  "/secret"
 		}
 
-		verify: dagger.#Exec & {
+		verify: core.#Exec & {
 			input: image.output
 			mounts: secret: {
 				dest:     "/run/secrets/test"

tests/tasks/pull/pull.cue

@@ -2,10 +2,11 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
-	actions: pull: dagger.#Pull & {
+	actions: pull: core.#Pull & {
 		source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 	} & {
 		// assert result

tests/tasks/pull/pull_auth.cue

@@ -2,6 +2,7 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
@@ -12,12 +13,12 @@ dagger.#Plan & {
 	}
 
 	actions: {
-		sopsSecrets: dagger.#DecodeSecret & {
+		sopsSecrets: core.#DecodeSecret & {
 			format: "yaml"
 			input:  client.commands.sops.stdout
 		}
 
-		pull: dagger.#Pull & {
+		pull: core.#Pull & {
 			source: "daggerio/ci-test:private-pull@sha256:c74f1b1166784193ea6c8f9440263b9be6cae07dfe35e32a5df7a31358ac2060"
 			auth: {
 				username: "daggertest"

tests/tasks/push/push.cue

@@ -3,6 +3,7 @@ package main
 import (
 	"strings"
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
@@ -18,24 +19,24 @@ dagger.#Plan & {
 	}
 
 	actions: {
-		sopsSecrets: dagger.#DecodeSecret & {
+		sopsSecrets: core.#DecodeSecret & {
 			format: "yaml"
 			input:  client.commands.sops.stdout
 		}
 
 		randomString: {
-			baseImage: dagger.#Pull & {
+			baseImage: core.#Pull & {
 				source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 			}
 
-			image: dagger.#Exec & {
+			image: core.#Exec & {
 				input: baseImage.output
 				args: [
 					"sh", "-c", "echo -n $RANDOM > /output.txt",
 				]
 			}
 
-			outputFile: dagger.#ReadFile & {
+			outputFile: core.#ReadFile & {
 				input: image.output
 				path:  "/output.txt"
 			}
@@ -44,7 +45,7 @@ dagger.#Plan & {
 		}
 
 		// Push image with random content
-		push: dagger.#Push & {
+		push: core.#Push & {
 			dest:  "daggerio/ci-test:\(randomString.output)"
 			input: randomString.image.output
 			config: env: FOO: randomString.output
@@ -52,7 +53,7 @@ dagger.#Plan & {
 		}
 
 		// Pull same image and check the content
-		pull: dagger.#Pull & {
+		pull: core.#Pull & {
 			source: "daggerio/ci-test:\(randomString.output)"
 			auth:   #auth
 		} & {
@@ -62,7 +63,7 @@ dagger.#Plan & {
 			config: env: FOO: randomString.output
 		}
 
-		pullOutputFile: dagger.#ReadFile & {
+		pullOutputFile: core.#ReadFile & {
 			input: pull.output
 			path:  "/output.txt"
 		}

tests/tasks/readfile/readfile.cue

@@ -2,15 +2,16 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		readfile: dagger.#ReadFile & {
+		readfile: core.#ReadFile & {
 			input: image.output
 			path:  "/etc/alpine-release"
 		} & {

tests/tasks/scratch/scratch.cue

@@ -2,15 +2,16 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		exec: dagger.#Exec & {
+		exec: core.#Exec & {
 			input: image.output
 			mounts: fs: {
 				dest:     "/scratch"

tests/tasks/scratch/scratch_build_scratch.cue

@@ -2,10 +2,11 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
-	actions: build: dagger.#Build & {
+	actions: build: core.#Dockerfile & {
 		source: dagger.#Scratch
 		dockerfile: contents: "FROM scratch"
 		// Assert that output is dagger.#Scratch

tests/tasks/scratch/scratch_writefile.cue

@@ -2,17 +2,18 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		write: dagger.#WriteFile & {
+		write: core.#WriteFile & {
 			input:       dagger.#Scratch
 			path:        "/testing"
 			contents:    "1,2,3"
 			permissions: 700
 		}
-		readfile: dagger.#ReadFile & {
+		readfile: core.#ReadFile & {
 			input: write.output
 			path:  "/testing"
 		} & {

tests/tasks/source/source.cue

@@ -2,19 +2,20 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		source: dagger.#Source & {
+		source: core.#Source & {
 			path: "."
 		}
 
-		exec: dagger.#Exec & {
+		exec: core.#Exec & {
 			input: image.output
 			mounts: code: {
 				dest:     "/src"
@@ -24,7 +25,7 @@ dagger.#Plan & {
 		}
 
 		test: {
-			verifyHello: dagger.#ReadFile & {
+			verifyHello: core.#ReadFile & {
 				input: source.output
 				path:  "/world.txt"
 			} & {
@@ -32,7 +33,7 @@ dagger.#Plan & {
 				contents: "world\n"
 			}
 
-			verifyWorld: dagger.#ReadFile & {
+			verifyWorld: core.#ReadFile & {
 				input: exec.output
 				path:  "/test.txt"
 			} & {

tests/tasks/source/source_include_exclude.cue

@@ -2,25 +2,26 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		sourceInclude: dagger.#Source & {
+		sourceInclude: core.#Source & {
 			path: "."
 			include: ["hello.txt"]
 		}
 
-		sourceExclude: dagger.#Source & {
+		sourceExclude: core.#Source & {
 			path: "."
 			exclude: ["hello.txt"]
 		}
 
-		test: dagger.#Exec & {
+		test: core.#Exec & {
 			input: image.output
 			mounts: {
 				include: {

tests/tasks/source/source_invalid_path.cue

@@ -2,15 +2,16 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		source: dagger.#Source & {
+		source: core.#Source & {
 			path: "testdata/../.."
 		}
 	}

tests/tasks/source/source_not_exist.cue

@@ -1,15 +1,17 @@
 package main
 
 import (
+	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		source: dagger.#Source & {
+		source: core.#Source & {
 			path: "not/exist"
 		}
 	}

tests/tasks/source/source_relative.cue

@@ -2,19 +2,20 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		source: dagger.#Source & {
+		source: core.#Source & {
 			path: "./testdata"
 		}
 
-		verifyHello: dagger.#ReadFile & {
+		verifyHello: core.#ReadFile & {
 			input: source.output
 			path:  "/world.txt"
 		} & {

tests/tasks/subdir/subdir_invalid_exec.cue

@@ -2,32 +2,33 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		mkdir: dagger.#Mkdir & {
+		mkdir: core.#Mkdir & {
 			input: image.output
 			path:  "/test/foo"
 		}
 
-		writeChecker: dagger.#WriteFile & {
+		writeChecker: core.#WriteFile & {
 			input:       mkdir.output
 			path:        "/test/foo/hello"
 			contents:    "world"
 			permissions: 0o700
 		}
 
-		subdir: dagger.#Subdir & {
+		subdir: core.#Subdir & {
 			input: writeChecker.output
 			path:  "/test/foo"
 		}
 
-		verify: dagger.#Exec & {
+		verify: core.#Exec & {
 			input: subdir.output
 			args: [
 				"sh", "-c",

tests/tasks/subdir/subdir_invalid_path.cue

@@ -2,32 +2,33 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		mkdir: dagger.#Mkdir & {
+		mkdir: core.#Mkdir & {
 			input: image.output
 			path:  "/test/foo"
 		}
 
-		writeChecker: dagger.#WriteFile & {
+		writeChecker: core.#WriteFile & {
 			input:       mkdir.output
 			path:        "/test/foo/hello"
 			contents:    "world"
 			permissions: 0o700
 		}
 
-		subdir: dagger.#Subdir & {
+		subdir: core.#Subdir & {
 			input: writeChecker.output
 			path:  "/directorynotfound"
 		}
 
-		verify: dagger.#Exec & {
+		verify: core.#Exec & {
 			input: image.output
 			mounts: fs: {
 				dest:     "/target"

tests/tasks/subdir/subdir_simple.cue

@@ -2,32 +2,33 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		mkdir: dagger.#Mkdir & {
+		mkdir: core.#Mkdir & {
 			input: image.output
 			path:  "/test/foo"
 		}
 
-		writeChecker: dagger.#WriteFile & {
+		writeChecker: core.#WriteFile & {
 			input:       mkdir.output
 			path:        "/test/foo/hello"
 			contents:    "world"
 			permissions: 0o700
 		}
 
-		subdir: dagger.#Subdir & {
+		subdir: core.#Subdir & {
 			input: writeChecker.output
 			path:  "/test/foo"
 		}
 
-		verify: dagger.#ReadFile & {
+		verify: core.#ReadFile & {
 			input: subdir.output
 			path:  "/hello"
 		} & {

tests/tasks/trimsecret/trimsecret.cue

@@ -2,30 +2,31 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		image: dagger.#Pull & {
+		image: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		generate: dagger.#Exec & {
+		generate: core.#Exec & {
 			input: image.output
 			args: ["sh", "-c", "echo ' test ' > /secret"]
 		}
 
-		load: dagger.#NewSecret & {
+		load: core.#NewSecret & {
 			input:     generate.output
 			trimSpace: false
 			path:      "/secret"
 		}
 
-		trim: dagger.#TrimSecret & {
+		trim: core.#TrimSecret & {
 			input: load.output
 		}
 
-		verify: dagger.#Exec & {
+		verify: core.#Exec & {
 			input: image.output
 			mounts: secret: {
 				dest:     "/run/secrets/test"

tests/tasks/writefile/writefile.cue

@@ -2,20 +2,21 @@ package main
 
 import (
 	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		pull: dagger.#Pull & {
+		pull: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
-		write: dagger.#WriteFile & {
+		write: core.#WriteFile & {
 			input:       pull.output
 			path:        "/testing"
 			contents:    "1,2,3"
 			permissions: 700
 		}
-		readfile: dagger.#ReadFile & {
+		readfile: core.#ReadFile & {
 			input: write.output
 			path:  "/testing"
 		} & {

tests/tasks/writefile/writefile_failure_diff_contents.cue

@@ -1,20 +1,22 @@
 package main
 
 import (
+	"dagger.io/dagger"
+	"dagger.io/dagger/core"
 )
 
 dagger.#Plan & {
 	actions: {
-		pull: dagger.#Pull & {
+		pull: core.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
-		write: dagger.#WriteFile & {
+		write: core.#WriteFile & {
 			input:       pull.output
 			path:        "/testing"
 			contents:    "1,2,3,4"
 			permissions: 700
 		}
-		readfile: dagger.#ReadFile & {
+		readfile: core.#ReadFile & {
 			input: write.output
 			path:  "/testing"
 		} & {