@buildinternet/uploads 0.11.0 → 0.12.0

package/dist/config-file.d.ts

@@ -1,5 +1,5 @@
 import type { UploadsClientConfig } from "./config.js";
-export declare const UPLOADS_CONFIG_KEYS: readonly ["UPLOADS_API_URL", "UPLOADS_WORKSPACE", "UPLOADS_TOKEN", "UPLOADS_DEFAULT_PREFIX", "UPLOADS_DEFAULT_REPO", "UPLOADS_DEFAULT_REF", "UPLOADS_DEFAULT_WIDTH", "UPLOADS_NO_GIT", "UPLOADS_NO_OPTIMIZE", "UPLOADS_KEEP_EXIF", "UPLOADS_NO_AUTO_META"];
+export declare const UPLOADS_CONFIG_KEYS: readonly ["UPLOADS_API_URL", "UPLOADS_WORKSPACE", "UPLOADS_TOKEN", "UPLOADS_DEFAULT_PREFIX", "UPLOADS_DEFAULT_REPO", "UPLOADS_DEFAULT_REF", "UPLOADS_DEFAULT_WIDTH", "UPLOADS_NO_GIT", "UPLOADS_NO_OPTIMIZE", "UPLOADS_KEEP_EXIF", "UPLOADS_NO_AUTO_META", "UPLOADS_SCREENSHOT_VIA"];
 export type UploadsConfigKey = (typeof UPLOADS_CONFIG_KEYS)[number];
 export type UploadsConfigValues = Partial<Record<UploadsConfigKey, string>>;
 export interface PutDefaults {
@@ -26,10 +26,36 @@ export declare function resolveConfigPath(flags?: {
 /** Parse UPLOADS_* keys from a dotenv-style file. Missing file → empty object. */
 export declare function loadConfigFile(path: string): UploadsConfigValues;
 export declare function mergePutDefaults(...layers: PutDefaults[]): PutDefaults;
+/** Raw `--env-file` / user-config-file contents, keyed the way both `resolve*Defaults` need. */
+export interface RawDefaultsConfig {
+    fromEnvFile: UploadsConfigValues;
+    fromUser: UploadsConfigValues;
+}
+/**
+ * Read the on-disk config once (`--env-file` when given, else the user
+ * config file) so callers that need both put-style and screenshot-style
+ * defaults from the same invocation (e.g. `runScreenshot`) don't each read
+ * the file separately. Pass the result to `resolvePutDefaults` /
+ * `resolveScreenshotDefaults` as their second argument.
+ */
+export declare function loadDefaultsRaw(flags?: {
+    envFile?: string;
+}): RawDefaultsConfig;
 /** Put defaults from env, optional env-file, and user config (same precedence as client config). */
 export declare function resolvePutDefaults(flags?: {
     envFile?: string;
-}): PutDefaults;
+}, preloaded?: RawDefaultsConfig): PutDefaults;
+export type ScreenshotBackendPref = "auto" | "local" | "remote";
+export interface ScreenshotDefaults {
+    via?: ScreenshotBackendPref;
+}
+/**
+ * `screenshot --via` default: flag (applied by the caller) > env >
+ * --env-file > user config file > "auto" (the caller's own fallback).
+ */
+export declare function resolveScreenshotDefaults(flags?: {
+    envFile?: string;
+}, preloaded?: RawDefaultsConfig): ScreenshotDefaults;
 export declare function redactToken(token: string | undefined): string;
 /** Create or update UPLOADS_* keys in the shared config file. Preserves other keys. */
 export declare function writeConfigKeys(path: string, keys: UploadsConfigValues, opts?: {

package/dist/config-file.js

@@ -13,6 +13,7 @@ export const UPLOADS_CONFIG_KEYS = [
     "UPLOADS_NO_OPTIMIZE",
     "UPLOADS_KEEP_EXIF",
     "UPLOADS_NO_AUTO_META",
+    "UPLOADS_SCREENSHOT_VIA",
 ];
 const PUT_DEFAULT_KEY_MAP = {
     prefix: "UPLOADS_DEFAULT_PREFIX",
@@ -165,14 +166,51 @@ export function mergePutDefaults(...layers) {
     }
     return out;
 }
+/**
+ * Read the on-disk config once (`--env-file` when given, else the user
+ * config file) so callers that need both put-style and screenshot-style
+ * defaults from the same invocation (e.g. `runScreenshot`) don't each read
+ * the file separately. Pass the result to `resolvePutDefaults` /
+ * `resolveScreenshotDefaults` as their second argument.
+ */
+export function loadDefaultsRaw(flags) {
+    const fromEnvFile = flags?.envFile ? loadConfigFile(flags.envFile) : {};
+    const fromUser = flags?.envFile ? {} : loadConfigFile(resolveConfigPath(flags));
+    return { fromEnvFile, fromUser };
+}
 /** Put defaults from env, optional env-file, and user config (same precedence as client config). */
-export function resolvePutDefaults(flags) {
+export function resolvePutDefaults(flags, preloaded) {
     const fromEnv = parsePutDefaultsFromEnv();
-    const fromEnvFile = flags?.envFile ? parsePutDefaultsFromRaw(loadConfigFile(flags.envFile)) : {};
-    const fromUser = flags?.envFile
-        ? {}
-        : parsePutDefaultsFromRaw(loadConfigFile(resolveConfigPath(flags)));
-    return mergePutDefaults(fromUser, fromEnvFile, fromEnv);
+    const { fromEnvFile, fromUser } = preloaded ?? loadDefaultsRaw(flags);
+    return mergePutDefaults(parsePutDefaultsFromRaw(fromUser), parsePutDefaultsFromRaw(fromEnvFile), fromEnv);
+}
+function isScreenshotBackendPref(value) {
+    return value === "auto" || value === "local" || value === "remote";
+}
+function parseScreenshotDefaultsFromRaw(raw) {
+    const out = {};
+    if (isScreenshotBackendPref(raw.UPLOADS_SCREENSHOT_VIA))
+        out.via = raw.UPLOADS_SCREENSHOT_VIA;
+    return out;
+}
+function parseScreenshotDefaultsFromEnv() {
+    const raw = {};
+    if (process.env.UPLOADS_SCREENSHOT_VIA)
+        raw.UPLOADS_SCREENSHOT_VIA = process.env.UPLOADS_SCREENSHOT_VIA;
+    return parseScreenshotDefaultsFromRaw(raw);
+}
+/**
+ * `screenshot --via` default: flag (applied by the caller) > env >
+ * --env-file > user config file > "auto" (the caller's own fallback).
+ */
+export function resolveScreenshotDefaults(flags, preloaded) {
+    const fromEnv = parseScreenshotDefaultsFromEnv();
+    const { fromEnvFile, fromUser } = preloaded ?? loadDefaultsRaw(flags);
+    return {
+        ...parseScreenshotDefaultsFromRaw(fromUser),
+        ...parseScreenshotDefaultsFromRaw(fromEnvFile),
+        ...fromEnv,
+    };
 }
 export function redactToken(token) {
     if (!token)

package/dist/config.d.ts

@@ -1,4 +1,4 @@
-export { defaultConfigPath, resolveConfigPath, loadConfigFile, redactToken, writeConfigKeys, removeConfigKeys, configValuesFromClient, putDefaultsToConfigValues, resolvePutDefaults, mergePutDefaults, UPLOADS_CONFIG_KEYS, type UploadsConfigKey, type UploadsConfigValues, type PutDefaults, } from "./config-file.js";
+export { defaultConfigPath, resolveConfigPath, loadConfigFile, redactToken, writeConfigKeys, removeConfigKeys, configValuesFromClient, putDefaultsToConfigValues, resolvePutDefaults, mergePutDefaults, resolveScreenshotDefaults, UPLOADS_CONFIG_KEYS, type UploadsConfigKey, type UploadsConfigValues, type PutDefaults, type ScreenshotDefaults, type ScreenshotBackendPref, } from "./config-file.js";
 export interface UploadsClientConfig {
     apiUrl: string;
     workspace: string;

package/dist/config.js

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync } from "node:fs";
 import { loadConfigFile, resolveConfigPath } from "./config-file.js";
 import { UploadsError } from "./errors.js";
-export { defaultConfigPath, resolveConfigPath, loadConfigFile, redactToken, writeConfigKeys, removeConfigKeys, configValuesFromClient, putDefaultsToConfigValues, resolvePutDefaults, mergePutDefaults, UPLOADS_CONFIG_KEYS, } from "./config-file.js";
+export { defaultConfigPath, resolveConfigPath, loadConfigFile, redactToken, writeConfigKeys, removeConfigKeys, configValuesFromClient, putDefaultsToConfigValues, resolvePutDefaults, mergePutDefaults, resolveScreenshotDefaults, UPLOADS_CONFIG_KEYS, } from "./config-file.js";
 export const DEFAULT_API_URL = "https://api.uploads.sh";
 export const DEFAULT_WORKSPACE = "default";
 const TOKEN_WORKSPACE_RE = /^up_([a-z0-9][a-z0-9-]{1,62})_/;

package/dist/errors.d.ts

@@ -1,4 +1,4 @@
-export type UploadsErrorCode = "MISSING_TOKEN" | "NO_PUBLIC_URL" | "FILE_NOT_FOUND" | "NOT_FOUND" | "UNAUTHORIZED" | "INVALID_KEY" | "KEY_POLICY" | "STORAGE_QUOTA" | "UPLOAD_BUDGET" | "GITHUB_REQUIRED" | "API_ERROR" | "NETWORK" | "USAGE";
+export type UploadsErrorCode = "MISSING_TOKEN" | "NO_PUBLIC_URL" | "FILE_NOT_FOUND" | "NOT_FOUND" | "UNAUTHORIZED" | "INVALID_KEY" | "KEY_POLICY" | "STORAGE_QUOTA" | "UPLOAD_BUDGET" | "GITHUB_REQUIRED" | "API_ERROR" | "NETWORK" | "USAGE" | "BROWSER_NOT_FOUND" | "RENDER_FAILED" | "RATE_LIMITED";
 export declare class UploadsError extends Error {
     readonly code: UploadsErrorCode;
     readonly status?: number;

package/dist/mcp/batch-error.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Tool handler failure that still carries structuredContent (e.g. multi-file
+ * total failure with a `failures` array). The MCP server maps this to
+ * isError: true while preserving structuredContent for agents.
+ */
+export declare class ToolBatchError extends Error {
+    readonly structuredContent: unknown;
+    constructor(message: string, structuredContent: unknown);
+}
+/** One-line summary of a multi-file failure list. */
+export declare function batchFailureMessage(failures: readonly {
+    file: string;
+    error: {
+        message: string;
+    };
+}[]): string;

package/dist/mcp/batch-error.js

@@ -0,0 +1,24 @@
+/**
+ * Tool handler failure that still carries structuredContent (e.g. multi-file
+ * total failure with a `failures` array). The MCP server maps this to
+ * isError: true while preserving structuredContent for agents.
+ */
+export class ToolBatchError extends Error {
+    structuredContent;
+    constructor(message, structuredContent) {
+        super(message);
+        this.name = "ToolBatchError";
+        this.structuredContent = structuredContent;
+    }
+}
+/** One-line summary of a multi-file failure list. */
+export function batchFailureMessage(failures) {
+    if (failures.length === 0)
+        return "upload failed";
+    if (failures.length === 1) {
+        const f = failures[0];
+        return `${f.file}: ${f.error.message}`;
+    }
+    const lines = failures.map((f) => `  ${f.file}: ${f.error.message}`);
+    return `${failures.length} uploads failed:\n${lines.join("\n")}`;
+}

package/dist/mcp/server.d.ts

@@ -1,4 +1,5 @@
 export { METADATA_DESCRIPTION, metadataProp, optPosInt, optString, optStringArray, optStringRecord, usage, type ToolArgs, } from "./args.js";
+export { ToolBatchError, batchFailureMessage } from "./batch-error.js";
 export interface McpTool {
     name: string;
     description: string;

package/dist/mcp/server.js

@@ -9,7 +9,9 @@
  */
 import { UploadsError } from "../errors.js";
 import { errorCodeFromUnknown, recordEvent } from "../telemetry.js";
+import { ToolBatchError } from "./batch-error.js";
 export { METADATA_DESCRIPTION, metadataProp, optPosInt, optString, optStringArray, optStringRecord, usage, } from "./args.js";
+export { ToolBatchError, batchFailureMessage } from "./batch-error.js";
 const SUPPORTED_PROTOCOL_VERSIONS = new Set(["2025-06-18", "2025-03-26", "2024-11-05"]);
 const LATEST_PROTOCOL_VERSION = "2025-06-18";
 function response(id, result) {
@@ -59,6 +61,20 @@ export function createMcpServer(opts) {
                 durationMs: Date.now() - start,
                 errorCode: errorCodeFromUnknown(err),
             }, { apiUrl });
+            // Multi-file total failure: keep structuredContent so agents see every
+            // per-file error, not only the first message string.
+            if (err instanceof ToolBatchError) {
+                return response(id, {
+                    content: [
+                        {
+                            type: "text",
+                            text: JSON.stringify(err.structuredContent, null, 2),
+                        },
+                    ],
+                    structuredContent: err.structuredContent,
+                    isError: true,
+                });
+            }
             return response(id, {
                 content: [{ type: "text", text: toolErrorText(err) }],
                 isError: true,

package/dist/mcp/tools.d.ts

@@ -1,8 +1,15 @@
+/**
+ * MCP tool set mirroring the CLI commands (put, attach, list, delete,
+ * usage, reconcile, purge_expired, comment, health, doctor). Config is
+ * resolved fresh per tool call so a
+ * per-call `workspace` argument behaves like the CLI's --workspace flag, and
+ * a missing token surfaces as a tool error rather than a startup failure.
+ */
 import type { GlobalFlags } from "../cli-args.js";
 import { type UploadsClient } from "../client.js";
 import { type UploadsClientConfig } from "../config.js";
 import { type CommandRunner } from "../github-gh.js";
-import type { McpTool } from "./server.js";
+import { type McpTool } from "./server.js";
 export declare function createUploadsMcpTools(opts: {
     globals: GlobalFlags;
     runner?: CommandRunner;