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

package/dist/index.mjs

@@ -1,15 +1,243 @@
+import { a as WidgetToolingError, n as loadAndValidateWidgetPackage, r as publishWidgetPackage$1, t as buildWidgetPackage$1 } from "./src-CVadzcYM.mjs";
 import { Command } from "commander";
-import { buildSharedWidgetPackage, createAuthenticatedWidgetPackageClient, loadSourceWidgetPackages, printDryRunSessionPayload, printRuntimeOnlyNotice, printWidgetPublishSummary, publishWidgetRuntimeArtifacts, validateSingleSourceWidgetPackage, validateWidgetPublishOutDir } from "@fluid-app/fluid-cli-portal";
+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, writeFileSync } from "node:fs";
+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 path from "node:path";
 import { spawn, spawnSync } from "node:child_process";
 import os from "node:os";
-import { execa } from "execa";
-import { fileURLToPath } from "node:url";
 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 {
@@ -317,22 +545,27 @@ async function validateDropletWidgetProject(projectDir, packageKeyOverride) {
 	}]);
 	const configErrors = await validateRootWidgetConfig(resolvedProjectDir, packageKeyOverride);
 	if (configErrors.length > 0) throw new WidgetValidationError(configErrors);
-	const sourcePackages = await withRootWidgetConfigBridge(resolvedProjectDir, async () => {
-		const loadResult = await loadSourceWidgetPackages(resolvedProjectDir);
-		if (!loadResult.success) throw new WidgetValidationError([{
-			code: "INVALID_SOURCE_PACKAGE",
-			path: sourceConfig.relativePath,
-			message: appendDetails(loadResult.error.message, loadResult.error.details)
-		}]);
-		return loadResult.value;
-	}, packageKeyOverride);
-	const validation = validateSingleSourceWidgetPackage(sourcePackages, { owner: "droplet" });
-	const errors = [...validation.errors, ...validateDropletMetadata(sourcePackages)];
-	if (!validation.success || !validation.value || errors.length > 0) throw new WidgetValidationError(errors);
+	let validated;
+	try {
+		validated = (await withRootWidgetConfigBridge(resolvedProjectDir, () => loadAndValidateWidgetPackage({
+			projectDir: resolvedProjectDir,
+			owner: "droplet"
+		}), packageKeyOverride)).validated;
+	} catch (error) {
+		if (error instanceof WidgetToolingError) {
+			if (error.diagnostics) throw new WidgetValidationError(error.diagnostics);
+			throw new WidgetValidationError([{
+				code: "INVALID_SOURCE_PACKAGE",
+				path: sourceConfig.relativePath,
+				message: error.details ? `${error.message}\n${error.details}` : error.message
+			}]);
+		}
+		throw error;
+	}
 	return {
 		projectDir: resolvedProjectDir,
 		sourceConfigPath: sourceConfig.relativePath,
-		validated: validation.value
+		validated
 	};
 }
 async function withRootWidgetConfigBridge(projectDir, callback, packageKeyOverride) {
@@ -411,29 +644,6 @@ async function validateRootWidgetConfig(projectDir, packageKeyOverride) {
 		}];
 	}
 }
-function validateDropletMetadata(sourcePackages) {
-	if (sourcePackages.length !== 1) return [];
-	const sourcePackage = sourcePackages[0];
-	if (!isRecord$5(sourcePackage)) return [];
-	const errors = [];
-	if (sourcePackage["packageType"] !== "droplet") errors.push({
-		code: "UNSUPPORTED_OWNER",
-		path: "packageType",
-		message: "Droplet widget packages must set packageType: \"droplet\" in package metadata."
-	});
-	if (!isNonEmptyString(sourcePackage["packageStableId"])) errors.push({
-		code: "INVALID_PACKAGE_KEY",
-		path: "packageStableId",
-		message: "Droplet widget packages must set packageStableId so published widget types remain stable across builds."
-	});
-	const widgets = sourcePackage["widgets"];
-	if (Array.isArray(widgets)) widgets.forEach((widget, index) => {
-		if (!isRecord$5(widget)) return;
-		validateJsonSerializable(widget["propertySchema"], `widgets[${index}].propertySchema`, errors);
-		validateJsonSerializable(widget["defaultProps"], `widgets[${index}].defaultProps`, errors);
-	});
-	return errors;
-}
 function resolvePortalSourceConfig(projectDir) {
 	for (const relativePath of SOURCE_CONFIG_CANDIDATES) {
 		const candidate = path.join(projectDir, relativePath);
@@ -443,50 +653,6 @@ function resolvePortalSourceConfig(projectDir) {
 		};
 	}
 }
-function validateJsonSerializable(value, pathLabel, errors) {
-	if (value === void 0) return;
-	try {
-		assertJsonSerializable(value, pathLabel);
-	} catch (err) {
-		errors.push({
-			code: "INVALID_WIDGET_METADATA",
-			path: pathLabel,
-			message: err instanceof Error ? err.message : String(err)
-		});
-	}
-}
-function assertJsonSerializable(value, pathLabel) {
-	if (value === null) return;
-	const valueType = typeof value;
-	if (valueType === "string" || valueType === "boolean") return;
-	if (valueType === "number") {
-		if (Number.isFinite(value)) return;
-		throw new Error(`${pathLabel} must not contain NaN or Infinity.`);
-	}
-	if (Array.isArray(value)) {
-		value.forEach((item, index) => {
-			assertJsonSerializable(item, `${pathLabel}[${index}]`);
-		});
-		return;
-	}
-	if (isRecord$5(value)) {
-		for (const [key, item] of Object.entries(value)) {
-			if (item === void 0) throw new Error(`${pathLabel}.${key} must not be undefined.`);
-			assertJsonSerializable(item, `${pathLabel}.${key}`);
-		}
-		return;
-	}
-	throw new Error(`${pathLabel} must contain only JSON-serializable values.`);
-}
-function appendDetails(message, details) {
-	return details ? `${message}\n${details}` : message;
-}
-function isNonEmptyString(value) {
-	return typeof value === "string" && value.trim().length > 0;
-}
-function isRecord$5(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 function isNodeError(error) {
 	return error instanceof Error && "code" in error;
 }
@@ -633,6 +799,138 @@ function isRecord$3(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
+//#region src/utils/template.ts
+const EMBEDDED_PORTAL_SDK_VERSION = "0.1.462";
+const EMBEDDED_CLI_CORE_VERSION = "0.1.14";
+const EMBEDDED_CLI_WIDGET_VERSION = "0.1.28";
+function getDefaultTemplatePath() {
+	return path.join(findPackageRoot(), "templates", "default");
+}
+async function directoryExists(filePath) {
+	try {
+		return (await stat(filePath)).isDirectory();
+	} catch {
+		return false;
+	}
+}
+async function copyWidgetTemplate(templatePath, targetPath, variables) {
+	const files = await getFiles(templatePath);
+	for (const file of files) {
+		const sourcePath = path.join(templatePath, file);
+		const isTemplate = file.endsWith(".template");
+		const outputFiles = getOutputFilenames(file);
+		const content = await readFile(sourcePath, "utf-8");
+		await writeOutputFiles(targetPath, outputFiles, isTemplate ? renderTemplate(content, variables) : content);
+	}
+	for (const skillFile of await getSharedTemplateSkillFiles()) await writeOutputFiles(targetPath, getOutputFilenames(skillFile.relativePath), skillFile.content);
+}
+async function getPortalSdkVersion(options = {}) {
+	return getWorkspacePackageVersion(["portal", "sdk"], EMBEDDED_PORTAL_SDK_VERSION, options);
+}
+async function getPortalCoreVersion(options = {}) {
+	return getWorkspacePackageVersion(["portal", "core"], void 0, options);
+}
+async function getCliVersion(options = {}) {
+	return getWorkspacePackageVersion(["cli", "core"], EMBEDDED_CLI_CORE_VERSION, options);
+}
+async function getWidgetCliVersion(options = {}) {
+	return getWorkspacePackageVersion(["cli", "widget"], EMBEDDED_CLI_WIDGET_VERSION, options);
+}
+async function getWorkspacePackageVersion(packagePathSegments, embeddedVersion, options) {
+	try {
+		const packageRoot = findPackageRoot();
+		const packagesRoot = path.join(packageRoot, "..", "..");
+		const targetPackageRoot = path.join(packagesRoot, ...packagePathSegments);
+		if (options.local) return `link:${(options.targetPath ? path.relative(options.targetPath, targetPackageRoot) : targetPackageRoot).replace(/\\/g, "/") || "."}`;
+		if (embeddedVersion) return embeddedVersion;
+		const packageJsonPath = path.join(targetPackageRoot, "package.json");
+		const content = await readFile(packageJsonPath, "utf-8");
+		const pkg = JSON.parse(content);
+		if (typeof pkg.version !== "string") throw new Error(`Missing version in ${packageJsonPath}`);
+		return pkg.version;
+	} catch (error) {
+		if (embeddedVersion) return embeddedVersion;
+		throw new Error(`Could not resolve the exact template package version for ${packagePathSegments.join("/")}`, { cause: error });
+	}
+}
+async function getFiles(dir, baseDir = dir) {
+	const entries = await readdir(dir, { withFileTypes: true });
+	const files = [];
+	for (const entry of entries) {
+		const fullPath = path.join(dir, entry.name);
+		if (entry.isDirectory()) files.push(...await getFiles(fullPath, baseDir));
+		else files.push(path.relative(baseDir, fullPath));
+	}
+	return files;
+}
+async function getSharedTemplateSkillFiles() {
+	const packageRoot = findFluidCliPackageRoot();
+	const skillsRoot = path.join(packageRoot, "template-skills");
+	const files = await getFiles(skillsRoot);
+	return Promise.all(files.map(async (file) => ({
+		relativePath: path.join("skills", file),
+		content: await readFile(path.join(skillsRoot, file), "utf-8")
+	})));
+}
+function findFluidCliPackageRoot() {
+	const workspacePackageRoot = path.join(findPackageRoot(), "..", "core");
+	if (existsSync(path.join(workspacePackageRoot, "template-skills"))) return workspacePackageRoot;
+	let dir = path.dirname(fileURLToPath(import.meta.resolve("@fluid-app/fluid-cli")));
+	while (!existsSync(path.join(dir, "package.json"))) {
+		const parent = path.dirname(dir);
+		if (parent === dir) throw new Error("Could not find Fluid CLI package root");
+		dir = parent;
+	}
+	return dir;
+}
+function renderTemplate(content, variables) {
+	return content.replace(/{{\s*#if\s+([a-zA-Z0-9_]+)\s*}}([\s\S]*?){{\s*\/if\s*}}/g, (match, key, block) => {
+		if (!isTemplateVariableKey(key)) return match;
+		return variables[key] ? String(block) : "";
+	}).replace(/{{\s*([a-zA-Z0-9_]+)\s*}}/g, (match, key) => {
+		if (isTemplateVariableKey(key)) return variables[key] ?? "";
+		return match;
+	});
+}
+function isTemplateVariableKey(key) {
+	return [
+		"projectName",
+		"widgetScope",
+		"widgetPackageVersion",
+		"sdkVersion",
+		"localCoreVersion",
+		"fluidCliVersion",
+		"widgetCliVersion",
+		"droplet"
+	].includes(key);
+}
+async function writeOutputFiles(targetPath, outputFiles, content) {
+	for (const outputFile of outputFiles) {
+		const destinationPath = path.join(targetPath, outputFile);
+		await mkdir(path.dirname(destinationPath), { recursive: true });
+		await writeFile(destinationPath, content, "utf-8");
+	}
+}
+function getOutputFilenames(filename) {
+	const outputFilename = getOutputFilename(filename);
+	const normalized = outputFilename.replace(/\\/g, "/");
+	if (normalized === "AGENTS.md") return ["AGENTS.md", "CLAUDE.md"];
+	if (normalized.startsWith("skills/")) return [path.join(".agents", outputFilename), path.join(".claude", outputFilename)];
+	return [outputFilename];
+}
+function getOutputFilename(filename) {
+	return filename.endsWith(".template") ? filename.slice(0, -9) : filename;
+}
+function findPackageRoot() {
+	let dir = path.dirname(fileURLToPath(import.meta.url));
+	while (!existsSync(path.join(dir, "package.json"))) {
+		const parent = path.dirname(dir);
+		if (parent === dir) throw new Error("Could not find widget CLI package root");
+		dir = parent;
+	}
+	return dir;
+}
+//#endregion
 //#region src/commands/build.ts
 async function buildWidgetPackage(options) {
 	await validateDropletWidgetProject(options.projectDir);
@@ -640,20 +938,23 @@ async function buildWidgetPackage(options) {
 		projectDir: options.projectDir,
 		scriptName: "typecheck"
 	});
-	const outDir = validateWidgetPublishOutDir(options.projectDir, options.outDir);
-	const buildResult = await withRootWidgetConfigBridge(options.projectDir, () => buildSharedWidgetPackage({
-		projectDir: options.projectDir,
-		publishDir: outDir,
-		owner: "droplet"
-	}));
-	if (!buildResult.success) {
-		const details = buildResult.error.details ? `\n${buildResult.error.details}` : "";
-		throw new Error(`${buildResult.error.message}${details}`);
+	let buildResult;
+	try {
+		const cliVersion = await getWidgetCliVersion();
+		buildResult = await withRootWidgetConfigBridge(options.projectDir, () => buildWidgetPackage$1({
+			projectDir: options.projectDir,
+			outDir: options.outDir,
+			owner: "droplet",
+			cliVersion
+		}));
+	} catch (error) {
+		if (error instanceof WidgetToolingError && error.details) throw new Error(`${error.message}\n${error.details}`, { cause: error });
+		throw error;
 	}
 	return {
-		outDir: buildResult.value.publishDir,
-		packageId: buildResult.value.packageId,
-		version: buildResult.value.version
+		outDir: buildResult.publishDir,
+		packageId: buildResult.packageId,
+		version: buildResult.version
 	};
 }
 const buildCommand = new Command("build").description("Validate and build the current droplet widget package").option("-o, --out-dir <dir>", "Widget artifact output directory", DEFAULT_WIDGET_OUT_DIR).option("--skip-typecheck", "Skip package typecheck script when present").action((options) => {
@@ -675,6 +976,42 @@ const buildCommand = new Command("build").description("Validate and build the cu
 	});
 });
 //#endregion
+//#region src/utils/auth-client.ts
+function createAuthenticatedClient() {
+	return { client: createAuthenticatedWidgetPackageClient() };
+}
+function createAuthenticatedWidgetPackageClient() {
+	const { profile, profileName, token } = resolveAuthenticatedProfile();
+	if (!token) {
+		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({
+		baseUrl: profile?.baseUrl ?? process.env["FLUID_API_BASE"] ?? "https://api.fluid.app",
+		getAuthToken: () => token
+	});
+}
+function resolveAuthenticatedProfile() {
+	const config = readConfig();
+	const projectConfig = findProjectConfig(process.cwd());
+	if (projectConfig?.profile) {
+		const profile = config.profiles[projectConfig.profile];
+		if (profile) return {
+			profile,
+			profileName: projectConfig.profile,
+			token: profile.token
+		};
+	}
+	if (!config.activeProfile) return {};
+	const profile = config.profiles[config.activeProfile];
+	if (!profile) return {};
+	return {
+		profile,
+		profileName: config.activeProfile,
+		token: profile.token
+	};
+}
+//#endregion
 //#region src/lib/git.ts
 /**
 * Git wrapper for the Fluid widget CLI — shells out to the system `git`
@@ -1039,6 +1376,224 @@ async function gitStashPop(cwd) {
 		throw new GitError("Couldn't restore your local changes after pulling — the edits collided with a teammate's. Run `git stash list` and resolve manually.", err.exitCode ?? 1);
 	}
 }
+/**
+* Local-only state that must never reach a widget's provisioned repo.
+*
+* `.mist-desktop/` is Mist Desktop's per-machine working state for the
+* project directory it opened — chat transcripts, user attachments,
+* screenshots, source baselines, media cache. When Desktop drives
+* `fluid widget push`, that directory sits in the project root, so a
+* whole-tree `git add -A` publishes every private conversation.
+* `.mist` is the sibling clone/slug marker.
+*
+* Mirrors the portal CLI (`packages/cli/portal/src/lib/git.ts`) and the
+* Mist CLI (`packages/cli/mist/src/lib/git.ts`).
+*/
+const LOCAL_ONLY_GIT_PATHS = [".mist", ".mist-desktop/"];
+/**
+* Append {@link LOCAL_ONLY_GIT_PATHS} to `.git/info/exclude` when absent.
+*
+* Why the local exclude and not `.gitignore`: `.gitignore` ships from the
+* widget starter template, so editing it would never reach the clones
+* already on people's machines. `.git/info/exclude` is per-checkout, so
+* writing it on every sync heals a pre-existing clone on its next push.
+*
+* Idempotent and best-effort: never throws. {@link gitAutoCommit} also
+* cleans these paths out of the index after staging.
+*/
+function excludeLocalStateFromGit(cwd) {
+	try {
+		const gitDir = path.join(cwd, ".git");
+		if (!existsSync(gitDir)) return;
+		const infoDir = path.join(gitDir, "info");
+		if (!existsSync(infoDir)) mkdirSync(infoDir, { recursive: true });
+		const excludePath = path.join(infoDir, "exclude");
+		const existing = existsSync(excludePath) ? readFileSync(excludePath, "utf8") : "";
+		const existingLines = new Set(existing.split("\n").map((line) => line.trim()).filter(Boolean));
+		const missing = LOCAL_ONLY_GIT_PATHS.filter((entry) => !existingLines.has(entry));
+		if (missing.length === 0) return;
+		writeFileSync(excludePath, `${existing}${existing.length > 0 && !existing.endsWith("\n") ? "\n" : ""}${missing.join("\n")}\n`, "utf8");
+	} catch {}
+}
+/**
+* Absolute path of the repository containing `cwd`, or `cwd` when
+* resolution fails. Every local-state defense anchors here: `git add -A`
+* stages the WHOLE repository, so a push run from a subdirectory would
+* otherwise look for `<subdir>/.git`, skip the exclude, and sweep the
+* root `.mist-desktop/` in anyway.
+*/
+async function resolveRepoRoot(cwd) {
+	try {
+		const { stdout } = await execa("git", ["rev-parse", "--show-toplevel"], { cwd });
+		const root = stdout.trim();
+		if (root.length > 0) return root;
+	} catch {}
+	return cwd;
+}
+/**
+* Repository-root-anchored {@link excludeLocalStateFromGit}. Run before
+* any working-tree cleanliness check: while `.mist-desktop/` is neither
+* tracked nor excluded it shows as untracked in `git status --porcelain`,
+* so a Desktop-driven push needlessly stashes/pops around a pull.
+*/
+async function ensureLocalStateExcluded(cwd) {
+	excludeLocalStateFromGit(await resolveRepoRoot(cwd));
+}
+/** Paths currently tracked under `.mist-desktop/`, or [] when none. */
+async function trackedLocalStatePaths(repoRoot) {
+	try {
+		const { stdout } = await execa("git", [
+			"ls-files",
+			"--",
+			".mist-desktop"
+		], { cwd: repoRoot });
+		return stdout.split("\n").filter((l) => l.trim().length > 0);
+	} catch {
+		return [];
+	}
+}
+/**
+* Untrack private Mist Desktop state and, if anything was tracked,
+* commit ONLY that removal so the next push deletes it from the remote.
+* Returns true when a purge commit was made.
+*
+* Must run regardless of working-tree cleanliness AND of `--no-commit`:
+* an older CLI could have committed chats to a checkout that is now
+* clean, and gating on either would skip the cleanup forever, leaving
+* the chats published.
+*
+* The commit is built through a THROWAWAY index (`GIT_INDEX_FILE`), not
+* the user's: `read-tree HEAD` → `rm --cached` → `write-tree` →
+* `commit-tree` → `update-ref`. A plain `git commit` would capture the
+* user's entire index, so anything they had pre-staged would be swept
+* into the purge commit and pushed — the exact thing `--no-commit`
+* exists to prevent. A pathspec commit (`git commit -- .mist-desktop`)
+* is also wrong: with `--only` git takes the *working tree* content of
+* those paths, and the chats are still on disk, so it would re-add
+* exactly what we are removing.
+*
+* The user's real index then gets the same scoped `rm --cached`, so any
+* other staged work stays staged and the working tree is never touched.
+*/
+async function purgeLocalStateFromIndex(cwd, message, identity = DEFAULT_COMMIT_IDENTITY) {
+	const repoRoot = await resolveRepoRoot(cwd);
+	if ((await trackedLocalStatePaths(repoRoot)).length === 0) return false;
+	let head;
+	try {
+		const { stdout } = await execa("git", ["rev-parse", "HEAD"], { cwd: repoRoot });
+		head = stdout.trim();
+		if (!head) return false;
+	} catch {
+		return false;
+	}
+	const tmpIndex = path.join(os.tmpdir(), `fluid-widget-purge-${process.pid}-${randomUUID()}.index`);
+	const indexEnv = {
+		...process.env,
+		GIT_INDEX_FILE: tmpIndex
+	};
+	let commitSha;
+	try {
+		await execa("git", ["read-tree", head], {
+			cwd: repoRoot,
+			env: indexEnv
+		});
+		await execa("git", [
+			"rm",
+			"-q",
+			"-r",
+			"--cached",
+			"--ignore-unmatch",
+			"--",
+			".mist-desktop"
+		], {
+			cwd: repoRoot,
+			env: indexEnv
+		});
+		const { stdout: tree } = await execa("git", ["write-tree"], {
+			cwd: repoRoot,
+			env: indexEnv
+		});
+		const { stdout: sha } = await execa("git", [
+			"commit-tree",
+			tree.trim(),
+			"-p",
+			head,
+			"-m",
+			message
+		], {
+			cwd: repoRoot,
+			env: {
+				...indexEnv,
+				...await identityEnv(repoRoot, identity)
+			}
+		});
+		commitSha = sha.trim();
+		if (!commitSha) return false;
+	} catch (err) {
+		const missing = gitMissingError(err);
+		if (missing) throw missing;
+		throw wrapGitError(err, "purge local state");
+	} finally {
+		rmSync(tmpIndex, { force: true });
+	}
+	try {
+		await execa("git", [
+			"update-ref",
+			"HEAD",
+			commitSha,
+			head
+		], { cwd: repoRoot });
+	} catch (err) {
+		throw wrapGitError(err, "purge local state");
+	}
+	try {
+		await execa("git", [
+			"rm",
+			"-q",
+			"-r",
+			"--cached",
+			"--ignore-unmatch",
+			"--",
+			".mist-desktop"
+		], { cwd: repoRoot });
+	} catch {}
+	return true;
+}
+/** `GIT_{AUTHOR,COMMITTER}_*` overrides for `commit-tree`, which (unlike
+*  `git commit`) fails outright rather than prompting when the repo has
+*  no identity. Only set what the repo itself doesn't define. */
+async function identityEnv(cwd, identity) {
+	const env = {};
+	const has = async (key) => {
+		try {
+			return (await execa("git", ["config", key], { cwd })).stdout.trim().length > 0;
+		} catch {
+			return false;
+		}
+	};
+	if (!await has("user.name")) {
+		env["GIT_AUTHOR_NAME"] = identity.name;
+		env["GIT_COMMITTER_NAME"] = identity.name;
+	}
+	if (!await has("user.email")) {
+		env["GIT_AUTHOR_EMAIL"] = identity.email;
+		env["GIT_COMMITTER_EMAIL"] = identity.email;
+	}
+	return env;
+}
+/** Shared `-c user.*` args: prefer the repo's configured identity, else
+*  the supplied synthetic one so the commit isn't rejected. */
+async function resolveIdentityArgs(cwd, identity) {
+	let hasName = false;
+	let hasEmail = false;
+	try {
+		hasName = (await execa("git", ["config", "user.name"], { cwd })).stdout.trim().length > 0;
+	} catch {}
+	try {
+		hasEmail = (await execa("git", ["config", "user.email"], { cwd })).stdout.trim().length > 0;
+	} catch {}
+	return [...hasName ? [] : ["-c", `user.name=${identity.name}`], ...hasEmail ? [] : ["-c", `user.email=${identity.email}`]];
+}
 const DEFAULT_COMMIT_IDENTITY = {
 	name: "Fluid CLI",
 	email: "cli@fluid.app"
@@ -1051,22 +1606,54 @@ const DEFAULT_COMMIT_IDENTITY = {
 * commit per push. If the repo has no configured user.name / user.email we
 * pass a synthetic identity so the commit isn't rejected. "nothing to commit"
 * is treated as a no-op rather than an error.
+*
+* Scope: `add -A` stages the whole work tree, bounded by the project
+* `.gitignore` — which can't cover tool-local state written INTO the
+* project by whatever opened it (Mist Desktop's `.mist-desktop/` chats and
+* the `.mist` marker). Belt and suspenders, all repo-root-anchored:
+*
+*   1. {@link excludeLocalStateFromGit} — idempotent `.git/info/exclude`
+*      write so `git add` never sees the paths. Heals old clones.
+*   2. `git reset -- ':(top).mist' .mist` — unstages the marker if step 1
+*      silently failed. We deliberately do NOT pass `:(exclude)` to
+*      `git add`: when the path is also in `.git/info/exclude`, git exits
+*      1 with "paths are ignored by one of your .gitignore files", which
+*      would turn the already-healed case into a hard failure.
+*   3. `git rm --cached -r --ignore-unmatch .mist-desktop` — untracks
+*      chats an older push already committed (ignore rules can't untrack).
+*      `--cached` keeps every file on disk.
+*
+* Steps 2 and 3 are best-effort and never fail the push.
 */
 async function gitAutoCommit(cwd, message, identity = DEFAULT_COMMIT_IDENTITY) {
+	const repoRoot = await resolveRepoRoot(cwd);
+	excludeLocalStateFromGit(repoRoot);
 	try {
 		await execa("git", ["add", "-A"], { cwd });
 	} catch (err) {
 		throw wrapGitError(err, "add");
 	}
-	let hasName = false;
-	let hasEmail = false;
 	try {
-		hasName = (await execa("git", ["config", "user.name"], { cwd })).stdout.trim().length > 0;
+		await execa("git", [
+			"reset",
+			"-q",
+			"--",
+			":(top).mist",
+			".mist"
+		], { cwd });
 	} catch {}
 	try {
-		hasEmail = (await execa("git", ["config", "user.email"], { cwd })).stdout.trim().length > 0;
+		await execa("git", [
+			"rm",
+			"-q",
+			"-r",
+			"--cached",
+			"--ignore-unmatch",
+			"--",
+			".mist-desktop"
+		], { cwd: repoRoot });
 	} catch {}
-	const identityArgs = [...hasName ? [] : ["-c", `user.name=${identity.name}`], ...hasEmail ? [] : ["-c", `user.email=${identity.email}`]];
+	const identityArgs = await resolveIdentityArgs(cwd, identity);
 	try {
 		await execa("git", [
 			...identityArgs,
@@ -1235,138 +1822,6 @@ const cloneCommand = new Command("clone").description("Clone a widget package's
 	console.log(chalk.dim(`  cd ${path.relative(process.cwd(), targetDir) || "."}`));
 	if (options.skipInstall === true) console.log(chalk.dim(`  ${installCommand}`));
 }));
-//#endregion
-//#region src/utils/template.ts
-const EMBEDDED_PORTAL_SDK_VERSION = "0.1.461";
-const EMBEDDED_CLI_CORE_VERSION = "0.1.14";
-const EMBEDDED_CLI_WIDGET_VERSION = "0.1.27";
-function getDefaultTemplatePath() {
-	return path.join(findPackageRoot(), "templates", "default");
-}
-async function directoryExists(filePath) {
-	try {
-		return (await stat(filePath)).isDirectory();
-	} catch {
-		return false;
-	}
-}
-async function copyWidgetTemplate(templatePath, targetPath, variables) {
-	const files = await getFiles(templatePath);
-	for (const file of files) {
-		const sourcePath = path.join(templatePath, file);
-		const isTemplate = file.endsWith(".template");
-		const outputFiles = getOutputFilenames(file);
-		const content = await readFile(sourcePath, "utf-8");
-		await writeOutputFiles(targetPath, outputFiles, isTemplate ? renderTemplate(content, variables) : content);
-	}
-	for (const skillFile of await getSharedTemplateSkillFiles()) await writeOutputFiles(targetPath, getOutputFilenames(skillFile.relativePath), skillFile.content);
-}
-async function getPortalSdkVersion(options = {}) {
-	return getWorkspacePackageVersion(["portal", "sdk"], EMBEDDED_PORTAL_SDK_VERSION, options);
-}
-async function getPortalCoreVersion(options = {}) {
-	return getWorkspacePackageVersion(["portal", "core"], void 0, options);
-}
-async function getCliVersion(options = {}) {
-	return getWorkspacePackageVersion(["cli", "core"], EMBEDDED_CLI_CORE_VERSION, options);
-}
-async function getWidgetCliVersion(options = {}) {
-	return getWorkspacePackageVersion(["cli", "widget"], EMBEDDED_CLI_WIDGET_VERSION, options);
-}
-async function getWorkspacePackageVersion(packagePathSegments, embeddedVersion, options) {
-	try {
-		const packageRoot = findPackageRoot();
-		const packagesRoot = path.join(packageRoot, "..", "..");
-		const targetPackageRoot = path.join(packagesRoot, ...packagePathSegments);
-		if (options.local) return `link:${(options.targetPath ? path.relative(options.targetPath, targetPackageRoot) : targetPackageRoot).replace(/\\/g, "/") || "."}`;
-		if (embeddedVersion) return embeddedVersion;
-		const packageJsonPath = path.join(targetPackageRoot, "package.json");
-		const content = await readFile(packageJsonPath, "utf-8");
-		const pkg = JSON.parse(content);
-		if (typeof pkg.version !== "string") throw new Error(`Missing version in ${packageJsonPath}`);
-		return pkg.version;
-	} catch (error) {
-		if (embeddedVersion) return embeddedVersion;
-		throw new Error(`Could not resolve the exact template package version for ${packagePathSegments.join("/")}`, { cause: error });
-	}
-}
-async function getFiles(dir, baseDir = dir) {
-	const entries = await readdir(dir, { withFileTypes: true });
-	const files = [];
-	for (const entry of entries) {
-		const fullPath = path.join(dir, entry.name);
-		if (entry.isDirectory()) files.push(...await getFiles(fullPath, baseDir));
-		else files.push(path.relative(baseDir, fullPath));
-	}
-	return files;
-}
-async function getSharedTemplateSkillFiles() {
-	const packageRoot = findFluidCliPackageRoot();
-	const skillsRoot = path.join(packageRoot, "template-skills");
-	const files = await getFiles(skillsRoot);
-	return Promise.all(files.map(async (file) => ({
-		relativePath: path.join("skills", file),
-		content: await readFile(path.join(skillsRoot, file), "utf-8")
-	})));
-}
-function findFluidCliPackageRoot() {
-	const workspacePackageRoot = path.join(findPackageRoot(), "..", "core");
-	if (existsSync(path.join(workspacePackageRoot, "template-skills"))) return workspacePackageRoot;
-	let dir = path.dirname(fileURLToPath(import.meta.resolve("@fluid-app/fluid-cli")));
-	while (!existsSync(path.join(dir, "package.json"))) {
-		const parent = path.dirname(dir);
-		if (parent === dir) throw new Error("Could not find Fluid CLI package root");
-		dir = parent;
-	}
-	return dir;
-}
-function renderTemplate(content, variables) {
-	return content.replace(/{{\s*#if\s+([a-zA-Z0-9_]+)\s*}}([\s\S]*?){{\s*\/if\s*}}/g, (match, key, block) => {
-		if (!isTemplateVariableKey(key)) return match;
-		return variables[key] ? String(block) : "";
-	}).replace(/{{\s*([a-zA-Z0-9_]+)\s*}}/g, (match, key) => {
-		if (isTemplateVariableKey(key)) return variables[key] ?? "";
-		return match;
-	});
-}
-function isTemplateVariableKey(key) {
-	return [
-		"projectName",
-		"widgetScope",
-		"widgetPackageVersion",
-		"sdkVersion",
-		"localCoreVersion",
-		"fluidCliVersion",
-		"widgetCliVersion",
-		"droplet"
-	].includes(key);
-}
-async function writeOutputFiles(targetPath, outputFiles, content) {
-	for (const outputFile of outputFiles) {
-		const destinationPath = path.join(targetPath, outputFile);
-		await mkdir(path.dirname(destinationPath), { recursive: true });
-		await writeFile(destinationPath, content, "utf-8");
-	}
-}
-function getOutputFilenames(filename) {
-	const outputFilename = getOutputFilename(filename);
-	const normalized = outputFilename.replace(/\\/g, "/");
-	if (normalized === "AGENTS.md") return ["AGENTS.md", "CLAUDE.md"];
-	if (normalized.startsWith("skills/")) return [path.join(".agents", outputFilename), path.join(".claude", outputFilename)];
-	return [outputFilename];
-}
-function getOutputFilename(filename) {
-	return filename.endsWith(".template") ? filename.slice(0, -9) : filename;
-}
-function findPackageRoot() {
-	let dir = path.dirname(fileURLToPath(import.meta.url));
-	while (!existsSync(path.join(dir, "package.json"))) {
-		const parent = path.dirname(dir);
-		if (parent === dir) throw new Error("Could not find widget CLI package root");
-		dir = parent;
-	}
-	return dir;
-}
 /**
 * The template repo to clone. Overridable via `FLUID_WIDGET_TEMPLATE_REPO`
 * (read at call time so tests can point at a local repo). Falls back to the
@@ -1697,11 +2152,6 @@ function isRecord$2(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
-//#region src/utils/auth-client.ts
-function createAuthenticatedClient() {
-	return { client: createAuthenticatedWidgetPackageClient() };
-}
-//#endregion
 //#region src/utils/droplets.ts
 const MAX_DROPLET_PAGES = 100;
 async function promptForDroplet(client) {
@@ -1955,29 +2405,7 @@ function parseLimit(value) {
 }
 //#endregion
 //#region src/commands/publish.ts
-async function publishWidgetPackage(options, dependencies) {
-	if (dependencies) {
-		await dependencies.buildWidgetPackage({
-			projectDir: options.projectDir,
-			outDir: options.outDir
-		});
-		const dryRun = options.dryRun === true;
-		if (dryRun) return {
-			dryRun,
-			uploaded: false,
-			outDir: options.outDir
-		};
-		await dependencies.uploadWidgetPackage({
-			outDir: options.outDir,
-			droplet: options.droplet,
-			client: options.client
-		});
-		return {
-			dryRun,
-			uploaded: true,
-			outDir: options.outDir
-		};
-	}
+async function publishWidgetPackage(options) {
 	const droplet = await resolvePublishDroplet(options.projectDir, options.droplet);
 	await validateDropletWidgetProject(options.projectDir, droplet);
 	if (options.skipTypecheck !== true) await runPackageScriptIfAvailable({
@@ -1985,16 +2413,11 @@ async function publishWidgetPackage(options, dependencies) {
 		scriptName: "typecheck"
 	});
 	const dryRun = options.dryRun === true;
-	await withRootWidgetConfigBridge(options.projectDir, () => publishWidgetRuntimeArtifacts({
+	await withRootWidgetConfigBridge(options.projectDir, () => publishDropletWidgetPackageArtifacts({
 		projectDir: options.projectDir,
 		outDir: options.outDir,
-		buildOwner: "droplet",
-		uploadOwner: {
-			kind: "droplet",
-			uuid: droplet
-		},
-		dryRun,
-		...dryRun ? {} : { client: createAuthenticatedWidgetPackageClient() }
+		droplet,
+		dryRun
 	}), droplet);
 	return {
 		dryRun,
@@ -2029,16 +2452,11 @@ const publishCommand = new Command("publish").description("Publish a Fluid widge
 			else typecheckSpinner.info("No typecheck script found; skipping");
 		}
 		const publishSpinner = ora(dryRun ? "Building and preparing dry-run upload payload..." : "Building and publishing widget artifacts...").start();
-		const result = await withRootWidgetConfigBridge(projectDir, () => publishWidgetRuntimeArtifacts({
+		const result = await withRootWidgetConfigBridge(projectDir, () => publishDropletWidgetPackageArtifacts({
 			projectDir,
 			outDir,
-			buildOwner: "droplet",
-			uploadOwner: {
-				kind: "droplet",
-				uuid: droplet
-			},
-			dryRun,
-			...dryRun ? {} : { client: createAuthenticatedWidgetPackageClient() }
+			droplet,
+			dryRun
 		}), droplet);
 		publishSpinner.succeed(dryRun ? "Prepared dry-run upload payload" : "Published widget package");
 		if (dryRun) {
@@ -2064,6 +2482,47 @@ async function resolvePublishDroplet(projectDir, override) {
 	}
 	throw new Error("Missing droplet UUID. Pass --droplet <uuid> or set droplet in fluid.widget.config.ts.");
 }
+async function publishDropletWidgetPackageArtifacts(options) {
+	const common = {
+		projectDir: options.projectDir,
+		outDir: options.outDir,
+		owner: "droplet",
+		uploadOwner: {
+			kind: "droplet",
+			uuid: options.droplet
+		},
+		cliVersion: await getWidgetCliVersion()
+	};
+	if (options.dryRun) return publishWidgetPackage$1({
+		...common,
+		dryRun: true
+	});
+	return publishWidgetPackage$1({
+		...common,
+		dryRun: false,
+		client: createAuthenticatedWidgetPackageClient()
+	});
+}
+function printRuntimeOnlyNotice() {
+	console.log(chalk.yellow("This publishes widget runtime artifacts only; it does not deploy the hosted portal shell."));
+	console.log();
+}
+function printDryRunSessionPayload(result) {
+	console.log(chalk.bold("Dry-run upload session payload:"));
+	console.log(JSON.stringify(result.publish.sessionPayload, null, 2));
+	console.log();
+}
+function printWidgetPublishSummary(options) {
+	console.log();
+	console.log(chalk.green.bold(`${options.title} complete`));
+	console.log();
+	console.log(chalk.gray("Owner:       ") + chalk.white(options.ownerLabel));
+	console.log(chalk.gray("Package:     ") + chalk.white(options.result.build.packageId));
+	console.log(chalk.gray("Version:     ") + chalk.white(options.result.build.version));
+	console.log(chalk.gray("Output:      ") + chalk.cyan(options.outDir));
+	console.log(chalk.gray("Artifacts:   ") + chalk.white(String(options.result.request.artifacts.length)));
+	console.log();
+}
 //#endregion
 //#region src/utils/me.ts
 function str(value) {
@@ -2095,6 +2554,7 @@ async function syncWidgetGitRepo(options) {
 	const { cwd, client } = options;
 	const branch = options.branch ?? "main";
 	if (!await isGitRepository(cwd)) await gitInit(cwd, branch);
+	await ensureLocalStateExcluded(cwd);
 	const cred = await mintWidgetGitCredential({
 		client,
 		droplet: options.droplet
@@ -2121,6 +2581,7 @@ async function syncWidgetGitRepo(options) {
 			}
 		} else pulled = await gitAdoptFetchHead(cwd);
 	}
+	await purgeLocalStateFromIndex(cwd, "Remove private Mist Desktop state from the widget repository", await resolveCommitIdentity(client));
 	let committed = false;
 	if (options.commit !== false && await hasUncommittedChanges(cwd)) {
 		await gitAutoCommit(cwd, await buildCommitMessage(client, options.message), await resolveCommitIdentity(client));