@buildinternet/uploads 0.42.2 → 0.43.0

package/dist/cli-help.js

@@ -131,7 +131,7 @@ ${section(style, "Config")} ${style.muted("(first match wins, per key):")}
 ${section(style, "Workspace")} ${style.muted("(within config layers):")}
   --workspace, -w     override — global (before command) or per-command (after)
   UPLOADS_WORKSPACE   env / config file
-  (else inferred from token up_<name>_…, else "default")
+  (else inferred from token up_<name>_…, or the API key's only workspace)
 
 ${section(style, "Other globals")} ${style.muted("(before command):")}
   --api-url <url>     default: https://api.uploads.sh

package/dist/client.d.ts

@@ -565,7 +565,7 @@ export declare function mintWorkspaceToken(apiUrl: string, accessToken: string,
     workspace: string;
     scopes?: Array<TokenScope>;
     label?: string;
-    ttlSeconds?: number;
+    ttlSeconds?: number | null;
 }): Promise<MintTokenResult>;
 /**
  * Parse API error bodies. Prefers the nested envelope

package/dist/client.js

@@ -179,7 +179,7 @@ export function mintWorkspaceToken(apiUrl, accessToken, input) {
         body: JSON.stringify({
             grants: [{ workspace: input.workspace, ...(input.scopes ? { scopes: input.scopes } : {}) }],
             ...(input.label ? { label: input.label } : {}),
-            ...(input.ttlSeconds ? { ttlSeconds: input.ttlSeconds } : {}),
+            ...(input.ttlSeconds !== undefined ? { ttlSeconds: input.ttlSeconds } : {}),
         }),
     });
 }

package/dist/commands/config.js

@@ -18,7 +18,7 @@ Subcommands:
 Keys:
   UPLOADS_API_URL           API base URL (default: ${DEFAULT_API_URL})
   UPLOADS_WORKSPACE         Workspace / bucket tenant (default: ${DEFAULT_WORKSPACE})
-  UPLOADS_TOKEN             Bearer token for the workspace
+  UPLOADS_TOKEN             Bearer token (up_<workspace>_…)
   UPLOADS_SESSION_TOKEN     Device-flow session (CLI version on account sessions)
   UPLOADS_DEFAULT_PREFIX    Default key prefix for put/list
   UPLOADS_DEFAULT_REPO      Default repo segment for put

package/dist/commands/screenshot.js

@@ -8,6 +8,7 @@ import { loadDefaultsRaw, resolveScreenshotDefaults } from "../config-file.js";
 import { resolvePutPrefix } from "../destinations.js";
 import { execRunner, ghMetadataFromTargetWithTitle, resolveRepo, } from "../github-gh.js";
 import { deriveRepoSlugFromGit } from "../keys.js";
+import { noProjectContextNudge } from "../project-context-nudge.js";
 import { safeCaptureFacts } from "../capture-facts.js";
 import { parseMetaFlags, validateMetaMap } from "../metadata.js";
 import { mergeDerivedMeta } from "../metadata-vocab.js";
@@ -388,6 +389,9 @@ loadAnnotateModule = () => import("../annotate/index.js")) {
     else if (Object.keys(withFacts).length > 0) {
         validateMetaMap(withFacts);
     }
+    // #692 follow-up: same advisory as put — a capture with no repo/app context
+    // and only a local origin lands in the screenshots page's fallback buckets.
+    const contextNudge = !ctx.quiet && !putDefaults.noNudge && !noGit ? noProjectContextNudge(metadata) : undefined;
     const logHuman = !ctx.quiet && format === "human";
     if (logHuman)
         process.stderr.write(`>> capturing ${target}\n`);
@@ -562,6 +566,8 @@ loadAnnotateModule = () => import("../annotate/index.js")) {
         }
         if (bindingWarning)
             process.stderr.write(`${bindingWarning}\n`);
+        if (contextNudge)
+            process.stderr.write(`${contextNudge}\n`);
         process.stderr.write("\n");
     }
     // One JSON `hint` slot (mirrors bare put): the clip note (issue #652) wins
@@ -576,7 +582,7 @@ loadAnnotateModule = () => import("../annotate/index.js")) {
     const replacedHint = result.replaced && explicitMeta.state
         ? `re-capture replaced the previous state=${explicitMeta.state} object at ${result.key} — expected for repeat captures of the same URL + state`
         : undefined;
-    const jsonHint = clipHint ?? bindingWarning ?? stagingNote ?? replacedHint;
+    const jsonHint = clipHint ?? bindingWarning ?? stagingNote ?? replacedHint ?? contextNudge;
     switch (format) {
         case "json":
             await writeJson({

package/dist/commands.js

@@ -16,6 +16,7 @@ import { mergeSidecarMeta } from "./sidecar.js";
 import { ghAttachmentKeyForMode, ghBranchAttachmentKeyForMode, ghBranchKeyPrefix, ghKeyPrefix, ghPrivateKeyPrefix, ghPrivateBranchKeyPrefix, ghMetadataFromTarget, parseGhKey, parseGhPrivateKey, ghMetadataForBranch, attachmentsCommentBody, attachmentsMarker, AUTO_RENDER_OPTIONS, GH_FALLBACK_AUTHOR_NOTE, normalizeGithubCoordinate, } from "./github.js";
 import { resolveRepo, resolveCurrentPullRequest, resolveCurrentBranch, resolveDefaultBranch, classifyGhNumber, execRunner, timedExecRunner, ghMetadataFromTargetWithTitle, upsertAttachmentsComment, } from "./github-gh.js";
 import { deriveRepoFromGit, deriveRepoSlugFromGit } from "./keys.js";
+import { noProjectContextNudge } from "./project-context-nudge.js";
 import { resolvePutPrefix } from "./destinations.js";
 import { optimizeImageForUpload, rewriteKeyExtension, } from "./optimize.js";
 import { applyFrame, resolveFrameId } from "./frame.js";
@@ -1812,6 +1813,11 @@ export async function runPut(ctx, args, help = false, run = execRunner) {
         if (slug)
             metadata = mergeDerivedMeta(metadata, { repo: slug });
     }
+    // #692 follow-up: a path-tagged upload with no repo/gh.repo/app context and
+    // no real (non-local) origin lands in the screenshots page's fallback
+    // buckets — one advisory line at the moment the context went missing.
+    // --no-git is an explicit choice, so it suppresses the nudge too.
+    const contextNudge = !ctx.quiet && !defaults.noNudge && !noGit ? noProjectContextNudge(metadata) : undefined;
     // Bare-put nudge (issue #393): only relevant when staging didn't take over
     // — once `stagingTarget` resolves, staging IS the upgrade the nudge used to
     // point at, so this is skipped entirely rather than firing redundantly.
@@ -1894,7 +1900,7 @@ export async function runPut(ctx, args, help = false, run = execRunner) {
     // warning); stderr prints the nudge/staging-note and binding-warning lines
     // independently, below. pathHint only ever fires on the ghTarget path, so
     // it never competes with the other three.
-    const jsonHint = nudge ?? bindingWarning ?? stagingNote ?? pathHint;
+    const jsonHint = nudge ?? bindingWarning ?? stagingNote ?? pathHint ?? contextNudge;
     const galleriesByKey = new Map();
     let galleryHadError = false;
     if (galleryId && uploads.length > 0) {
@@ -1979,6 +1985,8 @@ export async function runPut(ctx, args, help = false, run = execRunner) {
                 process.stderr.write(`${bindingWarning}\n`);
             if (pathHint)
                 process.stderr.write(`${pathHint}\n`);
+            if (contextNudge)
+                process.stderr.write(`${contextNudge}\n`);
         }
         return failures.length === 0 && !galleryHadError ? 0 : 1;
     }
@@ -2040,6 +2048,8 @@ export async function runPut(ctx, args, help = false, run = execRunner) {
         process.stderr.write(`${bindingWarning}\n`);
     if (pathHint && format !== "json")
         process.stderr.write(`${pathHint}\n`);
+    if (contextNudge && format !== "json")
+        process.stderr.write(`${contextNudge}\n`);
     return gallery?.error ? 1 : 0;
 }
 // --- galleries ---
@@ -2726,7 +2736,9 @@ Scans the PR/issue description and comments for github.com/user-attachments
 media, mirrors new ones into the workspace (indexed, not added to the managed
 comment), and detaches ones no longer referenced. Works on any repo linked to
 the workspace; the .uploads.yml ingestGithubAttachments knob only gates the
-automatic webhook path.
+automatic webhook path. Bot-authored attachments and images under 200px on
+either side are always skipped (the .uploads.yml ingestBotAttachments knob
+re-admits bot media on the webhook path only).
 
 Examples:
   uploads ingest --pr 123

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

@@ -12,6 +12,7 @@ export interface RepoCommentConfig {
     linkToFilePage?: boolean;
     note?: string;
     ingestGithubAttachments?: boolean;
+    ingestBotAttachments?: boolean;
 }
 export interface WorkspaceCommentDefaults {
     imageWidth?: "full" | number;
@@ -20,6 +21,7 @@ export interface WorkspaceCommentDefaults {
     linkToFilePage?: boolean;
     note?: string;
     ingestGithubAttachments?: boolean;
+    ingestBotAttachments?: boolean;
 }
 export interface ResolvedCommentOptions {
     imageWidth: "auto" | "full" | number;
@@ -29,6 +31,7 @@ export interface ResolvedCommentOptions {
     linkToFilePage: boolean;
     note: string | null;
     ingestGithubAttachments: boolean;
+    ingestBotAttachments: boolean;
 }
 export type OptionSource = "repo" | "workspace" | "auto";
 export declare const AUTO_COMMENT_OPTIONS: ResolvedCommentOptions;

package/dist/comment-config.generated.js

@@ -12,7 +12,8 @@ export const AUTO_COMMENT_OPTIONS = {
     metaState: true,
     linkToFilePage: true,
     note: null,
-    ingestGithubAttachments: false,
+    ingestGithubAttachments: true,
+    ingestBotAttachments: false,
 };
 export const NOTE_MAX_CHARS = 500;
 const WIDTH_MIN = 160;
@@ -72,6 +73,14 @@ export function parseRepoCommentConfig(text, format) {
         else
             warnings.push(`ingestGithubAttachments: expected a boolean; dropped`);
     }
+    // ingestBotAttachments: boolean
+    if ("ingestBotAttachments" in c) {
+        const v = c.ingestBotAttachments;
+        if (typeof v === "boolean")
+            config.ingestBotAttachments = v;
+        else
+            warnings.push(`ingestBotAttachments: expected a boolean; dropped`);
+    }
     // meta.path / meta.state: booleans nested under `meta`
     if ("meta" in c) {
         const v = c.meta;
@@ -127,6 +136,9 @@ export function resolveCommentOptions(repo, ws) {
         ...(ws?.ingestGithubAttachments !== undefined
             ? { ingestGithubAttachments: ws.ingestGithubAttachments }
             : {}),
+        ...(ws?.ingestBotAttachments !== undefined
+            ? { ingestBotAttachments: ws.ingestBotAttachments }
+            : {}),
     };
     const options = { ...AUTO_COMMENT_OPTIONS };
     const source = Object.fromEntries(Object.keys(AUTO_COMMENT_OPTIONS).map((k) => [k, "auto"]));
@@ -138,6 +150,7 @@ export function resolveCommentOptions(repo, ws) {
             "metaState",
             "linkToFilePage",
             "ingestGithubAttachments",
+            "ingestBotAttachments",
         ]) {
             if (cfg[key] !== undefined && source[key] === "auto") {
                 options[key] = cfg[key];

package/dist/mcp/tools.js

@@ -108,7 +108,7 @@ export function createUploadsMcpTools(opts) {
     const { globals } = opts;
     const run = opts.runner ?? execRunner;
     const clientFactory = opts.clientFactory ?? createUploadsClient;
-    function clientFor(args, requireToken = true) {
+    async function clientFor(args, requireToken = true) {
         const config = resolveConfig({
             apiUrl: globals.apiUrl,
             token: globals.token,
@@ -151,7 +151,7 @@ export function createUploadsMcpTools(opts) {
                 const title = optString(args, "title");
                 if (!title)
                     usage("title is required");
-                const { client } = clientFor(args);
+                const { client } = await clientFor(args);
                 return client.createGallery({ title, description: optString(args, "description") });
             },
         },
@@ -171,7 +171,7 @@ export function createUploadsMcpTools(opts) {
                 additionalProperties: false,
             },
             async handler(args) {
-                const { client } = clientFor(args);
+                const { client } = await clientFor(args);
                 return client.getGallery(galleryId(args));
             },
         },
@@ -197,7 +197,7 @@ export function createUploadsMcpTools(opts) {
                 const objectKey = optString(args, "objectKey");
                 if (!objectKey)
                     usage("objectKey is required");
-                const { client } = clientFor(args);
+                const { client } = await clientFor(args);
                 const id = galleryId(args);
                 const current = await client.getGallery(id);
                 return client.addGalleryItem(id, objectKey, {
@@ -228,7 +228,7 @@ export function createUploadsMcpTools(opts) {
                 additionalProperties: false,
             },
             async handler(args) {
-                const { client } = clientFor(args);
+                const { client } = await clientFor(args);
                 const id = galleryId(args);
                 const current = await client.getGallery(id);
                 return client.linkGalleryExternalReference(id, {
@@ -259,7 +259,7 @@ export function createUploadsMcpTools(opts) {
                 additionalProperties: false,
             },
             async handler(args) {
-                const { client } = clientFor(args);
+                const { client } = await clientFor(args);
                 return client.findGalleriesByReference({
                     ...galleryReference(args),
                     limit: optPosInt(args, "limit"),
@@ -426,7 +426,7 @@ export function createUploadsMcpTools(opts) {
                 catch (err) {
                     usage(err instanceof Error ? err.message : String(err));
                 }
-                const { config, client } = clientFor(args);
+                const { config, client } = await clientFor(args);
                 const defaults = resolvePutDefaults({ envFile: globals.envFile });
                 const frameOpts = mcpFrameOptions(args);
                 const optimizeOpts = mcpOptimizeOptions(args, defaults);
@@ -736,7 +736,7 @@ export function createUploadsMcpTools(opts) {
                 const metadata = metadataArgWithCanonical(args);
                 if (metadata)
                     validateMetaMap(metadata);
-                const { config, client } = clientFor(args);
+                const { config, client } = await clientFor(args);
                 const defaults = resolvePutDefaults({ envFile: globals.envFile });
                 const frameOpts = mcpFrameOptions(args);
                 const optimizeOpts = mcpOptimizeOptions(args, defaults);
@@ -969,7 +969,7 @@ export function createUploadsMcpTools(opts) {
                 const explicitTarget = ghTargetFromArgs(args, run);
                 const target = explicitTarget ??
                     resolveCurrentPullRequest(resolveRepo(optString(args, "repo"), run), run);
-                const { config, client } = clientFor(args);
+                const { config, client } = await clientFor(args);
                 const contentType = optString(args, "contentType");
                 const defaults = resolvePutDefaults({ envFile: globals.envFile });
                 const frameOpts = mcpFrameOptions(args);
@@ -1037,7 +1037,7 @@ export function createUploadsMcpTools(opts) {
                 const prefixArg = optString(args, "prefix");
                 let prefix = prefixArg ?? (defaults.prefix ? `${defaults.prefix}/` : undefined);
                 const target = ghTargetFromArgs(args, run);
-                const { client } = clientFor(args);
+                const { client } = await clientFor(args);
                 // Also list every active private prefix, if any (issue #631) —
                 // mirrors syncAttachmentsComment's gh-fallback gather: a repo's
                 // attachment history can be split across the plain shape and
@@ -1093,7 +1093,7 @@ export function createUploadsMcpTools(opts) {
                 additionalProperties: false,
             },
             async handler(args) {
-                const { client } = clientFor(args);
+                const { client } = await clientFor(args);
                 const repo = resolveRepo(optString(args, "repo"), run);
                 const branch = optString(args, "branch") ?? resolveCurrentBranch(run);
                 return resolveStaged({ client, repo, branch });
@@ -1124,7 +1124,7 @@ export function createUploadsMcpTools(opts) {
                     usage("key is required");
                 if (optBool(args, "dryRun"))
                     return { key, deleted: false, dryRun: true };
-                const { client } = clientFor(args);
+                const { client } = await clientFor(args);
                 return client.delete(key);
             },
         },
@@ -1147,7 +1147,7 @@ export function createUploadsMcpTools(opts) {
                 const key = optString(args, "key");
                 if (!key)
                     usage("key is required");
-                return clientFor(args).client.getMetadata(key);
+                return (await clientFor(args)).client.getMetadata(key);
             },
         },
         {
@@ -1184,7 +1184,7 @@ export function createUploadsMcpTools(opts) {
                 }
                 if (set)
                     validateMetaMap(set);
-                const { client } = clientFor(args);
+                const { client } = await clientFor(args);
                 return client.patchMetadata(key, { set, delete: del });
             },
         },
@@ -1223,7 +1223,7 @@ export function createUploadsMcpTools(opts) {
                 }
                 if (hasMeta)
                     validateMetaMap(filters);
-                const { client } = clientFor(args);
+                const { client } = await clientFor(args);
                 return client.findFiles(filters, {
                     name,
                     prefix: optString(args, "prefix"),
@@ -1249,7 +1249,7 @@ export function createUploadsMcpTools(opts) {
                 additionalProperties: false,
             },
             async handler(args) {
-                const { client } = clientFor(args);
+                const { client } = await clientFor(args);
                 const key = optString(args, "key");
                 return key ? client.listMetadataValues(key) : client.listMetadataKeys();
             },
@@ -1266,7 +1266,7 @@ export function createUploadsMcpTools(opts) {
                 additionalProperties: false,
             },
             async handler(args) {
-                const { client } = clientFor(args);
+                const { client } = await clientFor(args);
                 return client.usage();
             },
         },
@@ -1282,7 +1282,7 @@ export function createUploadsMcpTools(opts) {
                 additionalProperties: false,
             },
             async handler(args) {
-                const { client } = clientFor(args);
+                const { client } = await clientFor(args);
                 return client.reconcile();
             },
         },
@@ -1298,7 +1298,7 @@ export function createUploadsMcpTools(opts) {
                 additionalProperties: false,
             },
             async handler(args) {
-                const { client } = clientFor(args);
+                const { client } = await clientFor(args);
                 return client.purgeExpired();
             },
         },
@@ -1320,7 +1320,7 @@ export function createUploadsMcpTools(opts) {
                 const target = ghTargetFromArgs(args, run);
                 if (!target)
                     usage("comment requires pr or issue");
-                const { config, client } = clientFor(args);
+                const { config, client } = await clientFor(args);
                 // Explicit resync, same as `uploads comment` (issue #480).
                 const result = await syncAttachmentsComment(client, target, run, config.workspace, {
                     resync: true,
@@ -1336,7 +1336,7 @@ export function createUploadsMcpTools(opts) {
             description: "Check uploads.sh API liveness. No auth or arguments required.",
             inputSchema: { type: "object", properties: {}, additionalProperties: false },
             async handler(args) {
-                const { config, client } = clientFor(args, false);
+                const { config, client } = await clientFor(args, false);
                 const result = await client.health();
                 return { ...result, apiUrl: config.apiUrl };
             },
@@ -1353,7 +1353,7 @@ export function createUploadsMcpTools(opts) {
                 additionalProperties: false,
             },
             async handler(args) {
-                const { config, client } = clientFor(args);
+                const { config, client } = await clientFor(args);
                 return buildDoctorReport(config, client);
             },
         },

package/dist/project-context-nudge.d.ts

@@ -0,0 +1,9 @@
+/**
+ * No-project-context nudge (issue #692 follow-up): a path-tagged upload with
+ * no repo/gh.repo/app metadata and no real (non-local) origin lands in the
+ * screenshots page's "local dev" / "Other" fallback buckets. One advisory
+ * stderr line teaches the fix at the moment the context went missing. The
+ * predicate mirrors apps/api's projectLabelFromMeta fallback rules exactly —
+ * a real URL host is a meaningful group, so it never fires there.
+ */
+export declare function noProjectContextNudge(meta: Record<string, string> | undefined): string | undefined;

package/dist/project-context-nudge.js

@@ -0,0 +1,39 @@
+/**
+ * No-project-context nudge (issue #692 follow-up): a path-tagged upload with
+ * no repo/gh.repo/app metadata and no real (non-local) origin lands in the
+ * screenshots page's "local dev" / "Other" fallback buckets. One advisory
+ * stderr line teaches the fix at the moment the context went missing. The
+ * predicate mirrors apps/api's projectLabelFromMeta fallback rules exactly —
+ * a real URL host is a meaningful group, so it never fires there.
+ */
+/** Hosts that identify a dev machine, not an app — same set as the API's
+ * isLocalHostname (apps/api/src/file-metadata.ts). */
+function isLocalHostname(hostname) {
+    const bare = hostname.toLowerCase();
+    return (bare === "localhost" ||
+        bare.endsWith(".localhost") ||
+        bare === "127.0.0.1" ||
+        bare === "0.0.0.0" ||
+        bare === "[::1]");
+}
+export function noProjectContextNudge(meta) {
+    // Only `path`-tagged uploads appear on the screenshots page at all.
+    if (!meta?.path)
+        return undefined;
+    if (meta.repo || meta["gh.repo"] || meta.app)
+        return undefined;
+    let bucket = "Other";
+    if (meta.url) {
+        try {
+            const parsed = new URL(meta.url);
+            if (!isLocalHostname(parsed.hostname))
+                return undefined; // real host = real group
+            bucket = "local dev";
+        }
+        catch {
+            // unparseable url is just "no url"
+        }
+    }
+    return (`note: no repo detected — the screenshots page will group this under "${bucket}". ` +
+        `Run from inside your project repo, or pass --app <name>.`);
+}

package/package.json

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