kitcn 0.16.0 → 0.17.0

package/dist/{builder-DBgto1yn.js → builder-f4F_NRvK.js}

@@ -745,6 +745,20 @@ var CRPCError = class extends ConvexError {
 function isOrmNotFoundErrorLike(cause) {
 	return cause instanceof Error && cause.name === "OrmNotFoundError";
 }
+function isConvexErrorLike(cause) {
+	return cause instanceof Error && "data" in cause;
+}
+/**
+* `ctx.runQuery`/`ctx.runMutation` never rethrow the original error object:
+* Convex builds a fresh `ConvexError` from the message and re-attaches `.data`.
+* A cRPC error therefore arrives as a plain `ConvexError` whose `data` still
+* carries the original `code`/`message`.
+*/
+function isCRPCErrorData(data) {
+	if (!data || typeof data !== "object" || Array.isArray(data)) return false;
+	const { code, message } = data;
+	return typeof code === "string" && code in CRPC_ERROR_CODES_BY_KEY && (message === void 0 || typeof message === "string");
+}
 function isApiErrorLike(cause) {
 	return cause instanceof Error && cause.name === "APIError" && typeof cause.statusCode === "number";
 }
@@ -785,6 +799,17 @@ function getApiErrorMessage(cause) {
 function toCRPCError(cause) {
 	if (cause instanceof CRPCError) return cause;
 	if (cause instanceof Error && cause.name === "CRPCError") return cause;
+	if (isConvexErrorLike(cause) && isCRPCErrorData(cause.data)) {
+		const { code, message, ...data } = cause.data;
+		const err = new CRPCError({
+			code,
+			message,
+			cause,
+			data
+		});
+		if (cause.stack) err.stack = cause.stack;
+		return err;
+	}
 	if (isOrmNotFoundErrorLike(cause)) {
 		const err = new CRPCError({
 			code: "NOT_FOUND",
@@ -845,6 +870,44 @@ function isCRPCError(error) {
 	return error instanceof CRPCError;
 }
 
+//#endregion
+//#region src/server/middleware-runner.ts
+/** Run middleware around a terminal procedure resolver. */
+const executeMiddlewares = async (middlewares, ctx, meta, procedure, input, getRawInput, resolve, index = 0) => {
+	if (index >= middlewares.length) return {
+		marker: void 0,
+		ctx,
+		input,
+		output: await resolve({
+			ctx,
+			input
+		})
+	};
+	const middleware = middlewares[index];
+	let currentInput = input;
+	let innerResult;
+	const next = async (opts) => {
+		const nextCtx = opts?.ctx ?? ctx;
+		if (opts?.input !== void 0) currentInput = opts.input;
+		innerResult = await executeMiddlewares(middlewares, nextCtx, meta, procedure, currentInput, getRawInput, resolve, index + 1);
+		return innerResult;
+	};
+	const result = await middleware({
+		ctx,
+		meta,
+		procedure,
+		input,
+		getRawInput,
+		next
+	});
+	return {
+		marker: void 0,
+		ctx: result.ctx ?? ctx,
+		input: result.input ?? innerResult?.input ?? currentInput,
+		output: result.output ?? innerResult?.output
+	};
+};
+
 //#endregion
 //#region src/server/http-builder.ts
 function extractPathParams(path) {
@@ -865,29 +928,41 @@ function matchPathParams(template, pathname) {
 	return params;
 }
 function handleHttpError(error) {
-	if (error instanceof CRPCError) {
-		const status = {
-			BAD_REQUEST: 400,
-			UNAUTHORIZED: 401,
-			FORBIDDEN: 403,
-			NOT_FOUND: 404,
-			METHOD_NOT_SUPPORTED: 405,
-			CONFLICT: 409,
-			UNPROCESSABLE_CONTENT: 422,
-			TOO_MANY_REQUESTS: 429,
-			INTERNAL_SERVER_ERROR: 500
-		}[error.code] ?? 500;
-		return Response.json({ error: {
-			code: error.code,
-			message: error.message
-		} }, { status });
-	}
+	const crpcError = toCRPCError(error);
+	if (crpcError) return Response.json({ error: {
+		code: crpcError.code,
+		message: crpcError.message
+	} }, { status: getHTTPStatusCodeFromError(crpcError) });
 	console.error("Unhandled HTTP error:", error);
 	return Response.json({ error: {
 		code: "INTERNAL_SERVER_ERROR",
 		message: "An unexpected error occurred"
 	} }, { status: 500 });
 }
+/** Read a JSON body, reporting parse failures as client errors. */
+async function readJsonBody(request) {
+	try {
+		return await request.json();
+	} catch (cause) {
+		throw new CRPCError({
+			code: "BAD_REQUEST",
+			message: "Invalid JSON body",
+			cause
+		});
+	}
+}
+/** Read a form body, reporting parse failures as client errors. */
+async function readFormDataBody(request) {
+	try {
+		return await request.formData();
+	} catch (cause) {
+		throw new CRPCError({
+			code: "BAD_REQUEST",
+			message: "Invalid form data",
+			cause
+		});
+	}
+}
 function getBaseSchema(schema) {
 	if (schema instanceof z.ZodOptional || schema instanceof z.ZodNullable) return getBaseSchema(schema.unwrap());
 	if (schema instanceof z.ZodDefault) return getBaseSchema(schema._def.innerType);
@@ -949,109 +1024,86 @@ function createProcedure(def, handler, _type) {
 		try {
 			const url = new URL(request.url);
 			const pathParams = c.req.param() ?? matchPathParams(def.route.path, url.pathname) ?? {};
-			let ctx = def.functionConfig.createContext(convexCtx);
+			const initialCtx = def.functionConfig.createContext(convexCtx);
 			const getRawInput = async () => {
-				if ((request.headers.get("content-type") ?? "").includes("application/json")) return request.clone().json();
+				if ((request.headers.get("content-type") ?? "").includes("application/json")) return readJsonBody(request.clone());
 				return null;
 			};
-			let currentInput;
-			for (const middleware of def.middlewares) {
-				const result = await middleware({
-					ctx,
-					procedure: middlewareProcedure,
-					input: currentInput,
-					getRawInput,
-					next: async (opts) => {
-						if (opts?.ctx) ctx = {
-							...ctx,
-							...opts.ctx
-						};
-						if (opts?.input !== void 0) currentInput = opts.input;
-						return {
-							ctx,
-							marker: void 0
-						};
-					},
-					meta: def.meta
-				});
-				if (result?.ctx) ctx = {
-					...ctx,
-					...result.ctx
-				};
-			}
-			let parsedParams;
-			if (def.paramsSchema) try {
-				parsedParams = def.paramsSchema.parse(pathParams);
-			} catch (error) {
-				if (error instanceof z.ZodError) throw new CRPCError({
-					code: "BAD_REQUEST",
-					message: "Invalid path params",
-					cause: error
-				});
-				throw error;
-			}
-			let parsedQuery;
-			if (def.querySchema) {
-				const queryParams = parseQueryParams(url, def.querySchema);
-				try {
-					parsedQuery = def.querySchema.parse(queryParams);
+			return (await executeMiddlewares(def.middlewares, initialCtx, def.meta, middlewareProcedure, void 0, getRawInput, async ({ ctx }) => {
+				let parsedParams;
+				if (def.paramsSchema) try {
+					parsedParams = def.paramsSchema.parse(pathParams);
 				} catch (error) {
 					if (error instanceof z.ZodError) throw new CRPCError({
 						code: "BAD_REQUEST",
-						message: "Invalid query params",
+						message: "Invalid path params",
 						cause: error
 					});
 					throw error;
 				}
-			}
-			let parsedInput;
-			if (def.inputSchema && request.method !== "GET") {
-				const contentType = request.headers.get("content-type") ?? "";
-				let body;
-				if (contentType.includes("application/json")) body = await request.json();
-				else if (contentType.includes("application/x-www-form-urlencoded")) {
-					const formData = await request.formData();
-					body = Object.fromEntries(formData.entries());
-				} else body = await request.json().catch(() => ({}));
-				try {
-					parsedInput = def.inputSchema.parse(def.functionConfig.transformer.input.deserialize(body));
-				} catch (error) {
-					if (error instanceof z.ZodError) throw new CRPCError({
-						code: "BAD_REQUEST",
-						message: "Invalid input",
-						cause: error
-					});
-					throw error;
+				let parsedQuery;
+				if (def.querySchema) {
+					const queryParams = parseQueryParams(url, def.querySchema);
+					try {
+						parsedQuery = def.querySchema.parse(queryParams);
+					} catch (error) {
+						if (error instanceof z.ZodError) throw new CRPCError({
+							code: "BAD_REQUEST",
+							message: "Invalid query params",
+							cause: error
+						});
+						throw error;
+					}
 				}
-			}
-			let parsedForm;
-			if (def.formSchema && request.method !== "GET") {
-				const formData = await request.formData();
-				const formObj = {};
-				for (const [key, value] of formData.entries()) formObj[key] = value;
-				try {
-					parsedForm = def.formSchema.parse(formObj);
-				} catch (error) {
-					if (error instanceof z.ZodError) throw new CRPCError({
-						code: "BAD_REQUEST",
-						message: "Invalid form data",
-						cause: error
-					});
-					throw error;
+				let parsedInput;
+				if (def.inputSchema && request.method !== "GET") {
+					const contentType = request.headers.get("content-type") ?? "";
+					let body;
+					if (contentType.includes("application/json")) body = await readJsonBody(request);
+					else if (contentType.includes("application/x-www-form-urlencoded")) {
+						const formData = await readFormDataBody(request);
+						body = Object.fromEntries(formData.entries());
+					} else body = await request.json().catch(() => ({}));
+					try {
+						parsedInput = def.inputSchema.parse(def.functionConfig.transformer.input.deserialize(body));
+					} catch (error) {
+						if (error instanceof z.ZodError) throw new CRPCError({
+							code: "BAD_REQUEST",
+							message: "Invalid input",
+							cause: error
+						});
+						throw error;
+					}
 				}
-			}
-			const handlerOpts = {
-				ctx,
-				c
-			};
-			if (parsedInput !== void 0) handlerOpts.input = parsedInput;
-			if (parsedParams !== void 0) handlerOpts.params = parsedParams;
-			if (parsedQuery !== void 0) handlerOpts.searchParams = parsedQuery;
-			if (parsedForm !== void 0) handlerOpts.form = parsedForm;
-			const result = await handler(handlerOpts);
-			if (result instanceof Response) return result;
-			const output = def.outputSchema ? def.outputSchema.parse(result) : result;
-			return c.json(def.functionConfig.transformer.output.serialize(output));
+				let parsedForm;
+				if (def.formSchema && request.method !== "GET") {
+					const formData = await readFormDataBody(request);
+					const formObj = {};
+					for (const [key, value] of formData.entries()) formObj[key] = value;
+					try {
+						parsedForm = def.formSchema.parse(formObj);
+					} catch (error) {
+						if (error instanceof z.ZodError) throw new CRPCError({
+							code: "BAD_REQUEST",
+							message: "Invalid form data",
+							cause: error
+						});
+						throw error;
+					}
+				}
+				const handlerOpts = {
+					ctx,
+					c
+				};
+				if (parsedInput !== void 0) handlerOpts.input = parsedInput;
+				if (parsedParams !== void 0) handlerOpts.params = parsedParams;
+				if (parsedQuery !== void 0) handlerOpts.searchParams = parsedQuery;
+				if (parsedForm !== void 0) handlerOpts.form = parsedForm;
+				const result = await handler(handlerOpts);
+				if (result instanceof Response) return result;
+				const output = def.outputSchema ? def.outputSchema.parse(result) : result;
+				return c.json(def.functionConfig.transformer.output.serialize(output));
+			})).output;
 		} catch (error) {
 			return handleHttpError(error);
 		}
@@ -1541,34 +1593,6 @@ const resolveProcedureInfo = (type, procedureName, procedureFn) => {
 		name: (procedureFn && typeof procedureFn === "object" && typeof procedureFn[FUNCTION_NAME_SYMBOL] === "string" ? procedureFn[FUNCTION_NAME_SYMBOL] : void 0) ?? procedureName
 	};
 };
-/** Execute middleware chain recursively with input access */
-async function executeMiddlewares(middlewares, ctx, meta, procedure, input, getRawInput, index = 0) {
-	if (index >= middlewares.length) return {
-		marker: void 0,
-		ctx,
-		input
-	};
-	const middleware = middlewares[index];
-	let currentInput = input;
-	const next = async (opts) => {
-		const nextCtx = opts?.ctx ?? ctx;
-		const nextInput = opts?.input ?? currentInput;
-		if (opts?.input !== void 0) currentInput = opts.input;
-		return await executeMiddlewares(middlewares, nextCtx, meta, procedure, nextInput, getRawInput, index + 1);
-	};
-	return {
-		marker: void 0,
-		ctx: (await middleware({
-			ctx,
-			meta,
-			procedure,
-			input,
-			getRawInput,
-			next
-		})).ctx ?? ctx,
-		input: currentInput
-	};
-}
 const isPlainObject = (value) => !!value && typeof value === "object" && !Array.isArray(value) && !(value instanceof Date);
 const toConvexSafeValue = (value) => {
 	if (value instanceof Date) return value.getTime();
@@ -1686,22 +1710,92 @@ const replaceUnencodableInputTypes = (schema) => {
 	if (schema instanceof z.ZodDefault) return replaceUnencodableInputTypes(schema.removeDefault());
 	return schema;
 };
+/**
+* Rebuild a shape from the Convex validator it produces.
+*
+* The result is structurally identical (so the generated Convex validator is
+* unchanged) but carries no checks, transforms, or defaults. cRPC's own
+* `.input()` parse stays the single authoritative one, so refinements and
+* transforms never run twice.
+*/
+const toWireShape = (shape) => {
+	try {
+		return convexToZodFields(zodToConvexFields(shape));
+	} catch {
+		return shape;
+	}
+};
 const resolveConvexArgsShape = (inputShape) => {
 	if (!inputShape) return;
 	const rawSchema = z.object(inputShape);
 	try {
 		zodToConvex(rawSchema);
-		return inputShape;
+		return toWireShape(inputShape);
 	} catch {
 		const compatibleSchema = replaceUnencodableInputTypes(rawSchema);
 		try {
 			zodToConvex(compatibleSchema);
-			return compatibleSchema.shape;
+			return toWireShape(compatibleSchema.shape);
 		} catch {
 			return Object.fromEntries(Object.keys(inputShape).map((key) => [key, z.any()]));
 		}
 	}
 };
+/**
+* Strip the field validators for keys a later `.input()` redeclares.
+*
+* The keys stay on the schema so its object-level checks still see them - and
+* read the value their owner parsed - while only the last declaration validates
+* them. `safeExtend` is the one zod object operation that rewrites keys on a
+* schema carrying object-level checks; `omit` and `extend` both refuse.
+*/
+const relaxSupersededKeys = (schema, superseded) => {
+	if (superseded.length === 0) return schema;
+	try {
+		return schema.safeExtend(Object.fromEntries(superseded.map((key) => [key, z.any()])));
+	} catch {
+		return schema;
+	}
+};
+/**
+* Parse the wire payload through every `.input()` schema.
+*
+* Each schema parses only the keys it owns - the last `.input()` to declare a
+* key wins, matching the merged shape the Convex arg validator is built from -
+* so object-level checks run against the shape they were written for without an
+* earlier, superseded declaration vetoing the payload.
+*/
+const parseInput = (inputSchemas, value) => {
+	try {
+		if (inputSchemas.length === 1) return inputSchemas[0].parse(value);
+		const ownerOf = /* @__PURE__ */ new Map();
+		inputSchemas.forEach((schema, index) => {
+			for (const key of Object.keys(schema.shape)) ownerOf.set(key, index);
+		});
+		const source = isPlainObject(value) ? value : {};
+		const parsed = {};
+		for (let index = inputSchemas.length - 1; index >= 0; index -= 1) {
+			const schema = inputSchemas[index];
+			const keys = Object.keys(schema.shape);
+			const superseded = new Set(keys.filter((key) => ownerOf.get(key) !== index));
+			const scoped = relaxSupersededKeys(schema, [...superseded]);
+			const narrowed = {};
+			for (const key of keys) {
+				if (superseded.has(key)) {
+					if (key in parsed) narrowed[key] = parsed[key];
+					continue;
+				}
+				if (Object.hasOwn(source, key)) narrowed[key] = source[key];
+			}
+			const result = scoped.parse(narrowed);
+			for (const key of keys) if (ownerOf.get(key) === index && key in result) parsed[key] = result[key];
+		}
+		return parsed;
+	} catch (cause) {
+		if (cause instanceof z.ZodError) throw new ConvexError({ ZodError: JSON.parse(JSON.stringify(cause.issues, null, 2)) });
+		throw cause;
+	}
+};
 const resolveConvexReturnsSchema = (schema) => {
 	if (!schema) return;
 	try {
@@ -1744,7 +1838,7 @@ var ProcedureBuilder = class {
 	_input(schema) {
 		return {
 			...this._def,
-			inputSchemas: [...this._def.inputSchemas, schema.shape]
+			inputSchemas: [...this._def.inputSchemas, schema]
 		};
 	}
 	/** Define output schema - to be overridden by subclasses */
@@ -1771,17 +1865,15 @@ var ProcedureBuilder = class {
 			procedureName: value
 		};
 	}
-	/** Merge all input schemas into one */
+	/** Merge every `.input()` shape - used to build the Convex arg validator */
 	_getMergedInput() {
 		const { inputSchemas } = this._def;
 		if (inputSchemas.length === 0) return;
-		return Object.assign({}, ...inputSchemas);
+		return Object.assign({}, ...inputSchemas.map((schema) => schema.shape));
 	}
 	_createFunction(handler, baseFunction, customFn, fnType) {
-		const { middlewares, outputSchema, meta, procedureName, functionConfig, isInternal } = this._def;
-		const mergedInput = this._getMergedInput();
-		const inputSchema = mergedInput ? z.object(mergedInput) : void 0;
-		const convexArgs = resolveConvexArgsShape(mergedInput);
+		const { middlewares, inputSchemas, outputSchema, meta, procedureName, functionConfig, isInternal } = this._def;
+		const convexArgs = resolveConvexArgsShape(this._getMergedInput());
 		const customFunction = customFn(baseFunction, customCtx(async (_ctx) => withConvexSafeRunners(await functionConfig.createContext(_ctx))));
 		const returnsSchema = resolveConvexReturnsSchema(outputSchema);
 		const typedReturnsSchema = returnsSchema;
@@ -1794,16 +1886,16 @@ var ProcedureBuilder = class {
 			...typedReturnsSchema ? { returns: typedReturnsSchema } : {},
 			handler: async (ctx, rawInput) => {
 				const decodedInput = functionConfig.transformer.input.deserialize(rawInput);
-				const parsedInput = inputSchema ? inputSchema.parse(decodedInput) : decodedInput;
+				const parsedInput = inputSchemas.length > 0 ? parseInput(inputSchemas, decodedInput) : decodedInput;
 				const getRawInput = async () => parsedInput;
 				try {
-					const result = await executeMiddlewares(middlewares, ctx, meta, resolveProcedureInfo(fnType, resolvedProcedureName, fn), parsedInput, getRawInput);
-					const handlerInput = result.input === parsedInput ? parsedInput : functionConfig.transformer.input.deserialize(result.input ?? parsedInput);
-					const output = await handler({
-						ctx: result.ctx,
-						input: handlerInput
+					const result = await executeMiddlewares(middlewares, ctx, meta, resolveProcedureInfo(fnType, resolvedProcedureName, fn), parsedInput, getRawInput, async ({ ctx: resolvedCtx, input: resolvedInput }) => {
+						return await handler({
+							ctx: resolvedCtx,
+							input: resolvedInput === parsedInput ? parsedInput : functionConfig.transformer.input.deserialize(resolvedInput ?? parsedInput)
+						});
 					});
-					const validatedOutput = shouldValidateOutputWithZod ? outputSchema.parse(output) : output;
+					const validatedOutput = shouldValidateOutputWithZod ? outputSchema.parse(result.output) : result.output;
 					return functionConfig.transformer.output.serialize(validatedOutput);
 				} catch (cause) {
 					const err = toCRPCError(cause);
@@ -1868,7 +1960,7 @@ var QueryProcedureBuilder = class QueryProcedureBuilder extends ProcedureBuilder
 		});
 		return new QueryProcedureBuilder({
 			...this._def,
-			inputSchemas: [...this._def.inputSchemas, paginationSchemaWithDefault.shape],
+			inputSchemas: [...this._def.inputSchemas, paginationSchemaWithDefault],
 			outputSchema,
 			meta: {
 				...this._def.meta,

package/dist/{caller-factory-NEfgD5E0.js → caller-factory-DHywSoGZ.js}

@@ -1,3 +1,4 @@
+import { n as defaultIsUnauthorized } from "./error-Bvo7YEhk.js";
 import { i as getFunctionType, n as getFuncRef, t as buildMetaIndex } from "./meta-utils-D9K4fICl.js";
 import { s as getTransformer } from "./transformer-C6pGVHqx.js";
 import { fetchAction, fetchMutation, fetchQuery } from "convex/nextjs";
@@ -147,15 +148,16 @@ function createCallerFactory(opts) {
 	const siteUrl = parseConvexSiteUrl(opts.convexSiteUrl);
 	const convexUrl = getConvexUrl(siteUrl, opts.convexUrl);
 	const getToken = opts.auth?.getToken ?? noAuthGetToken;
-	const isUnauthorized = opts.auth?.isUnauthorized;
+	const isRetryableAuthError = opts.auth ? opts.auth.isUnauthorized ?? defaultIsUnauthorized : void 0;
+	const shouldReturnNullOnUnauthorized = opts.auth?.isUnauthorized;
 	const crpcMeta = buildMetaIndex(opts.api);
 	const callWithTokenAndRetry = async (fn, tokenResult, headers) => {
-		const shouldRetryWithFreshToken = !!opts.auth && !tokenResult.isFresh;
+		const canRefreshToken = !!opts.auth && !tokenResult.isFresh;
 		try {
 			return await fn(tokenResult.token);
 		} catch (error) {
-			if (!shouldRetryWithFreshToken) {
-				if (isUnauthorized?.(error)) return null;
+			if (!(canRefreshToken && isRetryableAuthError?.(error))) {
+				if (shouldReturnNullOnUnauthorized?.(error)) return null;
 				throw error;
 			}
 			const newToken = await getToken(siteUrl, headers, {
@@ -165,7 +167,7 @@ function createCallerFactory(opts) {
 			try {
 				return await fn(newToken.token);
 			} catch (retryError) {
-				if (isUnauthorized?.(retryError)) return null;
+				if (shouldReturnNullOnUnauthorized?.(retryError)) return null;
 				throw retryError;
 			}
 		}

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { $ as promptForScaffoldTemplateSelection, A as resolveCodegenTrimSegments, At as highlighter, B as runConfiguredCodegen, C as isEntryPoint, Ct as formatDependencyInstallCommand, D as parseInitCommandArgs, E as parseBackendRunJson, Et as stripConvexCommandNoise, F as resolveRunDeps, G as runMigrationFlow, H as runDevSchemaBackfillIfNeeded, I as runAfterScaffoldScript, J as withWorkingDirectory, K as trackProcess, L as runAggregateBackfillFlow, M as resolveDocTopic, N as resolveInitProjectDir, O as readPackageVersions, P as resolveMigrationConfig, Q as promptForPluginSelection, R as runAggregatePruneFlow, S as isConvexDevPreRunConflictFlag, St as detectPackageManager, T as parseArgs, Tt as serializeEnvValue, U as runInitCommandFlow, V as runConvexInitIfNeeded, W as runMigrationCreate, X as collectPluginScaffoldTemplates, Y as createSpinner, Z as filterScaffoldTemplatePathMap, _ as formatInfoOutput, _t as applyPlanningDependencyInstall, a as cleanup, at as getPluginCatalogEntry, b as getDevAggregateBackfillStatePath, bt as resolveSupportedDependencyWarnings, c as createCommandEnv, ct as buildPluginInstallPlan, d as extractBackfillCliOptions, dt as collectInstalledPluginKeys, et as resolveAddTemplateDefaults, f as extractConcaveRunTargetArgs, ft as getPluginLockfilePath, g as formatDocsOutput, gt as applyDependencyHintsInstall, h as extractResetCliOptions, ht as resolveSchemaInstalledPlugins, i as buildInitializationPlan, it as resolveTemplatesByIdOrThrow, j as resolveConfiguredBackend, k as resolveBackfillConfig, kt as logger, l as ensureConvexGitignoreEntry, lt as resolvePluginScaffoldRoots, m as extractMigrationDownOptions, mt as readPluginLockfile, n as applyPluginInstallPlanFiles, nt as resolvePresetScaffoldTemplates, o as createBackendAdapter, ot as getSupportedPluginKeys, p as extractMigrationCliOptions, pt as getSchemaFilePath, q as withLocalCodegenEnv, r as assertNoRemovedDevPreRunFlag, rt as resolveTemplateSelectionSource, s as createBackendCommandEnv, st as isSupportedPluginKey, t as applyDependencyInstallPlan, tt as resolvePluginPreset, u as extractBackendRunTargetArgs, ut as assertSchemaFileExists, v as getAggregateBackfillDeploymentKey, vt as applyPluginDependencyInstall, w as isInitialized, wt as resolveAuthEnvState, x as hasRemoteConvexDeploymentEnv, xt as resolveProjectScaffoldContext, y as getConvexDeploymentCommandEnv, yt as inspectPluginDependencyInstall, z as runBackendFunction } from "./backend-core-DqPydYyx.mjs";
+import { $ as promptForScaffoldTemplateSelection, A as resolveCodegenTrimSegments, B as runConfiguredCodegen, C as isEntryPoint, Ct as formatDependencyInstallCommand, D as parseInitCommandArgs, E as parseBackendRunJson, Et as stripConvexCommandNoise, F as resolveRunDeps, G as runMigrationFlow, H as runDevSchemaBackfillIfNeeded, I as runAfterScaffoldScript, J as withWorkingDirectory, K as trackProcess, L as runAggregateBackfillFlow, M as resolveDocTopic, N as resolveInitProjectDir, O as readPackageVersions, P as resolveMigrationConfig, Q as promptForPluginSelection, R as runAggregatePruneFlow, S as isConvexDevPreRunConflictFlag, St as detectPackageManager, T as parseArgs, Tt as serializeEnvValue, U as runInitCommandFlow, V as runConvexInitIfNeeded, W as runMigrationCreate, X as collectPluginScaffoldTemplates, Y as createSpinner, Z as filterScaffoldTemplatePathMap, _ as formatInfoOutput, _t as applyPlanningDependencyInstall, a as cleanup, at as getPluginCatalogEntry, b as getDevAggregateBackfillStatePath, bt as resolveSupportedDependencyWarnings, c as createCommandEnv, ct as buildPluginInstallPlan, d as extractBackfillCliOptions, dt as collectInstalledPluginKeys, et as resolveAddTemplateDefaults, f as extractConcaveRunTargetArgs, ft as getPluginLockfilePath, g as formatDocsOutput, gt as applyDependencyHintsInstall, h as extractResetCliOptions, ht as resolveSchemaInstalledPlugins, i as buildInitializationPlan, it as resolveTemplatesByIdOrThrow, j as resolveConfiguredBackend, jt as highlighter, k as resolveBackfillConfig, kt as logger, l as ensureConvexGitignoreEntry, lt as resolvePluginScaffoldRoots, m as extractMigrationDownOptions, mt as readPluginLockfile, n as applyPluginInstallPlanFiles, nt as resolvePresetScaffoldTemplates, o as createBackendAdapter, ot as getSupportedPluginKeys, p as extractMigrationCliOptions, pt as getSchemaFilePath, q as withLocalCodegenEnv, r as assertNoRemovedDevPreRunFlag, rt as resolveTemplateSelectionSource, s as createBackendCommandEnv, st as isSupportedPluginKey, t as applyDependencyInstallPlan, tt as resolvePluginPreset, u as extractBackendRunTargetArgs, ut as assertSchemaFileExists, v as getAggregateBackfillDeploymentKey, vt as applyPluginDependencyInstall, w as isInitialized, wt as resolveAuthEnvState, x as hasRemoteConvexDeploymentEnv, xt as resolveProjectScaffoldContext, y as getConvexDeploymentCommandEnv, yt as inspectPluginDependencyInstall, z as runBackendFunction } from "./backend-core-BsKP1LVg.mjs";
 import fs, { existsSync, readFileSync } from "node:fs";
 import path, { delimiter, dirname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -1471,16 +1471,22 @@ const handleAddCommand = async (argv, deps = {}) => {
 		created: applyResult.created,
 		manualActions: applyResult.manualActions,
 		updated: applyResult.updated,
-		skipped: applyResult.skipped
+		skipped: applyResult.skipped,
+		refused: applyResult.refused,
+		complete: applyResult.refused.length === 0
 	};
+	const resultLine = `${selectedPlugin} scaffold results: ${applyResult.created.length} created, ${applyResult.updated.length} updated, ${applyResult.skipped.length} skipped, ${applyResult.refused.length} refused.`;
 	if (addArgs.json) console.info(JSON.stringify(payload));
 	else {
-		logger.success(`✔ ${selectedPlugin} scaffold results: ${applyResult.created.length} created, ${applyResult.updated.length} updated, ${applyResult.skipped.length} skipped.`);
+		if (applyResult.refused.length > 0) logger.error(`✖ ${resultLine}`);
+		else logger.success(`✔ ${resultLine}`);
 		if (applyResult.created.length > 0) logger.write(`Created files:\n${applyResult.created.map((file) => `  - ${file}`).join("\n")}`);
 		if (applyResult.updated.length > 0) logger.write(`Updated files:\n${applyResult.updated.map((file) => `  - ${file}`).join("\n")}`);
-		if (applyResult.skipped.length > 0) {
-			logger.write(`Skipped files:\n${applyResult.skipped.map((file) => `  - ${file}`).join("\n")}`);
-			if (!addArgs.schema && !addArgs.overwrite) logger.info("Re-run with --overwrite to replace changed files.");
+		if (applyResult.skipped.length > 0) logger.write(`Skipped files (already up to date):\n${applyResult.skipped.map((file) => `  - ${file}`).join("\n")}`);
+		if (applyResult.refused.length > 0) {
+			logger.write(`Refused files (your changes were kept):\n${applyResult.refused.map((file) => `  - ${file}`).join("\n")}`);
+			logger.info("Re-run with --overwrite to replace these files, or merge the changes yourself.");
+			logger.error(`${selectedPlugin} is only partially installed.`);
 		}
 		if (applyResult.manualActions.length > 0) {
 			logger.info("Manual actions:");
@@ -1551,7 +1557,7 @@ const handleAddCommand = async (argv, deps = {}) => {
 		});
 		if (hookExitCode !== 0) return hookExitCode;
 	}
-	return 0;
+	return applyResult.refused.length > 0 ? 1 : 0;
 };
 
 //#endregion
@@ -2240,6 +2246,7 @@ const handleInitCommand = async (argv, deps = {}) => {
 		created: result.created,
 		updated: result.updated,
 		skipped: result.skipped,
+		refused: result.refused,
 		usedShadcn: result.usedShadcn,
 		template: result.template,
 		codegen: result.codegen,