@cursor/bdk 0.2.9 → 0.2.11

package/dist/internal/cli-images.js

@@ -8,35 +8,6 @@
  * presigned URLs the backend handed back, and finalizes. Bytes never pass
  * through the Cursor backend.
  */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
-var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
-var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
-    function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
-    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-    function fulfill(value) { resume("next", value); }
-    function reject(value) { resume("throw", value); }
-    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-};
 import { spawn } from "node:child_process";
 import { createHash } from "node:crypto";
 import { createWriteStream } from "node:fs";
@@ -109,7 +80,6 @@ function nodeMeetsFloor(version) {
  * `probe`. Failures stop the push; warnings print and continue.
  */
 export function checkImage(inspected, probe) {
-    var _a, _b, _c, _d, _e, _f;
     const checks = [];
     if (inspected.platform === REQUIRED_PLATFORM) {
         checks.push({ label: "platform", value: inspected.platform, status: "ok" });
@@ -132,7 +102,7 @@ export function checkImage(inspected, probe) {
         return checks;
     }
     for (const tool of ["bash", "git"]) {
-        const path = (_a = probe[tool]) !== null && _a !== void 0 ? _a : "";
+        const path = probe[tool] ?? "";
         checks.push(path === ""
             ? {
                 label: tool,
@@ -142,7 +112,7 @@ export function checkImage(inspected, probe) {
             }
             : { label: tool, value: path, status: "ok" });
     }
-    const nodeRaw = (_b = probe.node) !== null && _b !== void 0 ? _b : "";
+    const nodeRaw = probe.node ?? "";
     const nodeVersion = parseNodeVersion(nodeRaw);
     const floor = `${MIN_NODE_VERSION[0]}.${MIN_NODE_VERSION[1]}`;
     if (nodeVersion === undefined) {
@@ -164,7 +134,7 @@ export function checkImage(inspected, probe) {
     else {
         checks.push({ label: "node", value: nodeRaw, status: "ok" });
     }
-    const npm = (_c = probe.npm) !== null && _c !== void 0 ? _c : "";
+    const npm = probe.npm ?? "";
     checks.push(npm === ""
         ? {
             label: "npm",
@@ -173,7 +143,7 @@ export function checkImage(inspected, probe) {
             detail: "npm must be on PATH; the hosted install runs it.",
         }
         : { label: "npm", value: npm, status: "ok" });
-    const user = (_d = probe.user) !== null && _d !== void 0 ? _d : "";
+    const user = probe.user ?? "";
     checks.push(user === "" || user === "root" || user === "0"
         ? { label: "user", value: user === "" ? "root" : user, status: "ok" }
         : {
@@ -182,7 +152,7 @@ export function checkImage(inspected, probe) {
             status: "warning",
             detail: "The image runs as a non-root user. The hosted state directory is mounted root-owned, so installs may fail to write it; prefer no USER instruction or USER root.",
         });
-    const osIds = [(_e = probe.os) !== null && _e !== void 0 ? _e : "", ...((_f = probe.osLike) !== null && _f !== void 0 ? _f : "").split(/\s+/)]
+    const osIds = [probe.os ?? "", ...(probe.osLike ?? "").split(/\s+/)]
         .map(id => id.trim().toLowerCase())
         .filter(id => id !== "");
     const osValue = probe.os === undefined || probe.os === "" ? "unknown" : probe.os;
@@ -251,48 +221,44 @@ function shellDocker() {
         return { id, platform, sizeBytes: Number(size) };
     };
     return {
-        inspect(image) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const scoped = yield runDocker([
-                    "image",
-                    "inspect",
-                    "--platform",
-                    REQUIRED_PLATFORM,
-                    image,
-                    "--format",
-                    format,
-                ]);
-                const variant = scoped.code === 0 ? parse(scoped.stdout) : undefined;
-                // An image with no linux/amd64 variant answers the scoped inspect
-                // with the manifest list itself: no os/arch. Fall through so the
-                // plain inspect names the platform it does have.
-                if (variant !== undefined && variant.platform !== "/") {
-                    savePlatform = true;
-                    return variant;
-                }
-                // Older daemon, a missing image, or one with no linux/amd64 variant:
-                // the plain inspect tells those apart (absent vs. the wrong platform).
-                const plain = yield runDocker(["image", "inspect", image, "--format", format]);
-                return plain.code === 0 ? parse(plain.stdout) : undefined;
-            });
+        async inspect(image) {
+            const scoped = await runDocker([
+                "image",
+                "inspect",
+                "--platform",
+                REQUIRED_PLATFORM,
+                image,
+                "--format",
+                format,
+            ]);
+            const variant = scoped.code === 0 ? parse(scoped.stdout) : undefined;
+            // An image with no linux/amd64 variant answers the scoped inspect
+            // with the manifest list itself: no os/arch. Fall through so the
+            // plain inspect names the platform it does have.
+            if (variant !== undefined && variant.platform !== "/") {
+                savePlatform = true;
+                return variant;
+            }
+            // Older daemon, a missing image, or one with no linux/amd64 variant:
+            // the plain inspect tells those apart (absent vs. the wrong platform).
+            const plain = await runDocker(["image", "inspect", image, "--format", format]);
+            return plain.code === 0 ? parse(plain.stdout) : undefined;
         },
-        probe(image) {
-            return __awaiter(this, void 0, void 0, function* () {
-                // Same platform selection as save: on an arm64 host Docker runs the
-                // amd64 variant under emulation, which is enough for `command -v`.
-                const run = yield runDocker([
-                    "run",
-                    "--rm",
-                    "--pull=never",
-                    ...(savePlatform ? ["--platform", REQUIRED_PLATFORM] : []),
-                    "--entrypoint",
-                    "sh",
-                    image,
-                    "-c",
-                    PROBE_SCRIPT,
-                ]);
-                return run.code === 0 ? parseProbe(run.stdout) : undefined;
-            });
+        async probe(image) {
+            // Same platform selection as save: on an arm64 host Docker runs the
+            // amd64 variant under emulation, which is enough for `command -v`.
+            const run = await runDocker([
+                "run",
+                "--rm",
+                "--pull=never",
+                ...(savePlatform ? ["--platform", REQUIRED_PLATFORM] : []),
+                "--entrypoint",
+                "sh",
+                image,
+                "-c",
+                PROBE_SCRIPT,
+            ]);
+            return run.code === 0 ? parseProbe(run.stdout) : undefined;
         },
         save(image) {
             const child = spawn("docker", savePlatform ? ["save", "--platform", REQUIRED_PLATFORM, image] : ["save", image], { stdio: ["ignore", "pipe", "inherit"] });
@@ -307,294 +273,260 @@ function shellDocker() {
     };
 }
 function formatBytes(bytes) {
-    if (bytes >= Math.pow(1024, 3)) {
-        return `${(bytes / Math.pow(1024, 3)).toFixed(2)} GiB`;
+    if (bytes >= 1024 ** 3) {
+        return `${(bytes / 1024 ** 3).toFixed(2)} GiB`;
     }
-    if (bytes >= Math.pow(1024, 2)) {
-        return `${(bytes / Math.pow(1024, 2)).toFixed(1)} MiB`;
+    if (bytes >= 1024 ** 2) {
+        return `${(bytes / 1024 ** 2).toFixed(1)} MiB`;
     }
     return `${Math.ceil(bytes / 1024)} KiB`;
 }
-function saveCompressed(docker, image, path) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const hash = createHash("sha256");
-        yield pipeline(docker.save(image), createGzip(), function (source) {
-            return __asyncGenerator(this, arguments, function* () {
-                var _a, e_1, _b, _c;
-                try {
-                    for (var _d = true, source_1 = __asyncValues(source), source_1_1; source_1_1 = yield __await(source_1.next()), _a = source_1_1.done, !_a; _d = true) {
-                        _c = source_1_1.value;
-                        _d = false;
-                        const chunk = _c;
-                        hash.update(chunk);
-                        yield yield __await(chunk);
-                    }
-                }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
-                    try {
-                        if (!_d && !_a && (_b = source_1.return)) yield __await(_b.call(source_1));
-                    }
-                    finally { if (e_1) throw e_1.error; }
-                }
-            });
-        }, createWriteStream(path));
-        return {
-            sha256: hash.digest("hex"),
-            sizeBytes: (yield stat(path)).size,
-        };
-    });
+async function saveCompressed(docker, image, path) {
+    const hash = createHash("sha256");
+    await pipeline(docker.save(image), createGzip(), async function* (source) {
+        for await (const chunk of source) {
+            hash.update(chunk);
+            yield chunk;
+        }
+    }, createWriteStream(path));
+    return {
+        sha256: hash.digest("hex"),
+        sizeBytes: (await stat(path)).size,
+    };
 }
-function uploadPart(fetchImpl, path, part, range) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const handle = yield open(path, "r");
-        try {
-            const length = range.end - range.start;
-            const buffer = Buffer.alloc(length);
-            yield handle.read(buffer, 0, length, range.start);
-            let lastError;
-            for (let attempt = 1; attempt <= UPLOAD_ATTEMPTS; attempt++) {
-                try {
-                    const response = yield fetchImpl(part.url, {
-                        method: "PUT",
-                        body: buffer,
-                        headers: { "content-length": String(length) },
-                    });
-                    if (!response.ok) {
-                        throw new Error(`part ${part.partNumber}: HTTP ${response.status} ${yield response.text()}`);
-                    }
-                    const etag = response.headers.get("etag");
-                    if (etag === null || etag === "") {
-                        throw new Error(`part ${part.partNumber}: S3 returned no ETag`);
-                    }
-                    return etag;
+async function uploadPart(fetchImpl, path, part, range) {
+    const handle = await open(path, "r");
+    try {
+        const length = range.end - range.start;
+        const buffer = Buffer.alloc(length);
+        await handle.read(buffer, 0, length, range.start);
+        let lastError;
+        for (let attempt = 1; attempt <= UPLOAD_ATTEMPTS; attempt++) {
+            try {
+                const response = await fetchImpl(part.url, {
+                    method: "PUT",
+                    body: buffer,
+                    headers: { "content-length": String(length) },
+                });
+                if (!response.ok) {
+                    throw new Error(`part ${part.partNumber}: HTTP ${response.status} ${await response.text()}`);
                 }
-                catch (error) {
-                    lastError = error;
+                const etag = response.headers.get("etag");
+                if (etag === null || etag === "") {
+                    throw new Error(`part ${part.partNumber}: S3 returned no ETag`);
                 }
+                return etag;
+            }
+            catch (error) {
+                lastError = error;
             }
-            throw lastError;
-        }
-        finally {
-            yield handle.close();
         }
-    });
+        throw lastError;
+    }
+    finally {
+        await handle.close();
+    }
 }
-function uploadParts(fetchImpl, path, sizeBytes, upload, onPart) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const queue = [...upload.parts];
-        const results = [];
-        let done = 0;
-        const worker = () => __awaiter(this, void 0, void 0, function* () {
-            for (;;) {
-                const part = queue.shift();
-                if (part === undefined) {
-                    return;
-                }
-                const start = (part.partNumber - 1) * upload.partSizeBytes;
-                const end = Math.min(start + upload.partSizeBytes, sizeBytes);
-                const etag = yield uploadPart(fetchImpl, path, part, { start, end });
-                results.push({ partNumber: part.partNumber, etag });
-                done++;
-                onPart(done, upload.parts.length);
+async function uploadParts(fetchImpl, path, sizeBytes, upload, onPart) {
+    const queue = [...upload.parts];
+    const results = [];
+    let done = 0;
+    const worker = async () => {
+        for (;;) {
+            const part = queue.shift();
+            if (part === undefined) {
+                return;
             }
-        });
-        yield Promise.all(Array.from({ length: Math.min(UPLOAD_CONCURRENCY, queue.length) }, worker));
-        return results.sort((a, b) => a.partNumber - b.partNumber);
-    });
-}
-export function cmdImagesPush(args, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        const err = (_a = options.err) !== null && _a !== void 0 ? _a : ((text) => void process.stderr.write(text));
-        if (args.image === undefined || args.image === "") {
-            err(`Usage: ${CLI} images push <local-image> --name <name> [--team <id>]\n`);
-            return 1;
-        }
-        if (args.name === undefined || args.name === "") {
-            err(`--name is required: ${CLI} images push ${args.image} --name <name>\n`);
-            return 1;
-        }
-        const nameError = validateContainerImageName(args.name);
-        if (nameError !== undefined) {
-            err(`${nameError}\n`);
-            return 1;
+            const start = (part.partNumber - 1) * upload.partSizeBytes;
+            const end = Math.min(start + upload.partSizeBytes, sizeBytes);
+            const etag = await uploadPart(fetchImpl, path, part, { start, end });
+            results.push({ partNumber: part.partNumber, etag });
+            done++;
+            onPart(done, upload.parts.length);
         }
-        const out = (_b = options.out) !== null && _b !== void 0 ? _b : ((text) => void process.stdout.write(text));
-        const docker = (_c = options.docker) !== null && _c !== void 0 ? _c : shellDocker();
-        const inspected = yield docker.inspect(args.image);
-        if (inspected === undefined) {
-            err(`No local image named ${args.image}. Build or pull it first (\`docker image ls\` shows what is available).\n`);
-            return 1;
-        }
-        // Everything the hosted install needs is knowable locally; decide it
-        // before signing in or moving any bytes. The platform check gates the
-        // probe: a wrong-arch container cannot run here to be probed.
-        const checks = checkImage(inspected, inspected.platform === REQUIRED_PLATFORM ? yield docker.probe(args.image) : undefined).filter(check => inspected.platform === REQUIRED_PLATFORM || check.label === "platform");
-        if (options.json !== true) {
-            out(renderChecks(args.image, checks));
-        }
-        const failed = checks.filter(check => check.status === "failed");
-        if (failed.length > 0) {
-            err(`${args.image} cannot run as a hosted agent image:\n${failed
-                .map(check => { var _a; return `  ${check.label}: ${check.value}. ${(_a = check.detail) !== null && _a !== void 0 ? _a : ""}`; })
-                .join("\n")}\n`);
-            return 1;
-        }
-        const ctx = yield prepare(options);
-        if (typeof ctx === "number") {
-            return ctx;
-        }
-        const fetchImpl = (_d = options.fetchImpl) !== null && _d !== void 0 ? _d : fetch;
-        // `docker save` of a real image takes minutes; learn about a full team
-        // before paying for it. The backend re-checks at begin.
-        let listed;
-        try {
-            listed = yield ctx.client.listContainerImages({ teamId: ctx.teamId });
-        }
-        catch (error) {
-            return renderApiError(error, ctx.err);
+    };
+    await Promise.all(Array.from({ length: Math.min(UPLOAD_CONCURRENCY, queue.length) }, worker));
+    return results.sort((a, b) => a.partNumber - b.partNumber);
+}
+export async function cmdImagesPush(args, options) {
+    const err = options.err ?? ((text) => void process.stderr.write(text));
+    if (args.image === undefined || args.image === "") {
+        err(`Usage: ${CLI} images push <local-image> --name <name> [--team <id>]\n`);
+        return 1;
+    }
+    if (args.name === undefined || args.name === "") {
+        err(`--name is required: ${CLI} images push ${args.image} --name <name>\n`);
+        return 1;
+    }
+    const nameError = validateContainerImageName(args.name);
+    if (nameError !== undefined) {
+        err(`${nameError}\n`);
+        return 1;
+    }
+    const out = options.out ?? ((text) => void process.stdout.write(text));
+    const docker = options.docker ?? shellDocker();
+    const inspected = await docker.inspect(args.image);
+    if (inspected === undefined) {
+        err(`No local image named ${args.image}. Build or pull it first (\`docker image ls\` shows what is available).\n`);
+        return 1;
+    }
+    // Everything the hosted install needs is knowable locally; decide it
+    // before signing in or moving any bytes. The platform check gates the
+    // probe: a wrong-arch container cannot run here to be probed.
+    const checks = checkImage(inspected, inspected.platform === REQUIRED_PLATFORM ? await docker.probe(args.image) : undefined).filter(check => inspected.platform === REQUIRED_PLATFORM || check.label === "platform");
+    if (options.json !== true) {
+        out(renderChecks(args.image, checks));
+    }
+    const failed = checks.filter(check => check.status === "failed");
+    if (failed.length > 0) {
+        err(`${args.image} cannot run as a hosted agent image:\n${failed
+            .map(check => `  ${check.label}: ${check.value}. ${check.detail ?? ""}`)
+            .join("\n")}\n`);
+        return 1;
+    }
+    const ctx = await prepare(options);
+    if (typeof ctx === "number") {
+        return ctx;
+    }
+    const fetchImpl = options.fetchImpl ?? fetch;
+    // `docker save` of a real image takes minutes; learn about a full team
+    // before paying for it. The backend re-checks at begin.
+    let listed;
+    try {
+        listed = await ctx.client.listContainerImages({ teamId: ctx.teamId });
+    }
+    catch (error) {
+        return renderApiError(error, ctx.err);
+    }
+    if (listed.images.length >= listed.limit &&
+        !listed.images.some(image => image.name === args.name)) {
+        ctx.err(`${listed.images.length} of ${listed.limit} images used; delete some at ${IMAGES_DASHBOARD_URL} or with \`${CLI} images rm <name>\`.\n`);
+        return 1;
+    }
+    const dir = await mkdtemp(join(tmpdir(), "agent-sdk-image-"));
+    const tarball = join(dir, "image.tar.gz");
+    try {
+        if (!ctx.json) {
+            ctx.out(`Saving ${args.image} (${formatBytes(inspected.sizeBytes)} uncompressed)…\n`);
         }
-        if (listed.images.length >= listed.limit &&
-            !listed.images.some(image => image.name === args.name)) {
-            ctx.err(`${listed.images.length} of ${listed.limit} images used; delete some at ${IMAGES_DASHBOARD_URL} or with \`${CLI} images rm <name>\`.\n`);
+        const saved = await saveCompressed(docker, args.image, tarball);
+        if (saved.sizeBytes > MAX_CONTAINER_IMAGE_BYTES) {
+            err(`Compressed image is ${formatBytes(saved.sizeBytes)}; the limit is ${formatBytes(MAX_CONTAINER_IMAGE_BYTES)}.\n`);
             return 1;
         }
-        const dir = yield mkdtemp(join(tmpdir(), "agent-sdk-image-"));
-        const tarball = join(dir, "image.tar.gz");
-        try {
-            if (!ctx.json) {
-                ctx.out(`Saving ${args.image} (${formatBytes(inspected.sizeBytes)} uncompressed)…\n`);
-            }
-            const saved = yield saveCompressed(docker, args.image, tarball);
-            if (saved.sizeBytes > MAX_CONTAINER_IMAGE_BYTES) {
-                err(`Compressed image is ${formatBytes(saved.sizeBytes)}; the limit is ${formatBytes(MAX_CONTAINER_IMAGE_BYTES)}.\n`);
-                return 1;
-            }
-            const upload = yield ctx.client.beginContainerImageUpload({
-                teamId: ctx.teamId,
-                name: args.name,
-                sizeBytes: saved.sizeBytes,
-                sha256: saved.sha256,
-                dockerImageId: inspected.id,
-                platform: inspected.platform,
-            });
-            if (!ctx.json) {
-                ctx.out(`Uploading ${formatBytes(saved.sizeBytes)} in ${upload.parts.length} part${upload.parts.length === 1 ? "" : "s"}…\n`);
-            }
-            const parts = yield uploadParts(fetchImpl, tarball, saved.sizeBytes, upload, (done, total) => {
-                if (!ctx.json && total > 1) {
-                    ctx.out(`  ${done}/${total}\n`);
-                }
-            });
-            const image = yield ctx.client.finalizeContainerImage({
-                teamId: ctx.teamId,
-                name: args.name,
-                uploadId: upload.uploadId,
-                parts,
-            });
-            if (ctx.json) {
-                ctx.out(`${JSON.stringify({ image }, null, 2)}\n`);
-            }
-            else {
-                ctx.out(`Pushed ${image.name} (${formatBytes(image.sizeBytes)}, sha256 ${saved.sha256.slice(0, 12)}).\n` +
-                    `Use it from a persistent agent: defineAgent({ persistent: true, hosting: { image: "${image.name}" } }).\n`);
-            }
-            return 0;
+        const upload = await ctx.client.beginContainerImageUpload({
+            teamId: ctx.teamId,
+            name: args.name,
+            sizeBytes: saved.sizeBytes,
+            sha256: saved.sha256,
+            dockerImageId: inspected.id,
+            platform: inspected.platform,
+        });
+        if (!ctx.json) {
+            ctx.out(`Uploading ${formatBytes(saved.sizeBytes)} in ${upload.parts.length} part${upload.parts.length === 1 ? "" : "s"}…\n`);
         }
-        catch (error) {
-            if (error instanceof DeployApiError) {
-                return renderApiError(error, ctx.err);
+        const parts = await uploadParts(fetchImpl, tarball, saved.sizeBytes, upload, (done, total) => {
+            if (!ctx.json && total > 1) {
+                ctx.out(`  ${done}/${total}\n`);
             }
-            ctx.err(`Push failed: ${error instanceof Error ? error.message : String(error)}\nRun the same command again to retry.\n`);
-            return 1;
-        }
-        finally {
-            yield rm(dir, { recursive: true, force: true });
-        }
-    });
-}
-export function cmdImagesList(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const ctx = yield prepare(options);
-        if (typeof ctx === "number") {
-            return ctx;
+        });
+        const image = await ctx.client.finalizeContainerImage({
+            teamId: ctx.teamId,
+            name: args.name,
+            uploadId: upload.uploadId,
+            parts,
+        });
+        if (ctx.json) {
+            ctx.out(`${JSON.stringify({ image }, null, 2)}\n`);
         }
-        let listed;
-        try {
-            listed = yield ctx.client.listContainerImages({ teamId: ctx.teamId });
+        else {
+            ctx.out(`Pushed ${image.name} (${formatBytes(image.sizeBytes)}, sha256 ${saved.sha256.slice(0, 12)}).\n` +
+                `Use it from a persistent agent: defineAgent({ persistent: true, hosting: { image: "${image.name}" } }).\n`);
         }
-        catch (error) {
+        return 0;
+    }
+    catch (error) {
+        if (error instanceof DeployApiError) {
             return renderApiError(error, ctx.err);
         }
-        if (ctx.json) {
-            ctx.out(`${JSON.stringify(listed, null, 2)}\n`);
-            return 0;
-        }
-        if (listed.images.length === 0) {
-            ctx.out(`No images pushed yet. Push one with \`${CLI} images push <local-image> --name <name>\`.\n`);
-            return 0;
-        }
-        ctx.out(`${renderTable(["NAME", "SIZE", "PLATFORM", "SHA256", "PUSHED"], listed.images.map(image => { var _a; var _b, _c; return [
-            image.name,
-            formatBytes(image.sizeBytes),
-            (_b = image.platform) !== null && _b !== void 0 ? _b : "",
-            (_c = (_a = image.sha256) === null || _a === void 0 ? void 0 : _a.slice(0, 12)) !== null && _c !== void 0 ? _c : "",
-            image.pushedAt,
-        ]; }))}\n${listed.images.length} of ${listed.limit} images.\n`);
+        ctx.err(`Push failed: ${error instanceof Error ? error.message : String(error)}\nRun the same command again to retry.\n`);
+        return 1;
+    }
+    finally {
+        await rm(dir, { recursive: true, force: true });
+    }
+}
+export async function cmdImagesList(options) {
+    const ctx = await prepare(options);
+    if (typeof ctx === "number") {
+        return ctx;
+    }
+    let listed;
+    try {
+        listed = await ctx.client.listContainerImages({ teamId: ctx.teamId });
+    }
+    catch (error) {
+        return renderApiError(error, ctx.err);
+    }
+    if (ctx.json) {
+        ctx.out(`${JSON.stringify(listed, null, 2)}\n`);
         return 0;
-    });
+    }
+    if (listed.images.length === 0) {
+        ctx.out(`No images pushed yet. Push one with \`${CLI} images push <local-image> --name <name>\`.\n`);
+        return 0;
+    }
+    ctx.out(`${renderTable(["NAME", "SIZE", "PLATFORM", "SHA256", "PUSHED"], listed.images.map(image => [
+        image.name,
+        formatBytes(image.sizeBytes),
+        image.platform ?? "",
+        image.sha256?.slice(0, 12) ?? "",
+        image.pushedAt,
+    ]))}\n${listed.images.length} of ${listed.limit} images.\n`);
+    return 0;
 }
-export function cmdImagesRm(name, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        if (name === undefined || name === "") {
-            ((_a = options.err) !== null && _a !== void 0 ? _a : ((t) => void process.stderr.write(t)))(`Usage: ${CLI} images rm <name> [--team <id>]\n`);
+export async function cmdImagesRm(name, options) {
+    if (name === undefined || name === "") {
+        (options.err ?? ((t) => void process.stderr.write(t)))(`Usage: ${CLI} images rm <name> [--team <id>]\n`);
+        return 1;
+    }
+    const ctx = await prepare(options);
+    if (typeof ctx === "number") {
+        return ctx;
+    }
+    try {
+        await ctx.client.deleteContainerImage({ teamId: ctx.teamId, name });
+    }
+    catch (error) {
+        if (error instanceof DeployApiError && error.status === 404) {
+            ctx.err(`No image named ${name} — check \`${CLI} images list\`.\n`);
             return 1;
         }
-        const ctx = yield prepare(options);
-        if (typeof ctx === "number") {
-            return ctx;
-        }
-        try {
-            yield ctx.client.deleteContainerImage({ teamId: ctx.teamId, name });
-        }
-        catch (error) {
-            if (error instanceof DeployApiError && error.status === 404) {
-                ctx.err(`No image named ${name} — check \`${CLI} images list\`.\n`);
-                return 1;
-            }
-            return renderApiError(error, ctx.err);
-        }
-        if (ctx.json) {
-            ctx.out(`${JSON.stringify({ removed: name }, null, 2)}\n`);
-        }
-        else {
-            ctx.out(`Removed image ${name}.\n`);
-        }
-        return 0;
-    });
+        return renderApiError(error, ctx.err);
+    }
+    if (ctx.json) {
+        ctx.out(`${JSON.stringify({ removed: name }, null, 2)}\n`);
+    }
+    else {
+        ctx.out(`Removed image ${name}.\n`);
+    }
+    return 0;
 }
 /** Test seam: a `DockerImageSource` over in-memory bytes. */
 export function memoryDockerImageSource(images) {
     return {
-        inspect(image) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const found = images[image];
-                return found === undefined
-                    ? undefined
-                    : {
-                        id: found.id,
-                        platform: found.platform,
-                        sizeBytes: found.tar.length,
-                    };
-            });
+        async inspect(image) {
+            const found = images[image];
+            return found === undefined
+                ? undefined
+                : {
+                    id: found.id,
+                    platform: found.platform,
+                    sizeBytes: found.tar.length,
+                };
         },
-        probe(image) {
-            return __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                return (_a = images[image]) === null || _a === void 0 ? void 0 : _a.probe;
-            });
+        async probe(image) {
+            return images[image]?.probe;
         },
         save(image) {
             const found = images[image];