@fluid-app/fluid-cli-widget 0.1.28 → 0.1.30

package/dist/index.mjs

@@ -1,243 +1,17 @@
-import { a as WidgetToolingError, n as loadAndValidateWidgetPackage, r as publishWidgetPackage$1, t as buildWidgetPackage$1 } from "./src-CVadzcYM.mjs";
+import { i as fluidOsV0WidgetPackageGitCredentialCreate, l as WidgetToolingError, n as loadAndValidateWidgetPackage, r as publishWidgetPackage$1, t as buildWidgetPackage$1 } from "./src-_wfDoBLp.mjs";
 import { Command } from "commander";
 import path from "node:path";
 import { randomUUID } from "node:crypto";
 import { execa } from "execa";
 import { fileURLToPath } from "node:url";
 import { findProjectConfig, readConfig } from "@fluid-app/fluid-cli";
-import chalk from "chalk";
-import ora from "ora";
 import { chmodSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { cp, mkdir, mkdtemp, readFile, readdir, rm, rmdir, stat, writeFile } from "node:fs/promises";
+import chalk from "chalk";
+import ora from "ora";
 import { spawn, spawnSync } from "node:child_process";
 import os from "node:os";
 import prompts from "prompts";
-//#region ../../platform/api-client-core/src/fetch-client.ts
-/**
-* API Error class compatible with fluid-admin's ApiError
-*/
-var ApiError = class ApiError extends Error {
-	status;
-	data;
-	requestId;
-	constructor(message, status, data, requestId) {
-		super(message);
-		this.name = "ApiError";
-		this.status = status;
-		this.data = data;
-		this.requestId = requestId;
-		if ("captureStackTrace" in Error) Error.captureStackTrace(this, ApiError);
-	}
-	toJSON() {
-		return {
-			name: this.name,
-			message: this.message,
-			status: this.status,
-			data: this.data,
-			requestId: this.requestId
-		};
-	}
-};
-function getStringRequestId(value) {
-	if (typeof value !== "string") return;
-	const trimmed = value.trim();
-	return trimmed.length > 0 ? trimmed : void 0;
-}
-function getRequestIdFromHeaders(headers) {
-	return getStringRequestId(headers.get("x-request-id")) ?? getStringRequestId(headers.get("request-id")) ?? getStringRequestId(headers.get("X-Request-ID"));
-}
-function getRequestIdFromJsonBody(body) {
-	if (!body || typeof body !== "object" || Array.isArray(body)) return;
-	const record = body;
-	const meta = record.meta;
-	return getStringRequestId(record.request_id) ?? getStringRequestId(record.requestId) ?? (meta && typeof meta === "object" && !Array.isArray(meta) ? getStringRequestId(meta.request_id) ?? getStringRequestId(meta.requestId) : void 0);
-}
-/**
-* Creates a configured fetch client instance
-*/
-function createFetchClient(config) {
-	const { baseUrl, getAuthToken, onAuthError, defaultHeaders = {}, credentials, cache, networkRetry, throwOnInvalidJson = false } = config;
-	const maxNetworkRetries = Math.max(0, networkRetry?.maxRetries ?? 0);
-	const baseNetworkRetryDelayMs = Math.max(0, networkRetry?.baseDelayMs ?? 0);
-	/**
-	* Build headers for a request
-	*/
-	async function buildHeaders(customHeaders) {
-		const headers = {
-			Accept: "application/json",
-			"Content-Type": "application/json",
-			...defaultHeaders,
-			...customHeaders
-		};
-		if (getAuthToken) {
-			const token = await getAuthToken();
-			if (token) headers.Authorization = `Bearer ${token}`;
-		}
-		return headers;
-	}
-	/**
-	* Join baseUrl + endpoint via string concatenation (matches fetchApi).
-	* Using `new URL(endpoint, baseUrl)` would strip any path prefix from
-	* baseUrl (e.g. "/api") when the endpoint starts with "/".
-	*/
-	function joinUrl(endpoint) {
-		return `${baseUrl}${endpoint}`;
-	}
-	/**
-	* Build URL with query parameters for GET requests
-	* Compatible with fluid-admin's query param handling
-	*/
-	function buildUrl(endpoint, params) {
-		const fullUrl = joinUrl(endpoint);
-		if (!params || Object.keys(params).length === 0) return fullUrl;
-		const queryString = new URLSearchParams();
-		Object.entries(params).forEach(([key, value]) => {
-			if (value === void 0 || value === null) return;
-			if (Array.isArray(value)) value.forEach((item) => queryString.append(`${key}[]`, String(item)));
-			else if (typeof value === "object") Object.entries(value).forEach(([subKey, subValue]) => {
-				if (subValue === void 0 || subValue === null) return;
-				if (Array.isArray(subValue)) subValue.forEach((item) => queryString.append(`${key}[${subKey}][]`, String(item)));
-				else queryString.append(`${key}[${subKey}]`, String(subValue));
-			});
-			else queryString.append(key, String(value));
-		});
-		const qs = queryString.toString();
-		return qs ? `${fullUrl}?${qs}` : fullUrl;
-	}
-	/**
-	* Shared response handler for both JSON and FormData requests.
-	* Handles auth errors, non-OK responses, 204 No Content, and JSON parsing.
-	*/
-	async function handleResponse(response, method, _url) {
-		const headerRequestId = getRequestIdFromHeaders(response.headers);
-		if (response.status === 401 && onAuthError) onAuthError();
-		if (!response.ok) {
-			const errorText = await response.text().catch(() => "");
-			if (response.headers.get("content-type")?.includes("application/json")) {
-				let data;
-				try {
-					data = JSON.parse(errorText);
-				} catch {
-					throw new ApiError(errorText.slice(0, 200) || `${method} request failed with status ${response.status}`, response.status, null, headerRequestId);
-				}
-				const nestedError = typeof data.error === "object" && data.error !== null ? data.error.message : void 0;
-				const directError = typeof data.error === "string" ? data.error : void 0;
-				const message = typeof data.message === "string" ? data.message : void 0;
-				const errorMessage = typeof data.error_message === "string" ? data.error_message : void 0;
-				throw new ApiError(message || errorMessage || directError || (typeof nestedError === "string" ? nestedError : void 0) || `${method} request failed with status ${response.status}`, response.status, data.errors || data, headerRequestId ?? getRequestIdFromJsonBody(data));
-			} else throw new ApiError(`${method} request failed with status ${response.status}`, response.status, null, headerRequestId);
-		}
-		if (response.status === 204 || response.headers.get("content-length") === "0") return null;
-		if (response.headers.get("content-type")?.includes("application/json")) {
-			const responseText = await response.text();
-			try {
-				return JSON.parse(responseText);
-			} catch {
-				if (throwOnInvalidJson) throw new ApiError("Failed to parse response as JSON", response.status, null, headerRequestId);
-				return responseText ? responseText : null;
-			}
-		}
-		return null;
-	}
-	function getNetworkRetryDelayMs(retryAttempt) {
-		return baseNetworkRetryDelayMs * 2 ** (retryAttempt - 1);
-	}
-	async function waitForNetworkRetry(retryAttempt) {
-		const delayMs = getNetworkRetryDelayMs(retryAttempt);
-		if (delayMs <= 0) return;
-		await new Promise((resolve) => setTimeout(resolve, delayMs));
-	}
-	async function fetchWithNetworkRetry(url, fetchOptions, signal) {
-		let retryCount = 0;
-		while (true) try {
-			return await fetch(url, fetchOptions);
-		} catch (networkError) {
-			if (signal?.aborted || retryCount >= maxNetworkRetries) throw networkError;
-			retryCount += 1;
-			await waitForNetworkRetry(retryCount);
-			if (signal?.aborted) throw networkError;
-		}
-	}
-	/**
-	* Main request function
-	*/
-	async function request(endpoint, options = {}) {
-		const { method = "GET", headers: customHeaders, params, body, signal, priority } = options;
-		const url = params ? buildUrl(endpoint, params) : joinUrl(endpoint);
-		const headers = await buildHeaders(customHeaders);
-		let response;
-		try {
-			const fetchOptions = {
-				method,
-				headers
-			};
-			if (credentials) fetchOptions.credentials = credentials;
-			if (cache) fetchOptions.cache = cache;
-			if (priority) fetchOptions.priority = priority;
-			const serializedBody = body && method !== "GET" ? JSON.stringify(body) : null;
-			if (serializedBody) fetchOptions.body = serializedBody;
-			if (signal) fetchOptions.signal = signal;
-			response = await fetchWithNetworkRetry(url, fetchOptions, signal);
-		} catch (networkError) {
-			throw new ApiError(`Network error: ${networkError instanceof Error ? networkError.message : "Unknown network error"}`, 0, null);
-		}
-		return handleResponse(response, method, url);
-	}
-	/**
-	* Request with FormData (for file uploads)
-	*/
-	async function requestWithFormData(endpoint, formData, options = {}) {
-		const { method = "POST", headers: customHeaders, signal, priority } = options;
-		const url = joinUrl(endpoint);
-		const headers = await buildHeaders(customHeaders);
-		delete headers["Content-Type"];
-		let response;
-		try {
-			const fetchOptions = {
-				method,
-				headers,
-				body: formData
-			};
-			if (credentials) fetchOptions.credentials = credentials;
-			if (cache) fetchOptions.cache = cache;
-			if (priority) fetchOptions.priority = priority;
-			if (signal) fetchOptions.signal = signal;
-			response = await fetchWithNetworkRetry(url, fetchOptions, signal);
-		} catch (networkError) {
-			throw new ApiError(`Network error: ${networkError instanceof Error ? networkError.message : "Unknown network error"}`, 0, null);
-		}
-		return handleResponse(response, method, url);
-	}
-	return {
-		request,
-		requestWithFormData,
-		get: (endpoint, params, options) => request(endpoint, {
-			...options,
-			method: "GET",
-			...params && { params }
-		}),
-		post: (endpoint, body, options) => request(endpoint, {
-			...options,
-			method: "POST",
-			body
-		}),
-		put: (endpoint, body, options) => request(endpoint, {
-			...options,
-			method: "PUT",
-			body
-		}),
-		patch: (endpoint, body, options) => request(endpoint, {
-			...options,
-			method: "PATCH",
-			body
-		}),
-		delete: (endpoint, options) => request(endpoint, {
-			...options,
-			method: "DELETE"
-		})
-	};
-}
-//#endregion
 //#region src/utils/config.ts
 const WIDGET_CONFIG_FILE = "fluid.widget.config.ts";
 var WidgetConfigParseError = class extends Error {
@@ -800,9 +574,9 @@ function isRecord$3(value) {
 }
 //#endregion
 //#region src/utils/template.ts
-const EMBEDDED_PORTAL_SDK_VERSION = "0.1.462";
+const EMBEDDED_PORTAL_SDK_VERSION = "0.1.464";
 const EMBEDDED_CLI_CORE_VERSION = "0.1.14";
-const EMBEDDED_CLI_WIDGET_VERSION = "0.1.28";
+const EMBEDDED_CLI_WIDGET_VERSION = "0.1.30";
 function getDefaultTemplatePath() {
 	return path.join(findPackageRoot(), "templates", "default");
 }
@@ -976,6 +750,733 @@ const buildCommand = new Command("build").description("Validate and build the cu
 	});
 });
 //#endregion
+//#region ../../platform/api-client-core/src/api-error-shape.ts
+/**
+* Narrows a parsed JSON error payload to the envelope contract. Arrays and
+* primitives are not envelopes, so they resolve to `null` — their content is
+* still reachable through `ApiError.data`.
+*/
+function toApiErrorBody(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+	return value;
+}
+/**
+* The single unwrap rule, shared by every producer of `ApiError`.
+*
+* `??` rather than `||` so an explicitly empty `errors` (`""`, `0`, `false`)
+* is preserved instead of silently falling back to the whole envelope.
+*/
+function toApiErrorData(body) {
+	if (!body) return null;
+	return body.errors ?? body;
+}
+//#endregion
+//#region ../../platform/api-client-core/src/fetch-client.ts
+/**
+* API Error class compatible with fluid-admin's ApiError
+*/
+var ApiError = class ApiError extends Error {
+	status;
+	/**
+	* The unwrapped field-error bag. See `ApiErrorData`; the contract is
+	* documented in `docs/api-error-data-contract.md`.
+	*/
+	data;
+	/**
+	* The full error response envelope. Read `error_message`, `error`, `status`
+	* and nested `errors` from here — `data` has already unwrapped one level.
+	*/
+	body;
+	requestId;
+	constructor(message, status, data, requestId, body) {
+		super(message);
+		this.name = "ApiError";
+		this.status = status;
+		this.data = data ?? null;
+		this.body = body ?? null;
+		this.requestId = requestId;
+		if ("captureStackTrace" in Error) Error.captureStackTrace(this, ApiError);
+	}
+	toJSON() {
+		return {
+			name: this.name,
+			message: this.message,
+			status: this.status,
+			data: this.data,
+			body: this.body,
+			requestId: this.requestId
+		};
+	}
+};
+//#endregion
+//#region ../../platform/api-client-core/src/hey-api-error-policy.ts
+function getNonEmptyString(value) {
+	if (typeof value !== "string") return;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : void 0;
+}
+function getRequestId(response, error) {
+	const meta = toApiErrorBody(error?.meta);
+	return getNonEmptyString(response.headers.get("x-request-id")) ?? getNonEmptyString(response.headers.get("request-id")) ?? getNonEmptyString(error?.request_id) ?? getNonEmptyString(error?.requestId) ?? getNonEmptyString(meta?.request_id) ?? getNonEmptyString(meta?.requestId);
+}
+function getErrorMessage(error, fallback) {
+	const nestedError = toApiErrorBody(error.error);
+	return getNonEmptyString(error.message) ?? getNonEmptyString(error.error_message) ?? getNonEmptyString(nestedError?.message) ?? fallback;
+}
+/**
+* Creates an error interceptor compatible with generated Hey API fetch clients.
+* Consumer-specific auth and cancellation policy is supplied through callbacks,
+* keeping this package independent from generated client types.
+*/
+function createHeyApiErrorInterceptor(options = {}) {
+	return (error, response, request, requestOptions) => {
+		if (!response) {
+			if (error instanceof ApiError) return error;
+			if (options.shouldPassThroughTransportError?.(error)) return error;
+			if (!request) return error;
+			return new ApiError(`Network error: ${error instanceof Error ? error.message : "Unknown network error"}`, 0, null);
+		}
+		if (response.ok && error instanceof SyntaxError) return new ApiError("Failed to parse response as JSON", response.status, null, getRequestId(response, null));
+		options.onResponseError?.(response);
+		const method = request?.method ?? requestOptions.method ?? "GET";
+		const errorRecord = toApiErrorBody(error);
+		const requestId = getRequestId(response, errorRecord);
+		if (errorRecord) return new ApiError(getErrorMessage(errorRecord, `${method} request failed`), response.status, toApiErrorData(errorRecord), requestId, errorRecord);
+		const isJson = response.headers.get("content-type")?.includes("application/json");
+		const text = getNonEmptyString(error);
+		return new ApiError(isJson && text ? text.slice(0, 200) : `${method} request failed with status ${response.status}`, response.status, isJson ? error : null, requestId, null);
+	};
+}
+//#endregion
+//#region ../../api-clients/hey-api-fetch-runtime/src/generated/core/bodySerializer.gen.ts
+const jsonBodySerializer = { bodySerializer: (body) => JSON.stringify(body, (_key, value) => typeof value === "bigint" ? value.toString() : value) };
+Object.entries({
+	$body_: "body",
+	$headers_: "headers",
+	$path_: "path",
+	$query_: "query"
+});
+//#endregion
+//#region ../../api-clients/hey-api-fetch-runtime/src/generated/core/serverSentEvents.gen.ts
+function createSseClient({ onRequest, onSseError, onSseEvent, responseTransformer, responseValidator, sseDefaultRetryDelay, sseMaxRetryAttempts, sseMaxRetryDelay, sseSleepFn, url, ...options }) {
+	let lastEventId;
+	const sleep = sseSleepFn ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+	const createStream = async function* () {
+		let retryDelay = sseDefaultRetryDelay ?? 3e3;
+		let attempt = 0;
+		const signal = options.signal ?? new AbortController().signal;
+		while (true) {
+			if (signal.aborted) break;
+			attempt++;
+			const headers = options.headers instanceof Headers ? options.headers : new Headers(options.headers);
+			if (lastEventId !== void 0) headers.set("Last-Event-ID", lastEventId);
+			try {
+				const requestInit = {
+					redirect: "follow",
+					...options,
+					body: options.serializedBody,
+					headers,
+					signal
+				};
+				let request = new Request(url, requestInit);
+				if (onRequest) request = await onRequest(url, requestInit);
+				const response = await (options.fetch ?? globalThis.fetch)(request);
+				if (!response.ok) throw new Error(`SSE failed: ${response.status} ${response.statusText}`);
+				if (!response.body) throw new Error("No body in SSE response");
+				const reader = response.body.pipeThrough(new TextDecoderStream()).getReader();
+				let buffer = "";
+				const abortHandler = () => {
+					try {
+						reader.cancel();
+					} catch {}
+				};
+				signal.addEventListener("abort", abortHandler);
+				try {
+					while (true) {
+						const { done, value } = await reader.read();
+						if (done) break;
+						buffer += value;
+						buffer = buffer.replace(/\r\n?/g, "\n");
+						const chunks = buffer.split("\n\n");
+						buffer = chunks.pop() ?? "";
+						for (const chunk of chunks) {
+							const lines = chunk.split("\n");
+							const dataLines = [];
+							let eventName;
+							for (const line of lines) if (line.startsWith("data:")) dataLines.push(line.replace(/^data:\s*/, ""));
+							else if (line.startsWith("event:")) eventName = line.replace(/^event:\s*/, "");
+							else if (line.startsWith("id:")) lastEventId = line.replace(/^id:\s*/, "");
+							else if (line.startsWith("retry:")) {
+								const parsed = Number.parseInt(line.replace(/^retry:\s*/, ""), 10);
+								if (!Number.isNaN(parsed)) retryDelay = parsed;
+							}
+							let data;
+							let parsedJson = false;
+							if (dataLines.length) {
+								const rawData = dataLines.join("\n");
+								try {
+									data = JSON.parse(rawData);
+									parsedJson = true;
+								} catch {
+									data = rawData;
+								}
+							}
+							if (parsedJson) {
+								if (responseValidator) await responseValidator(data);
+								if (responseTransformer) data = await responseTransformer(data);
+							}
+							onSseEvent?.({
+								data,
+								event: eventName,
+								id: lastEventId,
+								retry: retryDelay
+							});
+							if (dataLines.length) yield data;
+						}
+					}
+				} finally {
+					signal.removeEventListener("abort", abortHandler);
+					reader.releaseLock();
+				}
+				break;
+			} catch (error) {
+				onSseError?.(error);
+				if (sseMaxRetryAttempts !== void 0 && attempt >= sseMaxRetryAttempts) break;
+				await sleep(Math.min(retryDelay * 2 ** (attempt - 1), sseMaxRetryDelay ?? 3e4));
+			}
+		}
+	};
+	return { stream: createStream() };
+}
+//#endregion
+//#region ../../api-clients/hey-api-fetch-runtime/src/generated/core/pathSerializer.gen.ts
+const separatorArrayExplode = (style) => {
+	switch (style) {
+		case "label": return ".";
+		case "matrix": return ";";
+		case "simple": return ",";
+		default: return "&";
+	}
+};
+const separatorArrayNoExplode = (style) => {
+	switch (style) {
+		case "form": return ",";
+		case "pipeDelimited": return "|";
+		case "spaceDelimited": return "%20";
+		default: return ",";
+	}
+};
+const separatorObjectExplode = (style) => {
+	switch (style) {
+		case "label": return ".";
+		case "matrix": return ";";
+		case "simple": return ",";
+		default: return "&";
+	}
+};
+const serializeArrayParam = ({ allowReserved, explode, name, style, value }) => {
+	if (!explode) {
+		const joinedValues = (allowReserved ? value : value.map((v) => encodeURIComponent(v))).join(separatorArrayNoExplode(style));
+		switch (style) {
+			case "label": return `.${joinedValues}`;
+			case "matrix": return `;${name}=${joinedValues}`;
+			case "simple": return joinedValues;
+			default: return `${name}=${joinedValues}`;
+		}
+	}
+	const separator = separatorArrayExplode(style);
+	const joinedValues = value.map((v) => {
+		if (style === "label" || style === "simple") return allowReserved ? v : encodeURIComponent(v);
+		return serializePrimitiveParam({
+			allowReserved,
+			name,
+			value: v
+		});
+	}).join(separator);
+	return style === "label" || style === "matrix" ? separator + joinedValues : joinedValues;
+};
+const serializePrimitiveParam = ({ allowReserved, name, value }) => {
+	if (value === void 0 || value === null) return "";
+	if (typeof value === "object") throw new Error("Deeply-nested arrays/objects aren’t supported. Provide your own `querySerializer()` to handle these.");
+	return `${name}=${allowReserved ? value : encodeURIComponent(value)}`;
+};
+const serializeObjectParam = ({ allowReserved, explode, name, style, value, valueOnly }) => {
+	if (value instanceof Date) return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`;
+	if (style !== "deepObject" && !explode) {
+		let values = [];
+		Object.entries(value).forEach(([key, v]) => {
+			values = [
+				...values,
+				key,
+				allowReserved ? v : encodeURIComponent(v)
+			];
+		});
+		const joinedValues = values.join(",");
+		switch (style) {
+			case "form": return `${name}=${joinedValues}`;
+			case "label": return `.${joinedValues}`;
+			case "matrix": return `;${name}=${joinedValues}`;
+			default: return joinedValues;
+		}
+	}
+	const separator = separatorObjectExplode(style);
+	const joinedValues = Object.entries(value).map(([key, v]) => serializePrimitiveParam({
+		allowReserved,
+		name: style === "deepObject" ? `${name}[${key}]` : key,
+		value: v
+	})).join(separator);
+	return style === "label" || style === "matrix" ? separator + joinedValues : joinedValues;
+};
+//#endregion
+//#region ../../api-clients/hey-api-fetch-runtime/src/generated/core/utils.gen.ts
+const PATH_PARAM_RE = /\{[^{}]+\}/g;
+const defaultPathSerializer = ({ path, url: _url }) => {
+	let url = _url;
+	const matches = _url.match(PATH_PARAM_RE);
+	if (matches) for (const match of matches) {
+		let explode = false;
+		let name = match.substring(1, match.length - 1);
+		let style = "simple";
+		if (name.endsWith("*")) {
+			explode = true;
+			name = name.substring(0, name.length - 1);
+		}
+		if (name.startsWith(".")) {
+			name = name.substring(1);
+			style = "label";
+		} else if (name.startsWith(";")) {
+			name = name.substring(1);
+			style = "matrix";
+		}
+		const value = path[name];
+		if (value === void 0 || value === null) continue;
+		if (Array.isArray(value)) {
+			url = url.replace(match, serializeArrayParam({
+				explode,
+				name,
+				style,
+				value
+			}));
+			continue;
+		}
+		if (typeof value === "object") {
+			url = url.replace(match, serializeObjectParam({
+				explode,
+				name,
+				style,
+				value,
+				valueOnly: true
+			}));
+			continue;
+		}
+		if (style === "matrix") {
+			url = url.replace(match, `;${serializePrimitiveParam({
+				name,
+				value
+			})}`);
+			continue;
+		}
+		const replaceValue = encodeURIComponent(style === "label" ? `.${value}` : value);
+		url = url.replace(match, replaceValue);
+	}
+	return url;
+};
+const getUrl = ({ baseUrl, path, query, querySerializer, url: _url }) => {
+	const pathUrl = _url.startsWith("/") ? _url : `/${_url}`;
+	let url = (baseUrl ?? "") + pathUrl;
+	if (path) url = defaultPathSerializer({
+		path,
+		url
+	});
+	let search = query ? querySerializer(query) : "";
+	if (search.startsWith("?")) search = search.substring(1);
+	if (search) url += `?${search}`;
+	return url;
+};
+function getValidRequestBody(options) {
+	const hasBody = options.body !== void 0;
+	if (hasBody && options.bodySerializer) {
+		if ("serializedBody" in options) return options.serializedBody !== void 0 && options.serializedBody !== "" ? options.serializedBody : null;
+		return options.body !== "" ? options.body : null;
+	}
+	if (hasBody) return options.body;
+}
+//#endregion
+//#region ../../api-clients/hey-api-fetch-runtime/src/generated/core/auth.gen.ts
+const getAuthToken = async (auth, callback) => {
+	const token = typeof callback === "function" ? await callback(auth) : callback;
+	if (!token) return;
+	if (auth.scheme === "bearer") return `Bearer ${token}`;
+	if (auth.scheme === "basic") return `Basic ${btoa(token)}`;
+	return token;
+};
+//#endregion
+//#region ../../api-clients/hey-api-fetch-runtime/src/generated/client/utils.gen.ts
+const createQuerySerializer = ({ parameters = {}, ...args } = {}) => {
+	const querySerializer = (queryParams) => {
+		const search = [];
+		if (queryParams && typeof queryParams === "object") for (const name in queryParams) {
+			const value = queryParams[name];
+			if (value === void 0 || value === null) continue;
+			const options = parameters[name] || args;
+			if (Array.isArray(value)) {
+				const serializedArray = serializeArrayParam({
+					allowReserved: options.allowReserved,
+					explode: true,
+					name,
+					style: "form",
+					value,
+					...options.array
+				});
+				if (serializedArray) search.push(serializedArray);
+			} else if (typeof value === "object") {
+				const serializedObject = serializeObjectParam({
+					allowReserved: options.allowReserved,
+					explode: true,
+					name,
+					style: "deepObject",
+					value,
+					...options.object
+				});
+				if (serializedObject) search.push(serializedObject);
+			} else {
+				const serializedPrimitive = serializePrimitiveParam({
+					allowReserved: options.allowReserved,
+					name,
+					value
+				});
+				if (serializedPrimitive) search.push(serializedPrimitive);
+			}
+		}
+		return search.join("&");
+	};
+	return querySerializer;
+};
+/**
+* Infers parseAs value from provided Content-Type header.
+*/
+const getParseAs = (contentType) => {
+	if (!contentType) return "stream";
+	const cleanContent = contentType.split(";")[0]?.trim();
+	if (!cleanContent) return;
+	if (cleanContent.startsWith("application/json") || cleanContent.endsWith("+json")) return "json";
+	if (cleanContent === "multipart/form-data") return "formData";
+	if ([
+		"application/",
+		"audio/",
+		"image/",
+		"video/"
+	].some((type) => cleanContent.startsWith(type))) return "blob";
+	if (cleanContent.startsWith("text/")) return "text";
+};
+const checkForExistence = (options, name) => {
+	if (!name) return false;
+	if (options.headers.has(name) || options.query?.[name] || options.headers.get("Cookie")?.includes(`${name}=`)) return true;
+	return false;
+};
+async function setAuthParams(options) {
+	for (const auth of options.security ?? []) {
+		if (checkForExistence(options, auth.name)) continue;
+		const token = await getAuthToken(auth, options.auth);
+		if (!token) continue;
+		const name = auth.name ?? "Authorization";
+		switch (auth.in) {
+			case "query":
+				if (!options.query) options.query = {};
+				options.query[name] = token;
+				break;
+			case "cookie":
+				options.headers.append("Cookie", `${name}=${token}`);
+				break;
+			default:
+				options.headers.set(name, token);
+				break;
+		}
+	}
+}
+const buildUrl = (options) => getUrl({
+	baseUrl: options.baseUrl,
+	path: options.path,
+	query: options.query,
+	querySerializer: typeof options.querySerializer === "function" ? options.querySerializer : createQuerySerializer(options.querySerializer),
+	url: options.url
+});
+const mergeConfigs = (a, b) => {
+	const config = {
+		...a,
+		...b
+	};
+	if (config.baseUrl?.endsWith("/")) config.baseUrl = config.baseUrl.substring(0, config.baseUrl.length - 1);
+	config.headers = mergeHeaders(a.headers, b.headers);
+	return config;
+};
+const headersEntries = (headers) => {
+	const entries = [];
+	headers.forEach((value, key) => {
+		entries.push([key, value]);
+	});
+	return entries;
+};
+const mergeHeaders = (...headers) => {
+	const mergedHeaders = new Headers();
+	for (const header of headers) {
+		if (!header) continue;
+		const iterator = header instanceof Headers ? headersEntries(header) : Object.entries(header);
+		for (const [key, value] of iterator) if (value === null) mergedHeaders.delete(key);
+		else if (Array.isArray(value)) for (const v of value) mergedHeaders.append(key, v);
+		else if (value !== void 0) mergedHeaders.set(key, typeof value === "object" ? JSON.stringify(value) : value);
+	}
+	return mergedHeaders;
+};
+var Interceptors = class {
+	fns = [];
+	clear() {
+		this.fns = [];
+	}
+	eject(id) {
+		const index = this.getInterceptorIndex(id);
+		if (this.fns[index]) this.fns[index] = null;
+	}
+	exists(id) {
+		const index = this.getInterceptorIndex(id);
+		return Boolean(this.fns[index]);
+	}
+	getInterceptorIndex(id) {
+		if (typeof id === "number") return this.fns[id] ? id : -1;
+		return this.fns.indexOf(id);
+	}
+	update(id, fn) {
+		const index = this.getInterceptorIndex(id);
+		if (this.fns[index]) {
+			this.fns[index] = fn;
+			return id;
+		}
+		return false;
+	}
+	use(fn) {
+		this.fns.push(fn);
+		return this.fns.length - 1;
+	}
+};
+const createInterceptors = () => ({
+	error: new Interceptors(),
+	request: new Interceptors(),
+	response: new Interceptors()
+});
+const defaultQuerySerializer = createQuerySerializer({
+	allowReserved: false,
+	array: {
+		explode: true,
+		style: "form"
+	},
+	object: {
+		explode: true,
+		style: "deepObject"
+	}
+});
+const defaultHeaders = { "Content-Type": "application/json" };
+const createConfig = (override = {}) => ({
+	...jsonBodySerializer,
+	headers: defaultHeaders,
+	parseAs: "auto",
+	querySerializer: defaultQuerySerializer,
+	...override
+});
+//#endregion
+//#region ../../api-clients/hey-api-fetch-runtime/src/generated/client/client.gen.ts
+const createClient = (config = {}) => {
+	let _config = mergeConfigs(createConfig(), config);
+	const getConfig = () => ({ ..._config });
+	const setConfig = (config) => {
+		_config = mergeConfigs(_config, config);
+		return getConfig();
+	};
+	const interceptors = createInterceptors();
+	const beforeRequest = async (options) => {
+		const opts = {
+			..._config,
+			...options,
+			fetch: options.fetch ?? _config.fetch ?? globalThis.fetch,
+			headers: mergeHeaders(_config.headers, options.headers),
+			serializedBody: void 0
+		};
+		if (opts.security) await setAuthParams(opts);
+		if (opts.requestValidator) await opts.requestValidator(opts);
+		if (opts.body !== void 0 && opts.bodySerializer) opts.serializedBody = opts.bodySerializer(opts.body);
+		if (opts.body === void 0 || opts.serializedBody === "") opts.headers.delete("Content-Type");
+		const resolvedOpts = opts;
+		return {
+			opts: resolvedOpts,
+			url: buildUrl(resolvedOpts)
+		};
+	};
+	const request = async (options) => {
+		const throwOnError = options.throwOnError ?? _config.throwOnError;
+		const responseStyle = options.responseStyle ?? _config.responseStyle;
+		let request;
+		let response;
+		try {
+			const { opts, url } = await beforeRequest(options);
+			const requestInit = {
+				redirect: "follow",
+				...opts,
+				body: getValidRequestBody(opts)
+			};
+			request = new Request(url, requestInit);
+			for (const fn of interceptors.request.fns) if (fn) request = await fn(request, opts);
+			const _fetch = opts.fetch;
+			response = await _fetch(request);
+			for (const fn of interceptors.response.fns) if (fn) response = await fn(response, request, opts);
+			const result = {
+				request,
+				response
+			};
+			if (response.ok) {
+				const parseAs = (opts.parseAs === "auto" ? getParseAs(response.headers.get("Content-Type")) : opts.parseAs) ?? "json";
+				if (response.status === 204 || response.headers.get("Content-Length") === "0") {
+					let emptyData;
+					switch (parseAs) {
+						case "arrayBuffer":
+						case "blob":
+						case "text":
+							emptyData = await response[parseAs]();
+							break;
+						case "formData":
+							emptyData = new FormData();
+							break;
+						case "stream":
+							emptyData = response.body;
+							break;
+						default:
+							emptyData = {};
+							break;
+					}
+					return opts.responseStyle === "data" ? emptyData : {
+						data: emptyData,
+						...result
+					};
+				}
+				let data;
+				switch (parseAs) {
+					case "arrayBuffer":
+					case "blob":
+					case "formData":
+					case "text":
+						data = await response[parseAs]();
+						break;
+					case "json": {
+						const text = await response.text();
+						data = text ? JSON.parse(text) : {};
+						break;
+					}
+					case "stream": return opts.responseStyle === "data" ? response.body : {
+						data: response.body,
+						...result
+					};
+				}
+				if (parseAs === "json") {
+					if (opts.responseValidator) await opts.responseValidator(data);
+					if (opts.responseTransformer) data = await opts.responseTransformer(data);
+				}
+				return opts.responseStyle === "data" ? data : {
+					data,
+					...result
+				};
+			}
+			const textError = await response.text();
+			let jsonError;
+			try {
+				jsonError = JSON.parse(textError);
+			} catch {}
+			throw jsonError ?? textError;
+		} catch (error) {
+			let finalError = error;
+			for (const fn of interceptors.error.fns) if (fn) finalError = await fn(finalError, response, request, options);
+			finalError = finalError || {};
+			if (throwOnError) throw finalError;
+			return responseStyle === "data" ? void 0 : {
+				error: finalError,
+				request,
+				response
+			};
+		}
+	};
+	const makeMethodFn = (method) => (options) => request({
+		...options,
+		method
+	});
+	const makeSseFn = (method) => async (options) => {
+		const { opts, url } = await beforeRequest(options);
+		return createSseClient({
+			...opts,
+			body: opts.body,
+			method,
+			onRequest: async (url, init) => {
+				let request = new Request(url, init);
+				for (const fn of interceptors.request.fns) if (fn) request = await fn(request, opts);
+				return request;
+			},
+			serializedBody: getValidRequestBody(opts),
+			url
+		});
+	};
+	const _buildUrl = (options) => buildUrl({
+		..._config,
+		...options
+	});
+	return {
+		buildUrl: _buildUrl,
+		connect: makeMethodFn("CONNECT"),
+		delete: makeMethodFn("DELETE"),
+		get: makeMethodFn("GET"),
+		getConfig,
+		head: makeMethodFn("HEAD"),
+		interceptors,
+		options: makeMethodFn("OPTIONS"),
+		patch: makeMethodFn("PATCH"),
+		post: makeMethodFn("POST"),
+		put: makeMethodFn("PUT"),
+		request,
+		setConfig,
+		sse: {
+			connect: makeSseFn("CONNECT"),
+			delete: makeSseFn("DELETE"),
+			get: makeSseFn("GET"),
+			head: makeSseFn("HEAD"),
+			options: makeSseFn("OPTIONS"),
+			patch: makeSseFn("PATCH"),
+			post: makeSseFn("POST"),
+			put: makeSseFn("PUT"),
+			trace: makeSseFn("TRACE")
+		},
+		trace: makeMethodFn("TRACE")
+	};
+};
+//#endregion
+//#region ../../api-clients/fluidos/src/hey-api-client.ts
+function isAbortError(error) {
+	return error instanceof DOMException && error.name === "AbortError" || error instanceof Error && error.name === "AbortError";
+}
+function createFluidOsHeyApiClient(config) {
+	const client = createClient({
+		auth: async () => await config.getAuthToken?.() ?? void 0,
+		baseUrl: config.baseUrl,
+		fetch: config.fetch,
+		headers: {
+			Accept: "application/json",
+			...config.defaultHeaders
+		},
+		throwOnError: true
+	});
+	client.interceptors.error.use(createHeyApiErrorInterceptor({
+		onResponseError: (response) => {
+			if (response.status === 401) config.onAuthError?.();
+		},
+		shouldPassThroughTransportError: isAbortError
+	}));
+	return client;
+}
+//#endregion
 //#region src/utils/auth-client.ts
 function createAuthenticatedClient() {
 	return { client: createAuthenticatedWidgetPackageClient() };
@@ -986,7 +1487,7 @@ function createAuthenticatedWidgetPackageClient() {
 		if (!profileName) throw new Error("Not logged in. Run " + chalk.cyan("fluid login") + " first.");
 		throw new Error("No auth token found for profile " + chalk.cyan(profileName) + ". Run " + chalk.cyan("fluid login") + " to re-authenticate.");
 	}
-	return createFetchClient({
+	return createFluidOsHeyApiClient({
 		baseUrl: profile?.baseUrl ?? process.env["FLUID_API_BASE"] ?? "https://api.fluid.app",
 		getAuthToken: () => token
 	});
@@ -1678,6 +2179,10 @@ async function gitAutoCommit(cwd, message, identity = DEFAULT_COMMIT_IDENTITY) {
 }
 //#endregion
 //#region src/utils/git-credential.ts
+function unwrapResponseData(response) {
+	if (response !== null && typeof response === "object" && "data" in response && !("git_credential" in response)) return response.data;
+	return response;
+}
 /**
 * Mint a git credential for a widget package.
 *
@@ -1690,8 +2195,13 @@ async function gitAutoCommit(cwd, message, identity = DEFAULT_COMMIT_IDENTITY) {
 * decide whether to degrade gracefully (see `isGitSyncUnavailable`).
 */
 async function mintWidgetGitCredential(options) {
-	const path = options.droplet ? `/api/droplets/${encodeURIComponent(options.droplet)}/widget_package/git_credential` : "/api/company/fluid_os/widget_package/git_credential";
-	const response = await options.client.post(path);
+	const response = unwrapResponseData(options.droplet ? await options.client.post({
+		responseStyle: "data",
+		url: `/api/droplets/${encodeURIComponent(options.droplet)}/widget_package/git_credential`
+	}) : await fluidOsV0WidgetPackageGitCredentialCreate({
+		client: options.client,
+		responseStyle: "data"
+	}));
 	const remoteUrl = response?.git_credential?.remote_url;
 	if (typeof remoteUrl !== "string" || remoteUrl.length === 0) throw new Error("The git credential response did not include a remote URL. Update the Fluid CLI, or contact support if this persists.");
 	const expiresAtRaw = response.git_credential?.expires_at;
@@ -2170,10 +2680,18 @@ async function promptForDroplet(client) {
 }
 async function listDroplets(client) {
 	try {
-		const firstResponse = await client.get("/api/droplets", { page: 1 });
+		const firstResponse = await client.get({
+			query: { page: 1 },
+			responseStyle: "data",
+			url: "/api/droplets"
+		});
 		const totalPages = Math.min(readTotalPages(firstResponse) ?? 1, MAX_DROPLET_PAGES);
 		const responses = [firstResponse];
-		for (let page = 2; page <= totalPages; page += 1) responses.push(await client.get("/api/droplets", { page }));
+		for (let page = 2; page <= totalPages; page += 1) responses.push(await client.get({
+			query: { page },
+			responseStyle: "data",
+			url: "/api/droplets"
+		}));
 		return responses.flatMap(normalizeDropletsResponse);
 	} catch (err) {
 		if (isApiLikeError(err)) {
@@ -2270,10 +2788,17 @@ const linkCommand = new Command("link").description("Link this widget project to
 //#endregion
 //#region src/utils/droplet-api.ts
 async function fetchDropletWidgetStatus(options) {
-	return extractArray(await options.client.get(`/api/droplets/${encodeURIComponent(options.droplet)}/widget_package_versions`)).map(normalizeVersionSummary);
+	return extractArray(await options.client.get({
+		responseStyle: "data",
+		url: `/api/droplets/${encodeURIComponent(options.droplet)}/widget_package_versions`
+	})).map(normalizeVersionSummary);
 }
 async function fetchDropletWidgetLogs(options) {
-	return extractArray(await options.client.get(`/api/droplets/${encodeURIComponent(options.droplet)}/widget_package_versions/logs`, options.limit ? { limit: options.limit } : void 0)).map(normalizeLogEntry);
+	return extractArray(await options.client.get({
+		query: options.limit ? { limit: options.limit } : void 0,
+		responseStyle: "data",
+		url: `/api/droplets/${encodeURIComponent(options.droplet)}/widget_package_versions/logs`
+	})).map(normalizeLogEntry);
 }
 function formatStatusRows(versions) {
 	if (versions.length === 0) return "No widget package versions found.";
@@ -2530,7 +3055,10 @@ function str(value) {
 	return null;
 }
 async function fetchCurrentUser(client) {
-	const raw = await client.get("/api/me");
+	const raw = await client.get({
+		responseStyle: "data",
+		url: "/api/me"
+	});
 	const composed = [str(raw.first_name), str(raw.last_name)].filter((part) => part !== null).join(" ").trim();
 	const idValue = str(raw.public_id) ?? (typeof raw.id === "number" && Number.isFinite(raw.id) ? String(raw.id) : null);
 	return {