naro-cli 0.14.0 → 0.16.0

package/README.md

@@ -173,14 +173,14 @@ naro policy set posts --from-file policy.json
                                    Shorthand: writes the policies naro_select … naro_delete
 naro policy remove todos           Drop every policy on the table: back to deny (asks first)
 
-naro storage                       Naro Storage: on or off, limits, usage, buckets
+naro storage                       Naro Storage: on or off, limits, usage, today's operations, buckets
 naro storage enable                Turn it on: the project's R2 bucket, bound to the backend
 naro storage bucket create avatars --public --file-size-limit 5MiB --allowed-mime-types image/png,image/jpeg
 naro storage bucket update avatars --private | --file-size-limit none | --allowed-mime-types any
 naro storage bucket update docs --public   (asks first: anyone with an object's URL can download it)
 naro storage bucket list | empty <name> | remove <name> [--empty]   (empty and remove ask first)
 naro storage ls naro://avatars/u1 [--recursive]
-naro storage cp ./me.png naro://avatars/u1/me.png [--upsert]   Up to 50 MiB, with the service key
+naro storage cp ./me.png naro://avatars/u1/me.png [--upsert]   Up to the object limit, under 4 GiB (over 50 MiB in parts), with the service key
 naro storage cp naro://docs/team-1/plan.pdf ./                  Replaces a local file of the same name
 naro storage rm naro://avatars/u1/old.png [--recursive]   (asks first)
 naro storage rm naro://avatars/u1/ --recursive   Everything under u1/; written u1, an object u1 too
@@ -793,6 +793,50 @@ An `--update-check` you give replaces the default: without
 
 ## Release notes
 
+### 0.16.0
+
+- `naro storage cp` uploads a file up to the object limit, under 4 GiB. Over
+  50 MiB it goes in parts, four at a time, and a part that fails is sent again
+  (up to three more times) before the upload stops. The 50 MiB refusal before
+  any request is gone: the worker judges the size when the upload starts, and a
+  file over the bucket's or the plan's limit answers `413 OBJECT_TOO_LARGE`
+  before a byte is sent. An upload in parts must finish within 24 hours of its
+  start (R2 ends unfinished multipart uploads after a day). A big upload prints its progress on stderr: one line
+  rewritten in place at a terminal, a line every 10% otherwise
+  (`↑ 312 MiB / 1.2 GiB (26%)`), and nothing with `--json`.
+- Ctrl-C during an upload (or a TERM, or the terminal closing) stops it:
+  `Stopping the upload…` on stderr, the upload is called off — one in parts on
+  the backend too, so its name and the space it reserved are free at once
+  rather than locked for about an hour — and the run ends with the signal. A
+  second Ctrl-C ends it at once, without waiting for the call-off. A process
+  killed outright, or a network lost, still leaves the name locked until the
+  lock runs out.
+- A file of 4 GiB or more is refused before any request
+  (`VALIDATION_FAILED`): Node reads its size modulo 4 GiB (4 GiB + 1 KiB reads
+  as 1 KiB), and the upload would send only that much and report success.
+  Uploading one needs a change in naro-js that is not there yet.
+- A download is written to disk as it arrives, to a hidden `.naro-partial`
+  file that replaces the destination once it is whole, instead of being held in
+  memory first.
+- `naro storage` says `50 MiB per request (larger files go in parts)`, and
+  that uploads stopped over the storage limit reopen usually within an hour and
+  a half: R2 reports the bucket's size 30 minutes to about an hour and a half
+  late.
+
+### 0.15.0
+
+- `naro storage` shows the Storage meter's day between `Used:` and `Buckets:`:
+  `Today (UTC):` has the write operations (R2 Class A) against the daily limit
+  and the reads, `Measured:` the bucket size R2 reported and when R2 measured
+  it (R2 reports the size 30 minutes to about an hour and a half late, and the
+  meter reads it every 15 minutes). A `✗` line
+  says uploads are stopped, over the storage limit until objects are deleted
+  or over the day's write operations until 00:00 UTC (downloads still work);
+  a `⚠` line warns from 80% of the storage limit or of the day's write
+  operations. Before the meter has run for the UTC day nothing is added, and
+  `--json` prints `storage.today` and `storage.limits.dailyOps` as the
+  control plane answered.
+
 ### 0.14.0
 
 - `naro analytics` shows the project's Web Analytics from the terminal: the
@@ -858,7 +902,8 @@ An `--update-check` you give replaces the default: without
   (public or private, the largest file, the types taken), and `ls`, `cp`
   and `rm` work on `naro://<bucket>/<path>` with the project's service key
   (`NARO_SERVICE_KEY`, or fetched with a warning) — the bytes go to the
-  project's backend, not through naro. One upload is 50 MiB at most.
+  project's backend, not through naro. One request carries 50 MiB at most; a
+  larger file goes in parts since 0.16.0 (under 4 GiB).
   `bucket update --public`, `empty`, `remove` and `rm` ask first; without a
   terminal they need `--yes` (`CONFIRMATION_REQUIRED` otherwise, nothing
   sent).

package/dist/{chunk-U7AZSAFS.js → chunk-XNT7SINN.js}

@@ -26,6 +26,7 @@ function artifactUrlKey(kind, name) {
   return `${kind}/${name}`;
 }
 var ARTIFACT_URL_BATCH_SIZE = 100;
+var ARTIFACT_UPLOAD_CONCURRENCY = 8;
 function parseArtifactPutUrls(payload) {
   if (typeof payload !== "object" || payload === null) return null;
   const { urls, disabled } = payload;
@@ -37,28 +38,55 @@ function parseArtifactPutUrls(payload) {
   }
   return resolved;
 }
+async function eachWithLimit(items, limit, work) {
+  let next = 0;
+  const lanes = Array.from(
+    { length: Math.min(limit, items.length) },
+    async () => {
+      while (next < items.length) {
+        const item = items[next];
+        next += 1;
+        await work(item);
+      }
+    }
+  );
+  await Promise.all(lanes);
+}
 async function uploadArtifactFiles(artifact, ports) {
   const entries = artifactUploadEntries(artifact);
   let proxied = 0;
   for (let index = 0; index < entries.length; index += ARTIFACT_URL_BATCH_SIZE) {
     const batch = entries.slice(index, index + ARTIFACT_URL_BATCH_SIZE);
     const urls = await ports.resolvePutUrls(batch);
-    for (const entry of batch) {
+    const viaProxy = [];
+    await eachWithLimit(batch, ARTIFACT_UPLOAD_CONCURRENCY, async (entry) => {
       const url2 = urls?.get(artifactUrlKey(entry.kind, entry.file.name));
       if (!url2) {
-        proxied += 1;
-        await ports.putProxied(entry);
-        continue;
+        viaProxy.push(entry);
+        return;
       }
       try {
         await ports.putSigned(url2, entry);
       } catch {
-        proxied += 1;
-        await ports.putProxied(entry);
+        viaProxy.push(entry);
       }
+    });
+    for (const entry of viaProxy) {
+      proxied += 1;
+      await ports.putProxied(entry);
     }
   }
-  return { proxied, total: entries.length };
+  const bytes = entries.reduce(
+    (total, entry) => total + entry.file.data.byteLength,
+    0
+  );
+  return { proxied, total: entries.length, bytes };
+}
+function artifactUploadSummary(report, elapsedMs) {
+  const kilobytes = Math.ceil(report.bytes / 1e3);
+  const size = kilobytes >= 1e3 ? `${(report.bytes / 1e6).toFixed(1)} MB` : `${String(kilobytes)} kB`;
+  const files = report.total === 1 ? "file" : "files";
+  return `Uploaded ${String(report.total)} artifact ${files} (${size}) in ${(elapsedMs / 1e3).toFixed(1)} s.`;
 }
 
 // ../../packages/build/src/cache.ts
@@ -100,6 +128,7 @@ async function reportUnavailable(scope, ports, observer) {
     "Build cache is unavailable - this build runs uncached and saves nothing for the next one."
   );
 }
+var UNKNOWN_PAX_KEYWORD = /^tar: Ignoring unknown extended header keyword /;
 async function restoreCache(args) {
   const { scope, key, targetDir, ports, observer } = args;
   const urls = await ports.transport.resolveUrls(scope, key);
@@ -132,7 +161,9 @@ async function restoreCache(args) {
       stage: STAGE[scope],
       errorCode: ERROR_CODE[scope]
     },
-    observer
+    {
+      onLog: (entry) => UNKNOWN_PAX_KEYWORD.test(entry.message) ? void 0 : observer.onLog(entry)
+    }
   );
   await log(observer, scope, "INFO", `Restored ${scope} cache (${key}).`);
   return true;
@@ -160,7 +191,14 @@ async function saveCache(args) {
   await ports.runCommand(
     {
       command: "tar",
-      args: ["--zstd", "-cf", archive, "-C", sourceDir, "."],
+      // --no-xattrs: macOS bsdtar would store extended attributes that the
+      // build container's GNU tar warns about per file (UNKNOWN_PAX_KEYWORD).
+      // GNU tar 1.27+ and bsdtar 3.x both take it.
+      args: ["--no-xattrs", "--zstd", "-cf", archive, "-C", sourceDir, "."],
+      // macOS can also write the same metadata as AppleDouble `._name` files,
+      // which GNU tar restores as ordinary files (PR #114 review; not seen on
+      // bsdtar 3.5.3 here). GNU tar ignores the variable.
+      env: { COPYFILE_DISABLE: "1" },
       cwd: sourceDir,
       timeoutMs: 12e4,
       stage: STAGE[scope],
@@ -257,6 +295,9 @@ var PHASES = [
 ];
 var ACTIVE_STATUSES = new Set(PHASES);
 
+// ../../packages/core/src/deployment-stall.ts
+var STALL_WINDOW_MS = 10 * 6e4;
+
 // ../../packages/core/src/deployment-strategy.ts
 var MIN_SUPPORTED_NEXT_MAJOR = 15;
 
@@ -294,9 +335,6 @@ function pathnameOf(url2) {
   }
 }
 
-// ../../packages/core/src/internal-auth.ts
-import { Buffer as Buffer2 } from "buffer";
-
 // ../../packages/core/src/migration-names.ts
 function normalizeMigrationName(name) {
   return name.trim().toLowerCase().replace(/\.sql$/, "").replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
@@ -15253,6 +15291,21 @@ function classifyNextVersion(raw, now) {
 // ../../packages/build/src/package-manager.ts
 import { access, readFile as readFile2 } from "fs/promises";
 import { join as join2 } from "path";
+function cacheEnv(dir) {
+  return {
+    npm_config_store_dir: dir,
+    npm_config_cache: dir,
+    YARN_CACHE_FOLDER: dir,
+    YARN_ENABLE_GLOBAL_CACHE: "0"
+  };
+}
+function withSharedCache(spec, dir) {
+  return {
+    ...spec,
+    addArgs: (specs) => [...spec.addArgs(specs), ...spec.cacheArgs(dir)],
+    addEnv: { ...spec.addEnv, ...cacheEnv(dir) }
+  };
+}
 async function exists(path) {
   try {
     await access(path);
@@ -15302,7 +15355,8 @@ async function detectPackageManager(root) {
         "install",
         modern ? "--immutable" : "--frozen-lockfile"
       ],
-      // Berry takes no install-time cache flag; YARN_CACHE_FOLDER covers it.
+      // Berry takes no install-time cache flag; cacheEnv covers it
+      // (YARN_CACHE_FOLDER with the global cache switched off).
       cacheArgs: (dir) => modern ? [] : ["--cache-folder", dir],
       addArgs: (specs) => ["yarn", "add", ...specs]
     };
@@ -15706,7 +15760,7 @@ export default defineCloudflareConfig({});
 
 // ../../packages/build/src/vinext.ts
 var VINEXT_TOOLCHAIN = [
-  "vinext@1.0.0-beta.9",
+  "vinext@1.1.0",
   "@cloudflare/vite-plugin@1.54.7",
   "@vitejs/plugin-react@6.1.1",
   "@vitejs/plugin-rsc@0.5.34",
@@ -15722,7 +15776,7 @@ var VITE_CONFIG_NAMES = [
   "vite.config.mts",
   "vite.config.cts"
 ];
-var GENERATED_VITE_CONFIG = "vite.config.mjs";
+var GENERATED_VITE_CONFIG = "vite.config.js";
 var OUTPUT_DIR = "dist";
 var SERVER_DIR = "server";
 var CLIENT_DIR = "client";
@@ -15787,6 +15841,8 @@ async function createVinextBuildConfig(appRoot, deploymentId, writer = async (pa
 }
 var AUTO_FIXED_ISSUES = [/Missing "type": "module"/i];
 var ISSUE_LINE = /^\s*✗\s+(.+)$/;
+var PARTIAL_LINE = /^\s*~\s+(.+)$/;
+var BLOCKING_PARTIALS = [/^webpack\b/i];
 var ANSI_ESCAPE = /\u001B\[[0-9;]*m/g;
 var SUMMARY_LINE = /Overall:\s*(\d+)%\s*compatible\s*\(\s*(\d+)\s+supported,\s*(\d+)\s+partial,\s*(\d+)\s+issues?\s*\)/i;
 function parseVinextCheckReport(output) {
@@ -15798,12 +15854,18 @@ function parseVinextCheckReport(output) {
       plain.split("\n").map((line) => ISSUE_LINE.exec(line)?.[1]?.trim()).filter((line) => Boolean(line))
     )
   ];
+  const partialLines = [
+    ...new Set(
+      plain.split("\n").map((line) => PARTIAL_LINE.exec(line)?.[1]?.trim()).filter((line) => Boolean(line))
+    )
+  ];
   return {
     percent: Number(match[1]),
     supported: Number(match[2]),
     partial: Number(match[3]),
     issues: Number(match[4]),
-    issueLines
+    issueLines,
+    partialLines
   };
 }
 function vinextRouteFromCheck(report) {
@@ -15815,7 +15877,10 @@ function vinextRouteFromCheck(report) {
   const autoFixed = report.issueLines.filter(
     (line) => AUTO_FIXED_ISSUES.some((pattern) => pattern.test(line))
   );
-  const blocking = Math.max(0, report.issues - autoFixed.length);
+  const blockingPartials = report.partialLines.filter(
+    (line) => BLOCKING_PARTIALS.some((pattern) => pattern.test(line))
+  );
+  const blocking = Math.max(0, report.issues - autoFixed.length) + blockingPartials.length;
   if (blocking > 0)
     return {
       eligible: false,
@@ -17836,6 +17901,7 @@ function createVinextCloudflareStrategy(options) {
             // Not production: npm and classic Yarn read that as omit=dev and
             // would prune the project's devDependencies while adding ours.
             env: {
+              ...context.packageManager.addEnv,
               NODE_ENV: "development",
               NPM_CONFIG_USERCONFIG: context.packageManagerConfigPath
             },
@@ -18217,11 +18283,7 @@ var LocalBuildExecutor = class {
               env: {
                 NODE_ENV: "development",
                 NPM_CONFIG_USERCONFIG: packageManagerConfigPath,
-                ...cachePorts ? {
-                  npm_config_store_dir: pmCacheDir,
-                  npm_config_cache: pmCacheDir,
-                  YARN_CACHE_FOLDER: pmCacheDir
-                } : {}
+                ...cachePorts ? cacheEnv(pmCacheDir) : {}
               },
               timeoutMs: 10 * 6e4,
               stage: "INSTALLING",
@@ -18305,7 +18367,9 @@ var LocalBuildExecutor = class {
             identity,
             branch: input.branch,
             env: input.env ?? {},
-            packageManager,
+            // The toolchain add has to use the store the install linked
+            // node_modules from (withSharedCache).
+            packageManager: cachePorts ? withSharedCache(packageManager, pmCacheDir) : packageManager,
             packageManagerConfigPath,
             buildScript: resolved.buildScript,
             nextVersion: nextVersion ? `${String(nextVersion.major)}.${String(nextVersion.minor)}.${String(nextVersion.patch)}` : "unknown",
@@ -18425,22 +18489,31 @@ function createLogBatcher(options) {
   let buffer = [];
   let timer = null;
   let pending = null;
+  let sending = Promise.resolve();
   function disarm() {
     if (timer === null) return;
     clearTimeout(timer);
     timer = null;
   }
+  function surfacePending() {
+    if (pending === null) return;
+    const { error: error51 } = pending;
+    pending = null;
+    throw error51;
+  }
   async function flush() {
     disarm();
-    if (pending !== null) {
-      const { error: error51 } = pending;
-      pending = null;
-      throw error51;
+    surfacePending();
+    if (buffer.length === 0) {
+      await sending;
+      surfacePending();
+      return;
     }
-    if (buffer.length === 0) return;
     const batch = buffer;
     buffer = [];
-    await options.send(batch);
+    const send = sending.then(() => options.send(batch));
+    sending = send.catch(() => void 0);
+    await send;
   }
   function arm() {
     if (timer !== null || !options.intervalMs) return;
@@ -21059,6 +21132,10 @@ var CATALOG = {
     status: 404,
     message: ({ bucket, path }) => `Object ${storageName(path)} was not found in bucket ${storageName(bucket)}.`
   },
+  UPLOAD_NOT_FOUND: {
+    status: 404,
+    message: ({ upload }) => `Upload ${storageName(upload)} was not found or has expired.`
+  },
   INVALID_CONTENT_TYPE: {
     status: 400,
     message: ({ type }) => `Content-Type ${storageName(type)} is not a media type like image/png.`
@@ -21073,7 +21150,7 @@ var CATALOG = {
   },
   OBJECT_TOO_LARGE: {
     status: 413,
-    message: (vars) => "single" in vars ? "Uploads over 50 MiB are not supported yet." : `The object is ${String(vars.size)} bytes; bucket ${storageName(vars.bucket)} takes objects up to ${String(vars.max)} bytes.`
+    message: (vars) => "single" in vars ? "Uploads over 50 MiB go in parts: use the multipart upload." : `The object is ${String(vars.size)} bytes; bucket ${storageName(vars.bucket)} takes objects up to ${String(vars.max)} bytes.`
   },
   MIME_TYPE_NOT_ALLOWED: {
     status: 415,
@@ -21109,6 +21186,12 @@ var CATALOG = {
     status: 507,
     message: () => "This project has used all of its storage. Delete objects to free space; uploads fail until then."
   },
+  // Storage 3-1d (design §6.4): like WRITE_QUOTA_EXCEEDED, a 429 that clears
+  // by itself at midnight; downloads, deletes and listings are not refused.
+  STORAGE_OPS_QUOTA_EXCEEDED: {
+    status: 429,
+    message: () => "This project has reached its daily storage operation limit. Downloads still work; uploads resume at 00:00 UTC."
+  },
   // R2 or its binding did not answer; the original error is logged, never sent.
   STORAGE_UNAVAILABLE: {
     status: 503,
@@ -25813,7 +25896,7 @@ function claimUpload(i) {
   const nonce = nonceOf(i.nonce);
   return compose(
     [
-      `INSERT INTO ${STORAGE_OBJECTS_TABLE} (id, bucket_id, name, owner, owner_id, metadata, version, parent, size, status, lock_id, lock_expires_at) SELECT ?, ?, ?, ?, ?, ?, NULL, ?, ?, 'uploading', ?, ? WHERE CASE WHEN NOT EXISTS (SELECT 1 FROM ${STORAGE_BUCKETS_TABLE} WHERE id = ? AND ${LIVE_BUCKET}) THEN ${marker("bucket", nonce)} WHEN (`,
+      `INSERT INTO ${STORAGE_OBJECTS_TABLE} (id, bucket_id, name, owner, owner_id, metadata, version, parent, size, status, lock_id, lock_expires_at, pending) SELECT ?, ?, ?, ?, ?, ?, NULL, ?, ?, 'uploading', ?, ?, ? WHERE CASE WHEN NOT EXISTS (SELECT 1 FROM ${STORAGE_BUCKETS_TABLE} WHERE id = ? AND ${LIVE_BUCKET}) THEN ${marker("bucket", nonce)} WHEN (`,
       i.check,
       `) <> 1 THEN 0 WHEN EXISTS (SELECT 1 FROM ${STORAGE_OBJECTS_TABLE} WHERE bucket_id = ? AND name = ? AND status = 'ready') THEN ${marker("exists", nonce)} WHEN EXISTS (SELECT 1 FROM ${STORAGE_OBJECTS_TABLE} WHERE bucket_id = ? AND name = ?) THEN ${marker("busy", nonce)} WHEN ${PROJECT_BYTES} + ? > ? THEN ${marker("quota", nonce)} ELSE 1 END RETURNING id`
     ],
@@ -25829,6 +25912,7 @@ function claimUpload(i) {
         i.size,
         i.lockId,
         i.expiresAt,
+        i.pending ?? null,
         i.bucket
       ],
       [i.bucket, i.name, i.bucket, i.name, i.size, i.limitBytes]
@@ -25852,6 +25936,13 @@ function overwriteCheckRow(i) {
 }
 function claimOverwrite(i) {
   const nonce = nonceOf(i.nonce);
+  const room = i.inParts ? {
+    sql: `${PROJECT_BYTES} + ? > ?`,
+    values: [i.size, i.limitBytes]
+  } : {
+    sql: `? > o.size AND ${PROJECT_BYTES} + ? - o.size > ?`,
+    values: [i.size, i.size, i.limitBytes]
+  };
   return compose(
     [
       `UPDATE ${STORAGE_OBJECTS_TABLE} AS o SET lock_id = ?, lock_expires_at = ?, pending = ? WHERE o.bucket_id = ? AND o.name = ? AND CASE WHEN NOT (`,
@@ -25859,17 +25950,14 @@ function claimOverwrite(i) {
       // The row's own bucket (`o.bucket_id`), so no value is bound for it.
       `) THEN ${marker("hidden", nonce)} WHEN NOT EXISTS (SELECT 1 FROM ${STORAGE_BUCKETS_TABLE} AS b WHERE b.id = o.bucket_id AND b.${LIVE_BUCKET}) THEN ${marker("bucket", nonce)} WHEN o.status <> 'ready' OR o.lock_id IS NOT NULL THEN ${marker("busy", nonce)} WHEN NOT (`,
       i.updateUsing,
-      `) THEN ${marker("denied", nonce)} WHEN ? > o.size AND ${PROJECT_BYTES} + ? - o.size > ? THEN ${marker("quota", nonce)} ELSE (`,
+      `) THEN ${marker("denied", nonce)} WHEN ${room.sql} THEN ${marker("quota", nonce)} ELSE (`,
       i.check,
       // RETURNING names the columns bare: it does not see the UPDATE's
       // alias (SQLite 3.53: `no such column: o.id`), and the table is the
       // only one there.
       ") END RETURNING id, version, size, owner, owner_id, created_at"
     ],
-    [
-      [i.lockId, i.expiresAt, i.pending, i.bucket, i.name],
-      [i.size, i.size, i.limitBytes]
-    ]
+    [[i.lockId, i.expiresAt, i.pending, i.bucket, i.name], room.values]
   );
 }
 function claimDelete(i) {
@@ -27048,6 +27136,17 @@ function formatRedirectEntry(entry) {
   return entry.path === "/" ? entry.origin : `${entry.origin}${entry.path}`;
 }
 
+// ../../packages/data-core/src/storage-multipart.ts
+var MiB = 1024 * 1024;
+var MULTIPART_PART_SIZES = [16 * MiB, 32 * MiB, 64 * MiB];
+var MAX_MULTIPART_PARTS = 1e4;
+var MAX_MULTIPART_BYTES = 64 * MiB * MAX_MULTIPART_PARTS;
+var MULTIPART_LOCK_MS = 60 * 60 * 1e3;
+var MULTIPART_PART_EXTEND_BELOW_MS = 30 * 60 * 1e3;
+var MULTIPART_COMPLETE_LOCK_MS = 15 * 60 * 1e3;
+var UUID = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
+var UPLOAD_ID = new RegExp(`^(${UUID})\\.(${UUID})$`);
+
 // ../../packages/data-core/src/system-sql.ts
 async function convertLegacyPolicies(db, found) {
   const rows = rowsOf(await db.prepare(POLICY_SQL.list).all());
@@ -28176,7 +28275,9 @@ function manifest(artifact) {
   };
 }
 async function uploadArtifact(artifact, opts) {
-  await uploadArtifactFiles(artifact, uploadPorts(opts));
+  const started = Date.now();
+  const report = await uploadArtifactFiles(artifact, uploadPorts(opts));
+  const uploadSummary = artifactUploadSummary(report, Date.now() - started);
   const response = await authed(opts, "/artifacts/complete", {
     method: "POST",
     headers: { "Content-Type": "application/json" },
@@ -28187,7 +28288,8 @@ async function uploadArtifact(artifact, opts) {
     throw new Error("Control plane did not return an artifact key.");
   return {
     artifactKey: payload.artifactKey,
-    previewUrl: typeof payload.previewUrl === "string" ? payload.previewUrl : null
+    previewUrl: typeof payload.previewUrl === "string" ? payload.previewUrl : null,
+    uploadSummary
   };
 }
 
@@ -28263,7 +28365,8 @@ function eventsObserver(cp3, deploymentId, token, fetchImpl = fetch, logIngestUr
       await flushLogs();
       await post({ type: "metadata", metadata: rest }).catch(() => {
       });
-    }
+    },
+    flush: flushLogs
   };
 }
 function slugify2(value) {
@@ -28458,12 +28561,19 @@ async function deployDirectory(sourceDir, options, log2) {
       { details: { deploymentId: ctx.deploymentId }, cause: error51 }
     );
   }
-  await uploadArtifact(artifact, {
+  const { uploadSummary } = await uploadArtifact(artifact, {
     controlPlaneUrl: cpUrl,
     deploymentId: ctx.deploymentId,
     callbackToken: ctx.callbackToken,
     ...options.fetch ? { fetch: options.fetch } : {}
   });
+  log2(`\u25B8 ${uploadSummary}`);
+  await observer.onLog({
+    level: "INFO",
+    stage: "DEPLOYING",
+    message: uploadSummary
+  });
+  await observer.flush();
   log2("\u25B8 publishing worker");
   const detail = await waitForFinish(client, ctx, log2);
   const url2 = deploymentUrl(detail, ctx, production);
@@ -28541,7 +28651,6 @@ export {
   parseCacheControl,
   STORAGE_OBJECTS_TABLE,
   systemTablePredicate,
-  dataError,
   SCHEMA_SQL,
   tableNames,
   snapshotFromRows,

package/dist/deploy.d.ts

@@ -21,7 +21,10 @@ export interface DeployBuildExecutor {
 export declare function parseDotenv(text: string): Record<string, string>;
 /** Reads the first of .env.local / .env.production / .env in a directory. */
 export declare function readProjectEnv(dir: string): Record<string, string>;
-export declare function eventsObserver(cp: string, deploymentId: string, token: string, fetchImpl?: typeof fetch, logIngestUrl?: string): BuildObserver;
+export declare function eventsObserver(cp: string, deploymentId: string, token: string, fetchImpl?: typeof fetch, logIngestUrl?: string): BuildObserver & {
+    /** Sends what is buffered now; never throws. */
+    flush(): Promise<void>;
+};
 export declare function slugify(value: string): string;
 export interface DeployOptions {
     name?: string | undefined;

package/dist/deploy.js

@@ -5,7 +5,7 @@ import {
   parseDotenv,
   readProjectEnv,
   slugify
-} from "./chunk-U7AZSAFS.js";
+} from "./chunk-XNT7SINN.js";
 import "./chunk-K3NQKI34.js";
 export {
   deployDirectory,