@buildinternet/uploads 0.37.0 → 0.37.2

package/dist/client.d.ts

@@ -243,7 +243,7 @@ export interface FindGalleriesByReferenceOptions {
  * anyway, defeating the point of the server-side gate, so the CLI surfaces
  * the decline instead.
  */
-export type GithubCommentDeclineReason = "app_unconfigured" | "not_installed" | "forbidden" | "not_authorized" | "unavailable";
+export type GithubCommentDeclineReason = "app_unconfigured" | "not_installed" | "forbidden" | "not_authorized" | "actor_not_authorized" | "unavailable";
 export type GithubCommentResult = {
     posted: true;
     action: "created" | "updated" | "skipped";

package/dist/commands.d.ts

@@ -165,8 +165,10 @@ export interface AttachmentsCommentResult {
 export declare function commentViaSuffix(via: AttachmentsCommentResult["via"]): string;
 /**
  * Thrown by `syncAttachmentsComment` when the server declines with
- * `not_authorized` (issue #297 baseline control) — this repo is bound to a
- * different workspace. Deliberately not caught by the generic "bot endpoint
+ * `not_authorized` (issue #297 baseline control — this repo is bound to a
+ * different workspace) or `actor_not_authorized` (issue #297 control 2 — the
+ * workspace requires the caller to be on the target PR/issue thread).
+ * Deliberately not caught by the generic "bot endpoint
  * unreachable" fallback below: falling back to gh here would let the
  * human's own credentials post anyway, defeating the point of the
  * server-side gate.
@@ -490,6 +492,19 @@ export interface DoctorReport {
     scopes?: string[];
     /** Workspace/token mismatch warning (also present in hints). */
     warning?: string;
+    /**
+     * Bring-your-own-bucket storage status (issue #583 Phase 3). `GET
+     * /me/workspaces/:name/storage` is session-gated (Better Auth cookie or
+     * bearer via the AUTH service — see `session-auth.ts`); the CLI only ever
+     * holds a minted `up_<workspace>_…` workspace token, never a session
+     * bearer, so doctor cannot reach that route today. Until a token-authed
+     * read path exists, this is an honest "can't check from here" rather than
+     * a fabricated mode.
+     */
+    storage: {
+        checked: false;
+        note: string;
+    };
     hints: string[];
     /** `screenshot`'s local-browser detection (fs scans only — never launches a browser). */
     browser: {

package/dist/commands.js

@@ -447,8 +447,10 @@ export function commentViaSuffix(via) {
 }
 /**
  * Thrown by `syncAttachmentsComment` when the server declines with
- * `not_authorized` (issue #297 baseline control) — this repo is bound to a
- * different workspace. Deliberately not caught by the generic "bot endpoint
+ * `not_authorized` (issue #297 baseline control — this repo is bound to a
+ * different workspace) or `actor_not_authorized` (issue #297 control 2 — the
+ * workspace requires the caller to be on the target PR/issue thread).
+ * Deliberately not caught by the generic "bot endpoint
  * unreachable" fallback below: falling back to gh here would let the
  * human's own credentials post anyway, defeating the point of the
  * server-side gate.
@@ -485,6 +487,14 @@ export async function syncAttachmentsComment(client, target, run, workspace, opt
                 `Run \`uploads github link --status --repo ${target.repo}\` to see who owns the ` +
                 `binding, use that workspace instead, or post the comment manually with gh.`);
         }
+        // Actor-on-PR gate (issue #297 control 2, workspace opt-in): same
+        // no-gh-fallback rule as not_authorized — the workspace explicitly asked
+        // the server to hold this line, so the CLI shouldn't route around it.
+        if (bot.reason === "actor_not_authorized") {
+            throw new GithubCommentAuthorizationError(`${bot.message ?? `You are not an actor on ${target.repo}#${target.num}.`}\n` +
+                `Ask an authorized thread participant to run this, or post the ` +
+                `comment manually with gh.`);
+        }
         // Installed-but-unapproved is a fixable misconfiguration, not a silent
         // degrade: tell the user (and how to fix it) before falling back to gh.
         if (bot.reason === "forbidden" && bot.message) {
@@ -1384,7 +1394,7 @@ export function mergeStagingMeta(base, target) {
  * for both the human-mode stderr line and the JSON `hint` field.
  */
 export function putStagingNoteText(branch) {
-    return (`note: staged for branch ${branch} — auto-attaches to this branch's PR when it opens ` +
+    return (`note: staged for branch ${branch} — auto-comments to pull request when opened ` +
         `(or run: uploads attach --promote once it exists). Use --ref/--prefix for a plain dated upload.`);
 }
 /**
@@ -2921,6 +2931,10 @@ export async function buildDoctorReport(config, client, detectRoots) {
         usage,
         scopes,
         warning: mismatch,
+        storage: {
+            checked: false,
+            note: "not checked from the CLI — storage settings (shared vs. bring-your-own-bucket) live behind a signed-in session; sign in on the web (Account → workspace → Settings) to view mode and verification status",
+        },
         hints,
         browser,
     };
@@ -2957,6 +2971,7 @@ export async function runDoctor(ctx, args, help = false) {
     else {
         lines.push(`browser:   ${report.browser.note ?? "not supported in this runtime"}`);
     }
+    lines.push(`storage:   ${report.storage.note}`);
     if (report.warning)
         lines.push(`warning:   ${report.warning}`);
     for (const h of report.hints)

package/dist/github.d.ts

@@ -76,8 +76,8 @@ export declare function attachmentsMarker(workspace?: string): string;
 export declare const MAX_INLINE_ATTACHMENT_IMAGES = 16;
 /**
  * Per-render knobs for the managed comment (issue #307), sourced from repo
- * comment config. `imageWidth: "auto"` preserves today's per-item width
- * heuristics (`attachmentImageWidth`/`posterImageWidth`/pair cap); `"full"`
+ * comment config. `imageWidth: "auto"` uses per-item filename heuristics plus
+ * density-aware sizing (solo/sparse/dense from the inlined count); `"full"`
  * omits the `width` attribute entirely; a number overrides every width site.
  */
 export interface CommentRenderOptions {
@@ -134,21 +134,29 @@ export interface GalleryCommentItem {
         itemUrl?: string;
     }[];
 }
-/** Default max width for images in the managed attachments comment (HTML img). */
+/**
+ * How crowded the managed comment is. Sparse comments (one shot, a single
+ * before/after) get larger embeds; dense comments keep compact historical sizes.
+ */
+export type AttachmentDensity = "solo" | "sparse" | "dense";
+/** Dense (historical) default max width for images in the managed comment. */
 export declare const ATTACHMENT_IMAGE_WIDTH_DEFAULT = 400;
 /** Portrait / device mockups — keep phones readable, not full-column. */
 export declare const ATTACHMENT_IMAGE_WIDTH_PORTRAIT = 280;
 /** Wide UI / browser chrome. */
 export declare const ATTACHMENT_IMAGE_WIDTH_WIDE = 640;
+/** Dense pair-cell cap (side-by-side before/after). */
+export declare const ATTACHMENT_IMAGE_WIDTH_PAIR = 320;
+/** Map an inlined-media count onto a density tier. */
+export declare function attachmentDensityForCount(inlinedCount: number): AttachmentDensity;
+/** Pair-cell cap for the given density. */
+export declare function attachmentPairWidth(density?: AttachmentDensity): number;
 /**
- * Pick a display width for GitHub comment embeds. Filenames are a weak but
- * practical signal (we don't re-fetch dimensions when rebuilding the comment).
+ * Display width for a GitHub comment embed. Filenames are a weak but practical
+ * signal (we don't re-fetch dimensions when rebuilding the comment). `density`
+ * only affects managed-comment auto layout; other callers leave it `"dense"`.
  */
-export declare function attachmentImageWidth(filename: string): number;
-/** Max display width for one image inside a before/after pair row — smaller
- * than a standalone image so two side by side stay under GitHub's comment
- * column width (and don't overflow on mobile). */
-export declare const ATTACHMENT_IMAGE_WIDTH_PAIR = 320;
+export declare function attachmentImageWidth(filename: string, density?: AttachmentDensity): number;
 /**
  * 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/github.js

@@ -171,26 +171,52 @@ export const AUTO_RENDER_OPTIONS = {
     metaState: true,
     note: null,
 };
-/** Default max width for images in the managed attachments comment (HTML img). */
+/** Dense (historical) default max width for images in the managed comment. */
 export const ATTACHMENT_IMAGE_WIDTH_DEFAULT = 400;
 /** Portrait / device mockups — keep phones readable, not full-column. */
 export const ATTACHMENT_IMAGE_WIDTH_PORTRAIT = 280;
 /** Wide UI / browser chrome. */
 export const ATTACHMENT_IMAGE_WIDTH_WIDE = 640;
+/** Dense pair-cell cap (side-by-side before/after). */
+export const ATTACHMENT_IMAGE_WIDTH_PAIR = 320;
+/** Per-density widths for `imageWidth: "auto"`. Dense reuses the exports above. */
+const WIDTH_BY_DENSITY = {
+    solo: { default: 720, portrait: 360, wide: 800, pair: 400 },
+    sparse: { default: 560, portrait: 300, wide: 720, pair: 380 },
+    dense: {
+        default: ATTACHMENT_IMAGE_WIDTH_DEFAULT,
+        portrait: ATTACHMENT_IMAGE_WIDTH_PORTRAIT,
+        wide: ATTACHMENT_IMAGE_WIDTH_WIDE,
+        pair: ATTACHMENT_IMAGE_WIDTH_PAIR,
+    },
+};
+/** Map an inlined-media count onto a density tier. */
+export function attachmentDensityForCount(inlinedCount) {
+    if (inlinedCount <= 1)
+        return "solo";
+    if (inlinedCount <= 3)
+        return "sparse";
+    return "dense";
+}
+/** Pair-cell cap for the given density. */
+export function attachmentPairWidth(density = "dense") {
+    return WIDTH_BY_DENSITY[density].pair;
+}
 /**
- * Pick a display width for GitHub comment embeds. Filenames are a weak but
- * practical signal (we don't re-fetch dimensions when rebuilding the comment).
+ * Display width for a GitHub comment embed. Filenames are a weak but practical
+ * signal (we don't re-fetch dimensions when rebuilding the comment). `density`
+ * only affects managed-comment auto layout; other callers leave it `"dense"`.
  */
-export function attachmentImageWidth(filename) {
+export function attachmentImageWidth(filename, density = "dense") {
+    const table = WIDTH_BY_DENSITY[density];
     const n = filename.toLowerCase();
-    if (/(?:^|[-_.])(browser|desktop|dashboard|wide)(?:[-_.]|$)/.test(n)) {
-        return ATTACHMENT_IMAGE_WIDTH_WIDE;
-    }
+    if (/(?:^|[-_.])(browser|desktop|dashboard|wide)(?:[-_.]|$)/.test(n))
+        return table.wide;
     if (/(?:^|[-_.])(phone|iphone|ipad|pixel|android|mobile|device)(?:[-_.]|$)/.test(n) ||
         /iphone|pixel-?\d/.test(n)) {
-        return ATTACHMENT_IMAGE_WIDTH_PORTRAIT;
+        return table.portrait;
     }
-    return ATTACHMENT_IMAGE_WIDTH_DEFAULT;
+    return table.default;
 }
 /** `m:ss` under an hour, `h:mm:ss` at or above one. */
 function formatDuration(seconds) {
@@ -205,19 +231,16 @@ function formatDuration(seconds) {
 }
 /**
  * Display width for a video poster. Real dimensions only *select* among the
- * width constants — 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.
+ * 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.
  */
-function posterImageWidth(videoMeta, filename) {
+function posterImageWidth(videoMeta, filename, density = "dense") {
     const w = videoMeta?.width ?? 0;
     const h = videoMeta?.height ?? 0;
     if (w <= 0 || h <= 0)
-        return attachmentImageWidth(filename);
-    const chosen = h > w
-        ? ATTACHMENT_IMAGE_WIDTH_PORTRAIT
-        : w / h >= 16 / 9
-            ? ATTACHMENT_IMAGE_WIDTH_WIDE
-            : ATTACHMENT_IMAGE_WIDTH_DEFAULT;
+        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);
 }
 function escapeHtmlAttr(s) {
@@ -236,45 +259,37 @@ function escapeMarkdownText(s) {
     return s.replace(/([\\`*_[\]~])/g, "\\$1");
 }
 /**
- * An attachment's caption parts — `path`, then `state` (issue #365). Empty
- * when neither is usable, so callers emit nothing at all and a body with no
- * metadata stays byte-identical to the pre-#365 render.
- *
- * Neither value is pre-sanitized: metadata values are printable ASCII up to
- * 512 chars, and while the CLI validates `--state` against a closed enum,
- * `PATCH /v1/:workspace/files/:key` can set any valid metadata value. A
- * whitespace-only value passes that validation (length-1 printable ASCII), so
- * treat it as absent rather than rendering a dangling separator.
- *
- * Bare `/` is stored/searchable but omitted from captions (issue #375) —
- * alone it is a stray character, and as a prefix next to `state` it is
- * noise. Only exact `/` after trim is suppressed.
+ * Collect path then state for a caption (issue #365). Bare `/` and
+ * whitespace-only values are omitted (issue #375). Empty when nothing usable.
  */
-function metaCaptionParts(meta, options) {
-    const parts = [];
+function metaCaptionValues(meta, options) {
+    const values = [];
     const path = meta?.path?.trim();
     if (options.metaPath && path && path !== "/")
-        parts.push(path);
+        values.push(path);
     const state = meta?.state?.trim();
     if (options.metaState && state)
-        parts.push(state);
-    return parts;
-}
-/** `<sub>` caption body for an inline image, or null when there is nothing to say. */
-function metaCaptionHtml(meta, options) {
-    const parts = metaCaptionParts(meta, options);
-    return parts.length > 0 ? parts.map(escapeHtmlText).join(" · ") : null;
+        values.push(state);
+    return values;
 }
 /**
- * ` · …` suffix for a markdown list row, or `""` when there is nothing to add.
- * HTML-escapes first, then markdown-escapes: HTML escaping introduces no
- * backslashes or brackets, so the markdown pass cannot corrupt its entities.
+ * Format path/state as code tokens. HTML → `<code>…</code>`; markdown →
+ * `` `…` `` (backslash-escape if the value itself contains a backtick).
+ * Returns `""` when there is nothing to say.
  */
-function metaCaptionMarkdown(meta, options) {
-    const parts = metaCaptionParts(meta, options);
-    if (parts.length === 0)
+function formatMetaCaption(meta, options, mode) {
+    const values = metaCaptionValues(meta, options);
+    if (values.length === 0)
         return "";
-    return ` · ${parts.map((p) => escapeMarkdownText(escapeHtmlText(p))).join(" · ")}`;
+    if (mode === "html") {
+        return values.map((v) => `<code>${escapeHtmlText(v)}</code>`).join(" · ");
+    }
+    return values
+        .map((v) => {
+        const esc = escapeHtmlText(v);
+        return esc.includes("`") ? escapeMarkdownText(esc) : `\`${esc}\``;
+    })
+        .join(" · ");
 }
 /** Resolved pixel width for an image site, or `null` meaning "omit the width
  * attribute". `"auto"` defers to the caller's per-item heuristic (`autoPx`);
@@ -388,28 +403,37 @@ function pairAttachments(items, isImageAt) {
     }
     return { partnerOf, roleOf };
 }
-/** Max display width for one image inside a before/after pair row — smaller
- * than a standalone image so two side by side stay under GitHub's comment
- * column width (and don't overflow on mobile). */
-export const ATTACHMENT_IMAGE_WIDTH_PAIR = 320;
-function renderPairCell(item, label, options) {
+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), ATTACHMENT_IMAGE_WIDTH_PAIR);
+    const autoPx = Math.min(attachmentImageWidth(name, density), attachmentPairWidth(density));
     const w = resolvedWidth(autoPx, options);
     const alt = escapeHtmlAttr(name);
     const href = escapeHtmlAttr((link ?? src));
     const imgSrc = escapeHtmlAttr(src);
-    const caption = metaCaptionHtml(item.meta, options);
+    const caption = formatMetaCaption(item.meta, options, "html");
     const captionHtml = caption ? `<br><sub>${caption}</sub>` : "";
     return `<td align="center"><sub><strong>${label}</strong></sub><br><a href="${href}">${imgTag(w, alt, imgSrc)}</a>${captionHtml}</td>`;
 }
-/** One side-by-side before/after row (issue #419): a single HTML table so
- * GitHub renders both images on one line, with `Before`/`After` labels and
- * each side's usual path/state caption preserved underneath. */
-function renderPairRow(beforeItem, afterItem, options) {
-    return `<table><tr>${renderPairCell(beforeItem, "Before", options)}${renderPairCell(afterItem, "After", options)}</tr></table>`;
+/** One side-by-side before/after row (issue #419). */
+function renderPairRow(beforeItem, afterItem, options, density) {
+    return `<table><tr>${renderPairCell(beforeItem, "Before", options, density)}${renderPairCell(afterItem, "After", options, density)}</tr></table>`;
+}
+/** How many image/poster items will fit under `maxInlineImages` (for density). */
+function countInlinableMedia(sorted, maxInlineImages) {
+    let count = 0;
+    for (const item of sorted) {
+        if (count >= maxInlineImages)
+            break;
+        const name = item.key.slice(item.key.lastIndexOf("/") + 1);
+        const src = item.embedUrl ?? item.url;
+        const isImage = Boolean(src) && inferContentType(name).startsWith("image/");
+        const isPoster = Boolean(item.posterUrl) && inferContentType(name).startsWith("video/");
+        if (isImage || isPoster)
+            count++;
+    }
+    return count;
 }
 /**
  * Render the one marker-owned GitHub comment. When there are no galleries this
@@ -436,14 +460,16 @@ export function attachmentsCommentBody(items, galleries = [], marker = ATTACHMEN
         }
         lines.push("");
     }
-    if (sorted.length > 0 || sortedGalleries.length === 0)
-        lines.push("### 📎 Attachments", "");
     const isImageAt = sorted.map((item) => {
         const name = item.key.slice(item.key.lastIndexOf("/") + 1);
         const src = item.embedUrl ?? item.url;
         return Boolean(src) && inferContentType(name).startsWith("image/");
     });
     const { partnerOf, roleOf } = pairAttachments(sorted, isImageAt);
+    // One screenshot → large; a wall of shots → compact historical sizes.
+    const density = options.imageWidth === "auto"
+        ? attachmentDensityForCount(countInlinableMedia(sorted, options.maxInlineImages))
+        : "dense";
     const consumedByPair = new Set();
     let inlinedImages = 0;
     const overflowImages = [];
@@ -459,7 +485,7 @@ export function attachmentsCommentBody(items, galleries = [], marker = ATTACHMEN
                 consumedByPair.add(partnerIdx);
                 const beforeItem = roleOf.get(idx) === "before" ? item : partner;
                 const afterItem = roleOf.get(idx) === "before" ? partner : item;
-                lines.push(renderPairRow(beforeItem, afterItem, options), "");
+                lines.push(renderPairRow(beforeItem, afterItem, options, density), "");
                 continue;
             }
             // Cap already full for a two-image row — degrade this pair to two
@@ -483,7 +509,7 @@ export function attachmentsCommentBody(items, galleries = [], marker = ATTACHMEN
         }
         if (isPosterVideo) {
             inlinedImages++;
-            const autoPx = posterImageWidth(item.videoMeta, name);
+            const autoPx = posterImageWidth(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>`);
@@ -493,29 +519,33 @@ export function attachmentsCommentBody(items, galleries = [], marker = ATTACHMEN
             if (item.videoMeta?.durationSeconds != null) {
                 parts.push(formatDuration(item.videoMeta.durationSeconds));
             }
-            parts.push(...metaCaptionParts(item.meta, options).map(escapeHtmlText));
+            const metaCap = formatMetaCaption(item.meta, options, "html");
+            if (metaCap)
+                parts.push(metaCap);
             lines.push(`<sub>${parts.join(" · ")}</sub>`, "");
         }
         else if (isImage) {
             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);
+            const autoPx = attachmentImageWidth(name, density);
             const w = resolvedWidth(autoPx, options);
             const alt = escapeHtmlAttr(name);
             const href = escapeHtmlAttr(link ?? src);
             const imgSrc = escapeHtmlAttr(src);
             lines.push(`<a href="${href}">${imgTag(w, alt, imgSrc)}</a>`);
-            const caption = metaCaptionHtml(item.meta, options);
+            const caption = formatMetaCaption(item.meta, options, "html");
             if (caption)
                 lines.push(`<sub>${caption}</sub>`);
             lines.push("");
         }
         else if (link) {
-            lines.push(`- [${name}](${link})${metaCaptionMarkdown(item.meta, options)}`);
+            const cap = formatMetaCaption(item.meta, options, "markdown");
+            lines.push(`- [${name}](${link})${cap ? ` · ${cap}` : ""}`);
         }
         else {
-            lines.push(`- ${name}${metaCaptionMarkdown(item.meta, options)}`);
+            const cap = formatMetaCaption(item.meta, options, "markdown");
+            lines.push(`- ${name}${cap ? ` · ${cap}` : ""}`);
         }
     }
     if (overflowImages.length > 0) {
@@ -524,16 +554,16 @@ export function attachmentsCommentBody(items, galleries = [], marker = ATTACHMEN
         for (const item of overflowImages) {
             const name = item.key.slice(item.key.lastIndexOf("/") + 1);
             const link = item.pageUrl ?? item.url;
-            const suffix = metaCaptionMarkdown(item.meta, options);
+            const cap = formatMetaCaption(item.meta, options, "markdown");
+            const suffix = cap ? ` · ${cap}` : "";
             lines.push(link ? `- [${name}](${link})${suffix}` : `- ${name}${suffix}`);
         }
         lines.push("", "</details>", "");
     }
     // Emptied state: a PR/issue whose attachments and galleries were all removed
     // still keeps its managed comment (a later push can repopulate it) — show a
-    // neutral resting state under the heading rather than a bare heading. Only
-    // the truly-empty case (no attachments, no galleries); a galleries-only
-    // comment has no Attachments heading and must not get this line.
+    // neutral resting state rather than a bare footer. Only the truly-empty case
+    // (no attachments, no galleries); a galleries-only comment must not get this.
     if (sorted.length === 0 && sortedGalleries.length === 0) {
         lines.push("_No attachments are currently associated with this pull request._", "");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buildinternet/uploads",
-  "version": "0.37.0",
+  "version": "0.37.2",
   "description": "CLI and client for uploads.sh — workspace-scoped image hosting for GitHub embeds",
   "type": "module",
   "sideEffects": false,