drop2run 0.9.0 → 0.11.0

package/README.md

@@ -32,6 +32,9 @@ drop2run rm <site> --yes                     Delete a site and everything on it
 drop2run comments [site]                     Read the comments left on a site's pages
 drop2run comments reply <thread> <text>      Answer a thread as the owner [--resolve]
 drop2run comments resolve|reopen <thread>    Resolve a thread, or open it again
+drop2run people [site]                       Who the site is shared with
+drop2run invite <email>... [--role comment]  Share it with people; each is emailed
+drop2run uninvite <email>                    Take someone off the list
 drop2run token list                          List your access tokens
 drop2run whoami                              Check the token and whose it is
 drop2run where                               Show which token source is in use
@@ -40,6 +43,18 @@ drop2run --version                           Print the version
 
 `--json` on any command prints machine-readable output instead of text.
 
+## Sharing for review
+
+```bash
+drop2run invite dana@example.com --role comment --site calm-cedar   # emailed an invitation
+drop2run set invite-only on --site calm-cedar                        # only the list gets in
+drop2run set comments invited --site calm-cedar                      # the people invited to comment can
+```
+
+`drop2run people` shows the list and `drop2run uninvite` takes someone off it. `set comments anyone` lets
+anybody signed in comment instead, on a site you keep public or behind a password. Both are plan features,
+refused with the reason where the plan lacks them.
+
 ## Comments
 
 On a plan that includes comments, people viewing a site can pin comments to its pages. `drop2run comments`

package/dist/index.js

@@ -190,10 +190,7 @@ async function folderFromListing(credentials, siteId, subdomain) {
 }
 async function getSite(credentials, siteId) {
   const [site, invitedOnly] = await Promise.all([
-    call(
-      credentials,
-      `sites/${encodeURIComponent(siteId)}`
-    ),
+    call(credentials, `sites/${encodeURIComponent(siteId)}`),
     readInvitedOnly(credentials, siteId)
   ]);
   const folderId = site.folderId !== void 0 ? site.folderId : await folderFromListing(credentials, site.siteId, site.subdomain);
@@ -215,6 +212,8 @@ async function getSite(credentials, siteId) {
     expiresAt: site.expiresAt,
     expiryAction: actionOf(site.expiresAt, site.expiryAction ?? ""),
     scheduledExpiryAvailable: site.scheduledExpiryAvailable,
+    comments: audienceOf(site.commentAudience),
+    commentsAvailable: site.feedbackAvailable === true,
     folderId,
     deploys: site.deploys.map((deploy2) => ({
       deployId: deploy2.deployId,
@@ -239,9 +238,11 @@ async function updateSiteSettings(credentials, siteId, change) {
   if (change.expiryAction !== void 0) body.expiryAction = change.expiryAction;
   if (change.formsEnabled !== void 0) body.formsEnabled = change.formsEnabled;
   if (change.folderId !== void 0) body.folderId = change.folderId;
+  if (change.invitedOnly !== void 0) body.invitedOnly = change.invitedOnly;
+  if (change.comments !== void 0) body.commentAudience = API_AUDIENCE[change.comments];
   if (Object.keys(body).length === 0) throw new Error("Nothing to change — name a setting.");
   const wasInvitedOnly = change.password !== void 0 && change.password !== "" ? await readInvitedOnly(credentials, siteId) : null;
-  const settings = await call(credentials, `sites/${encodeURIComponent(siteId)}`, {
+  const { commentAudience, ...settings } = await call(credentials, `sites/${encodeURIComponent(siteId)}`, {
     method: "PATCH",
     body: JSON.stringify(body)
   });
@@ -250,9 +251,19 @@ async function updateSiteSettings(credentials, siteId, change) {
     ...settings,
     expiryAction: actionOf(settings.expiresAt, settings.expiryAction ?? ""),
     invitedOnly,
+    comments: audienceOf(commentAudience),
     replacedInviteOnly: wasInvitedOnly === true && invitedOnly === false
   };
 }
+const API_AUDIENCE = {
+  off: "Off",
+  invited: "Invited",
+  anyone: "Anyone"
+};
+function audienceOf(value) {
+  const lower = value?.toLowerCase();
+  return lower === "off" || lower === "invited" || lower === "anyone" ? lower : null;
+}
 async function setSitePaused(credentials, siteId, action) {
   const state = await call(
     credentials,
@@ -371,6 +382,34 @@ async function setCommentResolved(credentials, siteId, threadId, resolved) {
     { method: "POST" }
   );
 }
+const PEOPLE_PER_REQUEST = 50;
+async function listPeople(credentials, siteId) {
+  const page = await call(credentials, `sites/${encodeURIComponent(siteId)}/viewers?pageSize=${PEOPLE_PER_REQUEST}`);
+  return {
+    invitedOnly: page.invitedOnly,
+    total: page.total,
+    limit: page.limit,
+    people: page.viewers.map((row) => ({
+      email: row.email,
+      role: enumName(row.role),
+      owner: row.owner,
+      status: enumName(row.status)
+    }))
+  };
+}
+async function invitePeople(credentials, siteId, emails, role) {
+  return await call(credentials, `sites/${encodeURIComponent(siteId)}/viewers`, {
+    method: "POST",
+    body: JSON.stringify({ emails, role: role === "comment" ? "Comment" : "View", notify: true })
+  });
+}
+async function removePerson(credentials, siteId, email) {
+  await call(
+    credentials,
+    `sites/${encodeURIComponent(siteId)}/viewers?email=${encodeURIComponent(email)}`,
+    { method: "DELETE" }
+  );
+}
 const VERSIONS_LISTED = 10;
 function servingModeOf$1(site) {
   if (site.spaMode) return "spa";
@@ -399,6 +438,7 @@ function describeSite(site, folderPath) {
     `  mode      ${servingModeOf$1(site)}${site.modeIsManual ? "" : " (detected on each publish)"}`,
     `  password  ${site.passwordProtected ? "on" : "off"}${unavailable(site.passwordProtectionAvailable)}`,
     `  forms     ${site.formsEnabled ? "on" : "off"}${unavailable(site.formsAvailable)}`,
+    `  comments  ${site.comments ?? "unknown"}${unavailable(site.commentsAvailable)}`,
     `  takedown  ${site.expiresAt === null ? "none" : `${site.expiresAt} (${site.expiryAction})`}${unavailable(site.scheduledExpiryAvailable)}`,
     `  folder    ${site.folderId === null ? "(top level)" : folderPath ?? site.folderId}`,
     "",
@@ -671,7 +711,9 @@ async function prepareDeploy(siteId, files, options, signal) {
   }));
   const prepared = await request(
     `sites/${encodeURIComponent(siteId)}/deploys/prepare`,
-    { files: manifest },
+    // `batches` asks for batch permits; an API that predates them ignores the field, and one that
+    // knows them answers with single permits until they are switched on.
+    { files: manifest, batches: true },
     options,
     signal
   );
@@ -760,6 +802,47 @@ async function problemToError(response) {
   const message = typeof problem.detail === "string" ? problem.detail : typeof problem.title === "string" ? problem.title : `The server responded with ${response.status}.`;
   return new DeployError(code, message, problem);
 }
+function batchLayout(members) {
+  return members.map((member) => `${member.sha256} ${member.size}
+`).join("");
+}
+function isBatch(target) {
+  return "files" in target;
+}
+function parseBatchResult(body) {
+  try {
+    const parsed = JSON.parse(body);
+    if (parsed === null || typeof parsed !== "object") return null;
+    const { stored, present, failed } = parsed;
+    if (typeof stored !== "number" || typeof present !== "number" || !Array.isArray(failed))
+      return null;
+    return { stored, present, failed };
+  } catch {
+    return null;
+  }
+}
+async function mapInOrder(items, limit, fn, signal) {
+  const results = new Array(items.length);
+  let next = 0;
+  let failure2 = null;
+  const lane = async () => {
+    for (; ; ) {
+      if (failure2 !== null) return;
+      const index = next++;
+      if (index >= items.length) return;
+      try {
+        results[index] = await fn(items[index], index);
+      } catch (error) {
+        failure2 ??= { error };
+        return;
+      }
+    }
+  };
+  const lanes = Array.from({ length: Math.min(Math.max(1, limit), items.length) }, lane);
+  await Promise.all(lanes);
+  if (failure2 !== null) throw failure2.error;
+  return results;
+}
 const FILE_TYPES = [
   // Documents. The three extensions that make a folder a documents site.
   {
@@ -874,13 +957,14 @@ const FILE_TYPES = [
     reader: true,
     editable: true
   },
-  // Source the viewer highlights. A link straight to one of these hands over the file.
+  // Source the viewer highlights. Inside a documents site a link straight to one opens it in the
+  // reader; on an ordinary site, and with `?raw`, it hands over the file.
   {
     ext: ".css",
     mime: "text/css; charset=utf-8",
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: true
   },
   {
@@ -888,7 +972,7 @@ const FILE_TYPES = [
     mime: "text/javascript; charset=utf-8",
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: true
   },
   {
@@ -896,7 +980,7 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -904,7 +988,7 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -912,7 +996,7 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -920,19 +1004,18 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   // The languages an assistant writes most, beyond the web's own. Same row as `.ts`: shown as source
-  // when somebody opens one in the reader or publishes it on its own, handed over as a file when a
-  // link names it directly, and no media type — adding one changes what a browser does with a
+  // in the reader, handed over as a file with `?raw` or on an ordinary site, and no media type — adding one changes what a browser does with a
   // published file, which I10 makes a decision of its own rather than a side effect of this list.
   {
     ext: ".py",
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -940,7 +1023,7 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -948,7 +1031,7 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -956,7 +1039,7 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -964,7 +1047,7 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -972,7 +1055,7 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -980,7 +1063,7 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -988,7 +1071,7 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -996,7 +1079,7 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -1004,7 +1087,7 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -1012,7 +1095,7 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -1020,7 +1103,7 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -1028,7 +1111,7 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -1036,7 +1119,7 @@ const FILE_TYPES = [
     mime: null,
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: false
   },
   {
@@ -1044,7 +1127,7 @@ const FILE_TYPES = [
     mime: "application/xml",
     kind: "code",
     document: false,
-    reader: false,
+    reader: true,
     editable: true
   },
   // Pictures, shown with an img element.
@@ -1115,25 +1198,25 @@ const FILE_TYPES = [
     reader: false,
     editable: false
   },
-  // A customer's own pages. Never rendered inside the reader.
+  // A customer's own pages. Inside a documents site a navigation opens the reader, which frames the
+  // page; `?raw` and every ordinary site serve the page itself.
   {
     ext: ".html",
     mime: "text/html; charset=utf-8",
     kind: "html",
     document: false,
-    reader: false,
+    reader: true,
     editable: true
   },
   {
-    // ⚠️ No media type, and that is the state of the code rather than a decision: `TYPES` in
-    // `headers.ts` has never held `htm`, so a published `.htm` is served as octet-stream and
-    // downloads instead of rendering. Recorded here rather than fixed, because this table was
-    // introduced as a refactor and a refactor that changes what a URL answers is not one.
+    // An HTML page in every respect the Worker decides by extension: media type, the revalidated
+    // cache policy invariant I7 requires, and the badge's `isHtml`. Missing from `TYPES` it used to
+    // download, which inside the reader meant a frame that downloaded instead of showing a page.
     ext: ".htm",
-    mime: null,
+    mime: "text/html; charset=utf-8",
     kind: "html",
     document: false,
-    reader: false,
+    reader: true,
     editable: true
   },
   // Everything below renders as nothing — the viewer offers a download — but still needs a media
@@ -1243,13 +1326,46 @@ async function sha256Hex(bytes) {
   const digest = await crypto.subtle.digest("SHA-256", bytes);
   return [...new Uint8Array(digest)].map((byte) => byte.toString(16).padStart(2, "0")).join("");
 }
+const HASH_CONCURRENCY = 4;
+const HASH_BYTES_IN_FLIGHT = 16 * 1024 * 1024;
 async function hashAll(files, onProgress, signal) {
-  const hashed = [];
-  for (const [index, file] of files.entries()) {
-    hashed.push({ ...file, sha256: await sha256Hex(await readForHash(file)) });
-    onProgress?.(index + 1, files.length);
-  }
-  return hashed;
+  const budget = byteBudget(HASH_BYTES_IN_FLIGHT);
+  let done = 0;
+  return mapInOrder(
+    files,
+    HASH_CONCURRENCY,
+    async (file) => {
+      const size = sizeOf(file.bytes);
+      await budget.acquire(size);
+      try {
+        signal?.throwIfAborted();
+        const hashed = { ...file, sha256: await sha256Hex(await readForHash(file)) };
+        done += 1;
+        onProgress?.(done, files.length);
+        return hashed;
+      } finally {
+        budget.release(size);
+      }
+    }
+  );
+}
+function byteBudget(limit) {
+  let held = 0;
+  let waiting = [];
+  return {
+    async acquire(size) {
+      while (held > 0 && held + size > limit) {
+        await new Promise((resolve2) => waiting.push(resolve2));
+      }
+      held += size;
+    },
+    release(size) {
+      held -= size;
+      const woken = waiting;
+      waiting = [];
+      for (const wake of woken) wake();
+    }
+  };
 }
 async function readForHash(file) {
   try {
@@ -1278,10 +1394,13 @@ const IGNORED_DIRECTORIES = [
   ".codex",
   ".gemini"
 ];
+function isEnvironmentFile(name) {
+  return name === ".env" || name === ".envrc" || name.startsWith(".env.");
+}
 function shouldIgnore(path) {
   const segments = path.split("/");
   const name = segments.at(-1) ?? "";
-  if (name === "" || IGNORED_EXACT.has(name)) return true;
+  if (name === "" || IGNORED_EXACT.has(name) || isEnvironmentFile(name)) return true;
   if (name.startsWith("._")) return true;
   return segments.some((segment) => IGNORED_DIRECTORIES.includes(segment));
 }
@@ -1416,9 +1535,7 @@ async function readSiteName(files) {
   }
 }
 function decodeHead(bytes) {
-  return new TextDecoder("utf-8", { fatal: false }).decode(
-    bytes.subarray(0, HEAD_BYTES)
-  );
+  return new TextDecoder("utf-8", { fatal: false }).decode(bytes.subarray(0, HEAD_BYTES));
 }
 function nameFromHtml(html) {
   const document = parse(html);
@@ -1443,9 +1560,7 @@ function parse(html) {
   }
 }
 function matchTag(html, tag) {
-  const match = new RegExp(`<${tag}[^>]*>([\\s\\S]*?)</${tag}\\s*>`, "i").exec(
-    html
-  );
+  const match = new RegExp(`<${tag}[^>]*>([\\s\\S]*?)</${tag}\\s*>`, "i").exec(html);
   return match?.[1] === void 0 ? null : decodeEntities(match[1]);
 }
 function matchOgSiteName(html) {
@@ -1546,6 +1661,7 @@ function trimSuffix(title) {
   return title;
 }
 const DEFAULT_CONCURRENCY = 8;
+const MAX_BATCH_CONCURRENCY = 64;
 const DEFAULT_BYTES_IN_FLIGHT = 64 * 1024 * 1024;
 const DEFAULT_RETRIES = 3;
 const BACKOFF_MS = [1e3, 2e3, 4e3];
@@ -1562,14 +1678,31 @@ async function uploadAll(targets, uploadUrl, files, onProgress, signal, deps = {
   const put = deps.put ?? defaultTransport(deps.fetch);
   const delay = deps.delay ?? defaultDelay;
   const concurrency = deps.concurrency ?? DEFAULT_CONCURRENCY;
+  const batchConcurrency = Math.max(
+    1,
+    Math.min(MAX_BATCH_CONCURRENCY, Math.floor(deps.batchConcurrency ?? concurrency))
+  );
   const retries = deps.retries ?? DEFAULT_RETRIES;
   const stallMs = deps.stallMs ?? DEFAULT_STALL_MS;
   const now = deps.now ?? Date.now;
   const maxBytesInFlight = deps.maxBytesInFlight ?? DEFAULT_BYTES_IN_FLIGHT;
   const byPath = new Map(files.map((file) => [file.path, file]));
+  const fileCount = targets.reduce(
+    (sum, target) => sum + (isBatch(target) ? target.files.length : 1),
+    0
+  );
   let nextIndex = 0;
   let done = 0;
   let failed = false;
+  let firstFailure;
+  const local = new AbortController();
+  const inner = local.signal;
+  const fail = (error) => {
+    if (failed) return;
+    failed = true;
+    firstFailure = error;
+    local.abort();
+  };
   let reserved = 0;
   let waiting = [];
   const acquire = async (size) => {
@@ -1584,17 +1717,32 @@ async function uploadAll(targets, uploadUrl, files, onProgress, signal, deps = {
     waiting = [];
     for (const wake of woken) wake();
   };
+  const running = { single: 0, batch: 0 };
+  const limit = { single: concurrency, batch: batchConcurrency };
+  let slotWaiting = [];
+  const takeSlot = async (kind) => {
+    while (running[kind] >= limit[kind]) {
+      await new Promise((resolve2) => slotWaiting.push(resolve2));
+    }
+    running[kind] += 1;
+  };
+  const freeSlot = (kind) => {
+    running[kind] -= 1;
+    const woken = slotWaiting;
+    slotWaiting = [];
+    for (const wake of woken) wake();
+  };
   let landedBytes = 0;
   const inFlight = /* @__PURE__ */ new Map();
   let lastReport = Number.NEGATIVE_INFINITY;
   const report = (path) => {
-    if (onProgress === void 0) return;
+    if (onProgress === void 0 || failed) return;
     const at = now();
     if (path === void 0 && at - lastReport < PROGRESS_INTERVAL_MS) return;
     lastReport = at;
     let bytes = landedBytes;
     for (const sent of inFlight.values()) bytes += sent;
-    onProgress(done, targets.length, bytes, path);
+    onProgress(done, fileCount, bytes, path);
   };
   const worker = async () => {
     for (; ; ) {
@@ -1602,25 +1750,49 @@ async function uploadAll(targets, uploadUrl, files, onProgress, signal, deps = {
       const index = nextIndex++;
       const target = targets[index];
       if (target === void 0) return;
-      const file = byPath.get(target.path);
-      if (file === void 0) {
-        failed = true;
-        throw new DeployError(
-          ClientErrorCode.UploadFailed,
-          `The server asked for ${target.path}, which is not in the manifest.`,
-          { path: target.path }
-        );
+      inner.throwIfAborted();
+      const refs = isBatch(target) ? target.files : [target];
+      const members = [];
+      for (const ref of refs) {
+        const file = byPath.get(ref.path);
+        if (file === void 0) {
+          const missing = new DeployError(
+            ClientErrorCode.UploadFailed,
+            `The server asked for ${ref.path}, which is not in the manifest.`,
+            { path: ref.path }
+          );
+          fail(missing);
+          throw missing;
+        }
+        members.push(file);
       }
-      const size = sizeOf(file.bytes);
-      await acquire(size);
+      const layout = isBatch(target) ? new TextEncoder().encode(
+        batchLayout(
+          target.files.map((ref, i) => ({
+            sha256: ref.sha256,
+            size: sizeOf(members[i].bytes)
+          }))
+        )
+      ) : null;
+      const size = members.reduce((sum, file) => sum + sizeOf(file.bytes), layout?.length ?? 0);
+      const copied = isBatch(target) ? members.reduce(
+        (sum, file) => sum + (file.bytes instanceof Blob ? 0 : sizeOf(file.bytes)),
+        0
+      ) : 0;
+      const reservation = size + copied;
+      const first = members[0].path;
+      const label = members.length === 1 ? first : `${first} and ${members.length - 1} more`;
+      const kind = isBatch(target) ? "batch" : "single";
+      await takeSlot(kind);
+      await acquire(reservation);
       try {
         if (failed) return;
-        signal?.throwIfAborted();
-        await uploadOne(target, file, {
+        inner.throwIfAborted();
+        const context = {
           put,
           delay,
           retries,
-          signal,
+          signal: inner,
           uploadUrl,
           stallMs,
           onSent: (sent) => {
@@ -1629,26 +1801,34 @@ async function uploadAll(targets, uploadUrl, files, onProgress, signal, deps = {
           },
           onRetry: (attempt, stalled) => {
             inFlight.set(index, 0);
-            onRetry?.(target.path, attempt, retries + 1, stalled);
+            onRetry?.(label, attempt, retries + 1, stalled);
           }
-        });
+        };
+        if (isBatch(target) && layout !== null)
+          await uploadBatchOne(target, members, layout, context);
+        else await uploadOne(target, members[0], context);
       } catch (error) {
-        failed = true;
+        fail(error);
         throw error;
       } finally {
-        release(size);
+        release(reservation);
+        freeSlot(kind);
       }
       inFlight.delete(index);
-      done += 1;
+      done += members.length;
       landedBytes += size;
-      report(file.path);
+      report(members.at(-1).path);
     }
   };
-  const workers = Array.from({ length: Math.min(concurrency, targets.length) }, worker);
+  const workers = Array.from(
+    { length: Math.min(Math.max(concurrency, batchConcurrency), targets.length) },
+    worker
+  );
   try {
     await Promise.all(workers);
   } catch (error) {
-    throw asDeployError(error);
+    throw asDeployError(firstFailure ?? error);
+  } finally {
   }
 }
 async function uploadOne(target, file, context) {
@@ -1661,7 +1841,7 @@ async function uploadOne(target, file, context) {
       context.signal?.throwIfAborted();
     }
     try {
-      const status = await context.put({
+      const answer = await context.put({
         url: context.uploadUrl,
         token: target.token,
         body: untyped(file.bytes),
@@ -1669,6 +1849,7 @@ async function uploadOne(target, file, context) {
         onSent: context.onSent,
         stallMs: context.stallMs
       });
+      const status = typeof answer === "number" ? answer : answer.status;
       if (status >= 200 && status < 300) return;
       if (status === 401 || status === 403 || status === 429) {
         throw new DeployError(
@@ -1697,6 +1878,85 @@ async function uploadOne(target, file, context) {
     cause: describeError(lastError)
   });
 }
+async function uploadBatchOne(batch, members, layout, context) {
+  const first = members[0].path;
+  const label = members.length === 1 ? first : `${first} and ${members.length - 1} more`;
+  let lastError;
+  for (let attempt = 0; attempt <= context.retries; attempt++) {
+    context.signal?.throwIfAborted();
+    if (attempt > 0) {
+      context.onRetry(attempt + 1, lastError instanceof StalledError);
+      await context.delay(BACKOFF_MS[attempt - 1] ?? BACKOFF_MS.at(-1) ?? 1e3);
+      context.signal?.throwIfAborted();
+    }
+    try {
+      const body = new Blob([layout, ...members.map((file) => file.bytes)]);
+      const answer = await context.put({
+        url: context.uploadUrl,
+        token: batch.token,
+        body,
+        signal: context.signal,
+        onSent: context.onSent,
+        stallMs: context.stallMs,
+        wantsBody: true
+      });
+      const status = typeof answer === "number" ? answer : answer.status;
+      if (status >= 200 && status < 300) {
+        const result = typeof answer === "number" ? null : parseBatchResult(answer.body);
+        if (result === null) {
+          lastError = new Error(
+            "The upload service answered with something that is not a batch result."
+          );
+          continue;
+        }
+        if (result.failed.length === 0) return;
+        const changed = result.failed.find((failure2) => failure2.reason === "hash_mismatch");
+        if (changed !== void 0) {
+          const path = members[changed.i]?.path ?? first;
+          throw new DeployError(
+            ClientErrorCode.ReadFailed,
+            `${path} changed after it was read, so it no longer matches what was checked. Drop the folder again.`,
+            { path }
+          );
+        }
+        lastError = new Error(
+          `${result.failed.length} of ${members.length} files were not stored.`
+        );
+        continue;
+      }
+      if ([400, 401, 403, 411, 413, 429].includes(status)) {
+        throw new DeployError(ClientErrorCode.UploadFailed, refusalMessage(status, label), {
+          path: first,
+          status
+        });
+      }
+      lastError = new Error(`HTTP ${status}`);
+    } catch (error) {
+      if (error instanceof DeployError) throw error;
+      if (isAbort(error)) throw cancelled();
+      lastError = error;
+    }
+  }
+  const message = lastError instanceof StalledError ? `Upload of ${label} stopped moving and did not recover after ${context.retries + 1} attempts. Check your connection and try again.` : `Could not upload ${label} after ${context.retries + 1} attempts.`;
+  throw new DeployError(ClientErrorCode.UploadFailed, message, {
+    path: first,
+    cause: describeError(lastError)
+  });
+}
+function refusalMessage(status, label) {
+  switch (status) {
+    case 401:
+      return `Upload of ${label} was refused because its upload window expired. Try deploying again.`;
+    case 429:
+      return `Upload of ${label} was refused: this deploy has used every upload it was given. Try deploying again.`;
+    case 400:
+    case 411:
+    case 413:
+      return `Upload of ${label} was refused because it no longer matches what was checked — a file may have changed since you dropped it. Drop the folder again.`;
+    default:
+      return `Upload of ${label} was refused by the upload service. Try deploying again.`;
+  }
+}
 function untyped(content) {
   if (ArrayBuffer.isView(content) || content.type === "") return content;
   return content.slice(0, content.size);
@@ -1707,7 +1967,8 @@ function defaultTransport(doFetch) {
   return Xhr === void 0 ? fetchTransport(globalFetch()) : xhrTransport(Xhr);
 }
 function fetchTransport(doFetch) {
-  return async ({ url, token, body, signal }) => {
+  return async (request2) => {
+    const { url, token, body, signal } = request2;
     const response = await doFetch(url, {
       method: "PUT",
       // The view, not a copy. Wrapping it in `new Blob([body.slice().buffer])` made two extra
@@ -1722,11 +1983,11 @@ function fetchTransport(doFetch) {
       headers: { Authorization: `Bearer ${token}` },
       ...signal ? { signal } : {}
     });
-    return response.status;
+    return request2.wantsBody === true ? { status: response.status, body: await response.text() } : response.status;
   };
 }
 function xhrTransport(Xhr) {
-  return ({ url, token, body, signal, onSent, stallMs }) => new Promise((resolve2, reject) => {
+  return ({ url, token, body, signal, onSent, stallMs, wantsBody }) => new Promise((resolve2, reject) => {
     const xhr = new Xhr();
     let settled = false;
     let timer;
@@ -1760,7 +2021,11 @@ function xhrTransport(Xhr) {
       onSent(event.loaded);
     };
     xhr.onprogress = arm;
-    xhr.onload = () => settle(() => resolve2(xhr.status));
+    xhr.onload = () => settle(
+      () => resolve2(
+        wantsBody === true ? { status: xhr.status, body: xhr.responseText ?? "" } : xhr.status
+      )
+    );
     xhr.onerror = () => settle(() => reject(new TypeError("Network error during upload.")));
     arm();
     xhr.send(body);
@@ -1825,11 +2090,16 @@ async function deploy(source, siteId, onProgress, signal, options = {}) {
       return;
     }
     const sizes = new Map(hashed.map((file) => [file.path, sizeOf(file.bytes)]));
-    const totalBytes = prepared.upload.reduce(
-      (sum, target) => sum + (sizes.get(target.path) ?? 0),
-      0
-    );
-    if (prepared.upload.length > 0) {
+    const batches = prepared.batches ?? [];
+    const targets = [...prepared.upload, ...batches];
+    const totalBytes = prepared.upload.reduce((sum, target) => sum + (sizes.get(target.path) ?? 0), 0) + batches.reduce((sum, batch) => {
+      const members = batch.files.map((ref) => ({
+        sha256: ref.sha256,
+        size: sizes.get(ref.path) ?? 0
+      }));
+      return sum + batchLayout(members).length + members.reduce((n, member) => n + member.size, 0);
+    }, 0);
+    if (targets.length > 0) {
       onProgress({
         type: "uploading",
         done: prepared.reused,
@@ -1840,7 +2110,7 @@ async function deploy(source, siteId, onProgress, signal, options = {}) {
       });
     }
     await uploadAll(
-      prepared.upload,
+      targets,
       prepared.uploadUrl,
       hashed,
       (done, _total, bytes, path) => onProgress({
@@ -1853,7 +2123,9 @@ async function deploy(source, siteId, onProgress, signal, options = {}) {
         ...path === void 0 ? {} : { path }
       }),
       signal,
-      options.upload,
+      // The server's number unless the caller set one: it is tuned on the server so a deploy of many
+      // small files speeds up without a CLI or MCP release.
+      typeof prepared.batchConcurrency === "number" && options.upload?.batchConcurrency === void 0 ? { ...options.upload, batchConcurrency: prepared.batchConcurrency } : options.upload,
       (path, attempt, attempts, stalled) => onProgress({ type: "retrying", path, attempt, attempts, stalled })
     );
     onProgress({ type: "completing", reused: prepared.reused });
@@ -2525,7 +2797,9 @@ const SETTINGS_USAGE = [
   "  password                    Read from stdin, or typed at a hidden prompt",
   "  forms on|off                Whether its forms accept submissions",
   "  expires <ISO 8601 instant>  When it comes down; add --then delete to delete rather than pause",
-  "  folder <path|id|root>       Which folder it is filed in"
+  "  folder <path|id|root>       Which folder it is filed in",
+  "  invite-only on|off          Whether only the people on its list can open it",
+  "  comments off|invited|anyone Who may comment on its pages"
 ].join("\n");
 function settingChange(setting, values, then) {
   const value = setting === "name" ? values.join(" ").trim() : values[0];
@@ -2573,6 +2847,14 @@ function settingChange(setting, values, then) {
     }
     case "folder":
       return value ? { folder: value } : needs("Clients/Acme");
+    case "invite-only":
+      if (value === "on" || value === "off") return { change: { invitedOnly: value === "on" } };
+      return { refusal: "`set invite-only` takes `on` or `off`." };
+    case "comments":
+      if (value === "off" || value === "invited" || value === "anyone") {
+        return { change: { comments: value } };
+      }
+      return { refusal: "`set comments` takes `off`, `invited` or `anyone`." };
     default:
       return {
         refusal: `${setting === void 0 ? "Name a setting." : `\`${setting}\` is not a setting.`} Settings:
@@ -2650,9 +2932,14 @@ async function applied(credentials, siteId, subdomain, change) {
       `  access    ${accessOf(settings)}`,
       `  mode      ${servingModeOf$1(settings)}`,
       `  forms     ${settings.formsEnabled ? "on" : "off"}`,
+      `  comments  ${settings.comments ?? "unknown"}`,
       `  takedown  ${takedown}`,
       ...settings.replacedInviteOnly ? [
-        "The password replaced invite-only: the people on its list can no longer get in without it. The list is kept for if you switch back in the dashboard."
+        "The password replaced invite-only: the people on its list can no longer get in without it. The list is kept; `drop2run set invite-only on` switches back."
+      ] : [],
+      // The one combination that reads as on and does nothing, which the API keeps on purpose.
+      ...settings.comments === "invited" && settings.invitedOnly === false ? [
+        "Comments are for invited people, but the site is not invite-only, so nobody can comment yet. Run `drop2run set invite-only on`, or `drop2run set comments anyone`."
       ] : [],
       settings.live ? "Reaching every edge takes up to about a minute." : "Nothing is published yet, so this applies from the first publish."
     ].join("\n"),
@@ -2678,6 +2965,72 @@ async function tokens() {
     return failure(error instanceof Error ? error.message : String(error));
   }
 }
+async function people(site) {
+  const found = credentialsOr();
+  if ("result" in found) return found.result;
+  const target = siteOr(site, "drop2run people <subdomain>");
+  if ("result" in target) return target.result;
+  try {
+    const summary = await findSite(found.credentials, target.named);
+    const list2 = await listPeople(found.credentials, summary.siteId);
+    const head = `${list2.total} of ${list2.limit} on ${summary.subdomain}'s list. ` + (list2.invitedOnly ? "Only they can open it." : "It is not invite-only, so anybody with the link can open it — `drop2run set invite-only on`.");
+    const rows = list2.people.map(
+      (person) => `${person.email}	${person.role}${person.owner ? ", owner" : ""}	${person.status}`
+    );
+    return { text: [head, ...rows].join("\n"), json: list2, code: 0 };
+  } catch (error) {
+    return failure(error instanceof Error ? error.message : String(error));
+  }
+}
+async function invite(emails, site, role) {
+  const found = credentialsOr();
+  if ("result" in found) return found.result;
+  if (emails.length === 0)
+    return failure("Name at least one address: `drop2run invite dana@example.com`.");
+  if (role !== void 0 && role !== "view" && role !== "comment") {
+    return failure("`--role` is `view` or `comment`.");
+  }
+  const target = siteOr(site, "drop2run invite <email> --site <subdomain>");
+  if ("result" in target) return target.result;
+  try {
+    const summary = await findSite(found.credentials, target.named);
+    const invited = await invitePeople(
+      found.credentials,
+      summary.siteId,
+      emails,
+      role === "comment" ? "comment" : "view"
+    );
+    const list2 = await listPeople(found.credentials, summary.siteId);
+    return {
+      text: [
+        invited.added.length === 0 ? `Nobody new on ${summary.subdomain}'s list.` : `Invited ${invited.added.join(", ")} to ${summary.subdomain} — each was emailed.`,
+        ...invited.alreadyListed.length === 0 ? [] : [`Already on the list, not emailed again: ${invited.alreadyListed.join(", ")}.`],
+        ...list2.invitedOnly ? [] : [
+          "The site is not invite-only yet, so the list does not decide who opens it. `drop2run set invite-only on` does."
+        ]
+      ].join("\n"),
+      json: invited,
+      code: 0
+    };
+  } catch (error) {
+    return failure(error instanceof Error ? error.message : String(error));
+  }
+}
+async function uninvite(email, site) {
+  const found = credentialsOr();
+  if ("result" in found) return found.result;
+  if (email === void 0)
+    return failure("Name the address: `drop2run uninvite dana@example.com`.");
+  const target = siteOr(site, "drop2run uninvite <email> --site <subdomain>");
+  if ("result" in target) return target.result;
+  try {
+    const summary = await findSite(found.credentials, target.named);
+    await removePerson(found.credentials, summary.siteId, email);
+    return { text: `Removed ${email} from ${summary.subdomain}'s list.`, json: { email }, code: 0 };
+  } catch (error) {
+    return failure(error instanceof Error ? error.message : String(error));
+  }
+}
 const COMMENTS_USAGE = [
   "  drop2run comments [site] [--status open|resolved|all] [--path /page]",
   "  drop2run comments reply <thread> <text> [--resolve] [--site X]",
@@ -2808,6 +3161,9 @@ const HELP = `drop2run — publish a static site from the command line
   drop2run resume [site]                       Put a paused site back on the air
   drop2run rollback <deployId> [--site X]      Put an earlier version back live
   drop2run rm <site> --yes                     Delete a site and everything on it
+  drop2run people [site]                       Who the site is shared with
+  drop2run invite <email>... [--role comment]  Share it with people; each is emailed
+  drop2run uninvite <email>                    Take someone off the list
   drop2run comments [site]                     Read the comments left on a site's pages
   drop2run comments reply <thread> <text>      Answer a thread as the owner [--resolve]
   drop2run comments resolve|reopen <thread>    Resolve a thread, or open it again
@@ -2829,6 +3185,7 @@ Flags
   --status X     Which comment threads: open (the default), resolved or all
   --path X       Only the comments on one page, such as /pricing
   --resolve      Resolve the thread with the reply (\`comments reply\` only)
+  --role X       What invited people may do: view (the default) or comment
 
 Comments
   \`comments reply\`, \`resolve\` and \`reopen\` act on --site, else the site in
@@ -2847,6 +3204,11 @@ Settings
   set forms on|off              Whether its forms accept submissions
   set expires <ISO 8601>        Take it down then, e.g. 2026-12-31T09:00:00Z
   set folder <path|id|root>     Move it to a folder, or root for the top level
+  set invite-only on|off        Only the people on its list (\`invite\`) can open it;
+                                replaces a password
+  set comments off|invited|anyone
+                                Who may comment: nobody, people invited to
+                                comment, or anybody signed in
 
   \`set\` and \`unset\` act on --site, else the site in drop2run.json. A
   setting your plan does not include is refused with the reason, and
@@ -2879,7 +3241,7 @@ function flagValue(args, flag) {
   const value = args[at + 1];
   return value === void 0 || value.startsWith("-") ? void 0 : value;
 }
-const VALUE_FLAGS = ["--site", "--subdomain", "--folder", "--then", "--status", "--path"];
+const VALUE_FLAGS = ["--site", "--subdomain", "--folder", "--then", "--status", "--path", "--role"];
 function positionals(argv) {
   const found = [];
   for (let at = 0; at < argv.length; at++) {
@@ -2928,7 +3290,7 @@ async function run(commandLine) {
   const positional = [...positionals(argv), ...literal];
   const [command, ...rest] = positional;
   if (argv.includes("--version")) {
-    const { version } = await import("./package-LdzYr7IV.js").then(
+    const { version } = await import("./package-B79z0E4v.js").then(
       (module) => module.default
     );
     return { text: version, json: { version }, code: 0 };
@@ -2963,11 +3325,12 @@ async function run(commandLine) {
       status: flagValue(argv, "--status"),
       path: flagValue(argv, "--path"),
       resolve: argv.includes("--resolve")
-    }
+    },
+    flagValue(argv, "--role")
   );
   return json ? { ...result, text: JSON.stringify(result.json, null, 2) } : result;
 }
-async function dispatch(command, rest, site, json, device, confirmed, newSite = {}, then = void 0, commentOptions = {}) {
+async function dispatch(command, rest, site, json, device, confirmed, newSite = {}, then = void 0, commentOptions = {}, role = void 0) {
   switch (command) {
     case "login": {
       const print = json ? () => {
@@ -3004,6 +3367,12 @@ async function dispatch(command, rest, site, json, device, confirmed, newSite =
       return await pauseOrResume(command, rest[0] ?? site);
     case "rollback":
       return await rollback(rest[0], site);
+    case "people":
+      return await people(rest[0] ?? site);
+    case "invite":
+      return await invite(rest, site, role);
+    case "uninvite":
+      return await uninvite(rest[0], site);
     case "rm":
       return await remove(rest[0] ?? site, confirmed);
     case "comments":

package/dist/{package-LdzYr7IV.js → package-B79z0E4v.js}

@@ -1,5 +1,5 @@
 const name = "drop2run";
-const version = "0.9.0";
+const version = "0.11.0";
 const description = "Publish a page, a folder of documents or a built site to Drop2Run from the command line.";
 const license = "MIT";
 const type = "module";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drop2run",
-	"version": "0.9.0",
+	"version": "0.11.0",
 	"description": "Publish a page, a folder of documents or a built site to Drop2Run from the command line.",
 	"license": "MIT",
 	"type": "module",