@buildinternet/uploads 0.49.0 → 0.50.1

package/dist/cli-catalog.js

@@ -26,6 +26,7 @@ export const PUT_LIKE_FLAGS = [
     "--pr",
     "--issue",
     "--branch",
+    "--from-branch",
     "--comment",
     "--no-comment",
     "--format",

package/dist/client.d.ts

@@ -441,6 +441,8 @@ export interface UsageResult {
     uploadsRemaining?: number;
     /** Bytes still on hosted storage (shared-lane residue). */
     sharedBytes?: number;
+    /** Objects still on hosted storage (shared-lane residue). */
+    sharedObjects?: number;
     /** "shared" = BYO bucket active: the storage cap meters only hosted
      * residue; the customer's own bucket is unmetered. */
     storageBudgetBasis?: "total" | "shared";

package/dist/commands.js

@@ -649,6 +649,13 @@ export async function syncAttachmentsComment(client, target, run, workspace, opt
         // byte-identical.
         const path = metadata?.path;
         const state = metadata?.state;
+        // Server-derived image dimensions (parity with the bot path's
+        // COMMENT_META_KEYS hydration): finite positive numbers only, field
+        // omitted entirely when neither parses.
+        const imgWidth = Number(metadata?.["image.width"]);
+        const imgHeight = Number(metadata?.["image.height"]);
+        const hasImgWidth = Number.isFinite(imgWidth) && imgWidth > 0;
+        const hasImgHeight = Number.isFinite(imgHeight) && imgHeight > 0;
         return {
             key,
             url,
@@ -657,6 +664,14 @@ export async function syncAttachmentsComment(client, target, run, workspace, opt
             ...(path || state
                 ? { meta: { ...(path ? { path } : {}), ...(state ? { state } : {}) } }
                 : {}),
+            ...(hasImgWidth || hasImgHeight
+                ? {
+                    imageMeta: {
+                        ...(hasImgWidth ? { width: imgWidth } : {}),
+                        ...(hasImgHeight ? { height: imgHeight } : {}),
+                    },
+                }
+                : {}),
         };
     }));
     const galleries = [];
@@ -794,6 +809,12 @@ takes effect with zero files and cannot combine with --branch/--issue/
 --no-promote. Promotion never applies to issues. Staged files stay findable
 with "uploads find gh.branch=<branch>" either way.
 
+If the branch was renamed or deleted before the PR opened, pass
+"--from-branch <old-name>" with "--pr <num>". With no file arguments, this
+promotes the stale branch prefix and refreshes the managed comment. With file
+or existing-key arguments, it promotes the stale prefix before the normal
+attach flow.
+
 Options:
   --pr <num>            Attach to this pull request
   --issue <num>         Attach to this issue
@@ -802,6 +823,8 @@ Options:
   --promote             No files: promote branch-staged attachments into the
                         resolved PR and refresh the comment; not with
                         --branch/--issue/--no-promote
+  --from-branch <name>  Promote staged attachments from this branch instead of
+                        the current branch; requires a pull-request target
   --no-promote          Skip auto-promoting branch-staged attachments (default path only)
   --move                With an already-uploaded key/URL argument: delete the source
                         object after a successful server-side copy (default: copy)
@@ -833,6 +856,7 @@ Examples:
   uploads attach ./artifact.zip --issue 45 --no-comment
   uploads attach ./shot.png --meta path=/settings --state after
   uploads attach ./shot.png --branch
+  uploads attach --pr 123 --from-branch old/branch
   uploads attach ./shot.png --branch feature/new-settings
   uploads attach --promote
 `;
@@ -1189,7 +1213,12 @@ export async function runAttach(ctx, args, help = false, run = execRunner) {
     if (parsed.flags.has("--move") && typeof parsed.flags.get("--move") === "string") {
         throw new UsageError("--move takes no value — place it after the file arguments");
     }
-    if (parsed.flags.has("--promote")) {
+    if (parsed.flags.has("--from-branch") && !flagString(parsed.flags, "--from-branch")) {
+        throw new UsageError("--from-branch requires a branch name");
+    }
+    const fromBranch = flagString(parsed.flags, "--from-branch");
+    if (parsed.flags.has("--promote") ||
+        (fromBranch !== undefined && parsed.positionals.length === 0)) {
         if (parsed.positionals.length > 0) {
             throw new UsageError("--promote takes no file arguments — attaching a file to a PR already auto-promotes " +
                 "staged files; use `uploads attach <file> --pr <num>` instead");
@@ -1221,6 +1250,12 @@ export async function runAttach(ctx, args, help = false, run = execRunner) {
             throw new UsageError("--branch cannot be combined with --comment");
         return runAttachBranch(ctx, parsed, branchArg, run);
     }
+    if (fromBranch !== undefined && parsed.flags.has("--issue")) {
+        throw new UsageError("--from-branch cannot be combined with --issue");
+    }
+    if (fromBranch !== undefined && parsed.flags.has("--no-promote")) {
+        throw new UsageError("--from-branch cannot be combined with --no-promote");
+    }
     const explicitTarget = ghTargetFromFlags(parsed.flags, run);
     const target = explicitTarget ??
         resolveCurrentPullRequest(resolveRepo(flagString(parsed.flags, "--repo"), run), run);
@@ -1309,11 +1344,14 @@ export async function runAttach(ctx, args, help = false, run = execRunner) {
     let promotion;
     let promotedBranch;
     if (target.kind === "pull" && !parsed.flags.has("--no-promote")) {
-        try {
-            promotedBranch = resolveCurrentBranch(run);
-        }
-        catch {
-            promotedBranch = undefined;
+        promotedBranch = fromBranch;
+        if (promotedBranch === undefined) {
+            try {
+                promotedBranch = resolveCurrentBranch(run);
+            }
+            catch {
+                promotedBranch = undefined;
+            }
         }
         if (promotedBranch !== undefined) {
             promotion = await attemptPromoteBranch(ctx.client, target, promotedBranch);
@@ -1321,8 +1359,10 @@ export async function runAttach(ctx, args, help = false, run = execRunner) {
     }
     let comment;
     let commentError;
-    // Skip comment refresh when every upload failed — nothing new from this batch.
-    if (!parsed.flags.has("--no-comment") && uploads.length > 0) {
+    // Existing-key attach syncs server-side, but a stale-branch promotion runs
+    // afterward. Refresh once more so that copy is visible in the same command.
+    const shouldRefreshComment = uploads.length > 0 || (fromBranch !== undefined && attachedExisting.length > 0);
+    if (!parsed.flags.has("--no-comment") && shouldRefreshComment) {
         try {
             comment = await syncAttachmentsComment(ctx.client, target, run, ctx.config.workspace);
         }
@@ -1524,7 +1564,10 @@ async function runAttachPromoteOnly(ctx, parsed, run) {
     const explicitTarget = ghTargetFromFlags(parsed.flags, run);
     const target = explicitTarget ??
         resolveCurrentPullRequest(resolveRepo(flagString(parsed.flags, "--repo"), run), run);
-    const branch = resolveCurrentBranch(run);
+    if (target.kind !== "pull") {
+        throw new UsageError("--from-branch only promotes into a pull request");
+    }
+    const branch = flagString(parsed.flags, "--from-branch") ?? resolveCurrentBranch(run);
     const promotion = await attemptPromoteBranch(ctx.client, target, branch);
     let comment;
     let commentError;

package/dist/comment-render.generated.d.ts

@@ -107,6 +107,11 @@ export interface AttachmentItem {
         width?: number;
         height?: number;
     };
+    /** Server-derived pixel dimensions for an image (never client-settable). */
+    imageMeta?: {
+        width?: number;
+        height?: number;
+    };
 }
 /** A public gallery linked to the PR or issue whose managed comment is syncing. */
 export interface GalleryCommentItem {
@@ -144,6 +149,11 @@ export declare function attachmentPairWidth(density?: AttachmentDensity): number
  * only affects managed-comment auto layout; other callers leave it `"dense"`.
  */
 export declare function attachmentImageWidth(filename: string, density?: AttachmentDensity): number;
+/**
+ * Icons and other small assets: both dimensions known and no edge above this
+ * flow inline at natural size rather than each becoming a full row.
+ */
+export declare const SMALL_ASSET_MAX_EDGE = 200;
 /**
  * Render the one marker-owned GitHub comment. When there are no galleries this
  * intentionally preserves the legacy attachment-only body byte-for-byte.

package/dist/comment-render.generated.js

@@ -183,19 +183,32 @@ function formatDuration(seconds) {
     return `${h}:${String(m).padStart(2, "0")}:${ss}`;
 }
 /**
- * Display width for a video poster. Real dimensions only *select* among the
- * density table's tiers — a raw 1920 would blow out the comment column — and
- * the result is capped at the real width so a small clip is never upscaled.
+ * Display width for an image or video-poster embed. Real dimensions only
+ * *select* among the density table's tiers — a raw 1920 would blow out the
+ * comment column — and the result is capped at the real width so a small
+ * asset is never upscaled into a blurry tile. Without dims (either missing),
+ * falls back to the filename heuristic exactly, keeping dimension-less
+ * renders byte-identical to before dims existed.
  */
-function posterImageWidth(videoMeta, filename, density = "dense") {
-    const w = videoMeta?.width ?? 0;
-    const h = videoMeta?.height ?? 0;
+function naturalMediaWidth(dims, filename, density = "dense") {
+    const w = dims?.width ?? 0;
+    const h = dims?.height ?? 0;
     if (w <= 0 || h <= 0)
         return attachmentImageWidth(filename, density);
     const table = WIDTH_BY_DENSITY[density];
     const chosen = h > w ? table.portrait : w / h >= 16 / 9 ? table.wide : table.default;
     return Math.min(chosen, w);
 }
+/**
+ * Icons and other small assets: both dimensions known and no edge above this
+ * flow inline at natural size rather than each becoming a full row.
+ */
+export const SMALL_ASSET_MAX_EDGE = 200;
+function isSmallAsset(dims) {
+    const w = dims?.width ?? 0;
+    const h = dims?.height ?? 0;
+    return w > 0 && h > 0 && Math.max(w, h) <= SMALL_ASSET_MAX_EDGE;
+}
 function escapeHtmlAttr(s) {
     return s.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
 }
@@ -360,7 +373,7 @@ function renderPairCell(item, label, options, density) {
     const name = item.key.slice(item.key.lastIndexOf("/") + 1);
     const src = item.embedUrl ?? item.url;
     const link = item.pageUrl ?? item.url;
-    const autoPx = Math.min(attachmentImageWidth(name, density), attachmentPairWidth(density));
+    const autoPx = Math.min(naturalMediaWidth(item.imageMeta, name, density), attachmentPairWidth(density));
     const w = resolvedWidth(autoPx, options);
     const alt = escapeHtmlAttr(name);
     const href = escapeHtmlAttr((link ?? src));
@@ -480,7 +493,7 @@ export function attachmentsCommentBody(items, galleries = [], marker = ATTACHMEN
         }
         if (isPosterVideo) {
             inlinedImages++;
-            const autoPx = posterImageWidth(item.videoMeta, name, density);
+            const autoPx = naturalMediaWidth(item.videoMeta, name, density);
             const w = resolvedWidth(autoPx, options);
             const href = escapeHtmlAttr(link ?? item.posterUrl);
             lines.push(`<a href="${href}">${imgTag(w, escapeHtmlAttr(name), escapeHtmlAttr(item.posterUrl))}</a>`);
@@ -496,10 +509,53 @@ export function attachmentsCommentBody(items, galleries = [], marker = ATTACHMEN
             lines.push(parts.join(" · "), "");
         }
         else if (isImage) {
+            // Small-asset flow layout: consecutive captionless small images (icons)
+            // join onto one line so GitHub flows them horizontally at natural size
+            // instead of stacking a giant column per icon. Auto mode only — a
+            // numeric imageWidth override or "full" keeps today's one-per-row form.
+            const smallGroupable = (candidate, i) => {
+                if (options.imageWidth !== "auto")
+                    return false;
+                if (consumedByPair.has(i) || partnerOf.has(i))
+                    return false;
+                if (!isSmallAsset(candidate.imageMeta))
+                    return false;
+                if (metaCaptionValues(candidate.meta, options).length > 0)
+                    return false;
+                const n = candidate.key.slice(candidate.key.lastIndexOf("/") + 1);
+                const s = candidate.embedUrl ?? candidate.url;
+                return Boolean(s) && inferContentType(n).startsWith("image/");
+            };
+            if (smallGroupable(item, idx)) {
+                const group = [item];
+                let j = idx + 1;
+                // Each grouped image still counts toward maxInlineImages.
+                while (j < sorted.length &&
+                    inlinedImages + group.length < options.maxInlineImages &&
+                    smallGroupable(sorted[j], j)) {
+                    group.push(sorted[j]);
+                    j++;
+                }
+                if (group.length > 1) {
+                    inlinedImages += group.length;
+                    lines.push(group
+                        .map((g) => {
+                        const gName = g.key.slice(g.key.lastIndexOf("/") + 1);
+                        const gSrc = (g.embedUrl ?? g.url);
+                        const gHref = escapeHtmlAttr((g.pageUrl ?? g.url ?? gSrc));
+                        // Natural width — a small asset is never upscaled.
+                        const gW = g.imageMeta?.width;
+                        return `<a href="${gHref}">${imgTag(gW, escapeHtmlAttr(gName), escapeHtmlAttr(gSrc))}</a>`;
+                    })
+                        .join(" "), "");
+                    idx = j - 1;
+                    continue;
+                }
+            }
             inlinedImages++;
             // Markdown ![]() has no width control — phone frames become full-column giants.
             // img src uses embed host when available (Camo revalidates); click-through prefers the file page.
-            const autoPx = attachmentImageWidth(name, density);
+            const autoPx = naturalMediaWidth(item.imageMeta, name, density);
             const w = resolvedWidth(autoPx, options);
             const alt = escapeHtmlAttr(name);
             const href = escapeHtmlAttr(link ?? src);

package/dist/mcp/output-schemas.js

@@ -191,13 +191,30 @@ export const usageResultSchema = objectSchema({
     workspace: { type: "string" },
     bytes: { type: "number" },
     objects: { type: "number" },
+    sharedBytes: { type: "number" },
+    sharedObjects: { type: "number" },
     uploadsInPeriod: { type: "number" },
     periodStart: { type: "string" },
     updatedAt: { type: "string" },
+    storageBudgetBasis: { type: "string", enum: ["total", "shared"] },
     maxStorageBytes: { type: "number" },
     storageRemainingBytes: { type: "number" },
     maxUploadsPerPeriod: { type: "number" },
     uploadsRemaining: { type: "number" },
+    // GET /:workspace/usage (routes/workspace-usage.ts) also stamps these on
+    // every response — not part of `usageWithLimits`'s return, so easy to miss.
+    scopes: { type: "array", items: { type: "string" } },
+    plan: { type: "string" },
+    storage: objectSchema({
+        mode: { type: "string", enum: ["shared", "byo"] },
+        fallbackLanes: { type: "number" },
+        health: objectSchema({
+            ok: { type: "boolean" },
+            code: { type: "string" },
+            message: { type: "string" },
+            since: { type: "string" },
+        }, ["ok"]),
+    }, ["mode", "fallbackLanes", "health"]),
 });
 export const reconcileResultSchema = objectSchema({
     workspace: { type: "string" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buildinternet/uploads",
-  "version": "0.49.0",
+  "version": "0.50.1",
   "mcpName": "sh.uploads/mcp",
   "description": "CLI and client for uploads.sh — workspace-scoped image hosting for GitHub embeds",
   "type": "module",