kitcn 0.16.1 → 0.17.1

package/dist/{backend-core-DqPydYyx.mjs → backend-core-KwJ5FZgj.mjs}

@@ -3931,6 +3931,14 @@ async function runAnalyze(argv) {
 
 //#endregion
 //#region src/shared/meta-utils.ts
+/**
+* Suffix of a parse snapshot — a mirror of a Convex module that kitcn builds
+* predating in-memory evaluation could strand in a project. Codegen writes no
+* snapshot, so this exists only so readers of the Convex functions directory
+* skip a stranded file rather than parse it as a real module. Nothing deletes
+* one: kitcn cannot prove it owns a file it did not write.
+*/
+const PARSE_SNAPSHOT_SUFFIX = ".kitcn-parse.ts";
 /** Files to exclude from meta generation */
 const EXCLUDED_FILES = new Set([
 	"schema.ts",
@@ -3949,6 +3957,7 @@ const DIRECT_CODEGEN_META_CAPTURE_REGEX = /\b_crpc(?:Meta|HttpRoute)\b/;
 * Filters out private files/directories (prefixed with _) and config files.
 */
 function isValidConvexFile(file) {
+	if (file.endsWith(PARSE_SNAPSHOT_SUFFIX)) return false;
 	if (file.endsWith(".runtime.ts")) return false;
 	if (file.endsWith(".test.ts")) return false;
 	if (file.endsWith(".spec.ts")) return false;
@@ -4789,12 +4798,21 @@ export function defineMigration(
 }
 `;
 }
+function renderRuntimeApiTypesImport(entries, importPath) {
+	const specifiers = [];
+	if (entries.some((entry) => !entry.internal)) specifiers.push("api as generatedApi");
+	if (entries.some((entry) => entry.internal)) specifiers.push("internal as generatedInternal");
+	if (specifiers.length === 0) return "";
+	if (specifiers.length === 1) return `import type { ${specifiers[0]} } from '${importPath}';\n`;
+	return `import type {\n${specifiers.map((specifier) => `  ${specifier},\n`).join("")}} from '${importPath}';\n`;
+}
 function emitGeneratedModuleRuntimeFile(outputFile, functionsDir, moduleName, procedureEntries, runtimeExportNames) {
 	const { callerExportName, handlerExportName } = runtimeExportNames?.get(moduleName) ?? getModuleRuntimeExportNames(moduleName);
 	const useGeneratedApiTypes = moduleUsesOwnGeneratedRuntime(functionsDir, moduleName);
 	const runtimeApiTypesImportPath = useGeneratedApiTypes ? getRuntimeApiTypesImportPath(outputFile, functionsDir) : null;
 	const generatedServerImportPath = getGeneratedServerImportPath(outputFile, functionsDir);
 	const { callerEntries, handlerEntries } = partitionRuntimeEntriesForEmission(procedureEntries);
+	const runtimeApiTypesImport = runtimeApiTypesImportPath ? renderRuntimeApiTypesImport(callerEntries, runtimeApiTypesImportPath) : "";
 	const callerRegistryLines = emitProcedureRegistryEntries(callerEntries, outputFile, functionsDir, moduleName, useGeneratedApiTypes);
 	const callerRegistryBody = callerRegistryLines.length > 0 ? `\n${callerRegistryLines.join("\n")}\n` : "\n";
 	const hasHandlerRegistry = handlerEntries.length > 0;
@@ -4843,11 +4861,7 @@ import {
   typedProcedureResolver,
   type GeneratedRegistryCallerForContext,${hasHandlerRegistry ? "\n  type GeneratedRegistryHandlerForContext," : ""}
 } from 'kitcn/server';
-${runtimeApiTypesImportPath ? `import type {
-  api as generatedApi,
-  internal as generatedInternal,
-} from '${runtimeApiTypesImportPath}';
-` : ""}import type { ActionCtx, MutationCtx, QueryCtx } from '${generatedServerImportPath}';
+${runtimeApiTypesImport}import type { ActionCtx, MutationCtx, QueryCtx } from '${generatedServerImportPath}';
 import type { OrmTriggerContext } from 'kitcn/orm';
 
 const procedureRegistry = {${callerRegistryBody}} as const;
@@ -5048,19 +5062,17 @@ function isCRPCHttpRouter(value) {
 async function parseModuleRuntime(filePath, jitiInstance) {
 	const source = fs.readFileSync(filePath, "utf8");
 	const rewrittenSource = source.replaceAll(/from\s+(['"])kitcn\/server\1/g, `from ${JSON.stringify(normalizeImportPath(getProjectServerParserShimPath()))}`);
-	const importPath = rewrittenSource === source ? filePath : (() => {
-		const tempFilePath = `${filePath}.kitcn-parse.ts`;
-		fs.writeFileSync(tempFilePath, rewrittenSource, "utf8");
-		return tempFilePath;
-	})();
 	const result = {};
 	const httpRoutes = {};
 	const procedures = [];
 	const isHttp = filePath.endsWith("http.ts");
-	const module = await jitiInstance.import(importPath);
+	const module = rewrittenSource === source ? await jitiInstance.import(filePath) : await jitiInstance.evalModule(rewrittenSource, {
+		async: true,
+		ext: ".ts",
+		filename: filePath
+	});
 	if (!module || typeof module !== "object") {
 		if (isHttp) logger.error("  http.ts: module is empty or not an object");
-		if (importPath !== filePath) fs.rmSync(importPath, { force: true });
 		return {
 			meta: null,
 			httpRoutes: {},
@@ -5095,7 +5107,6 @@ async function parseModuleRuntime(filePath, jitiInstance) {
 			};
 		}
 	}
-	if (importPath !== filePath) fs.rmSync(importPath, { force: true });
 	return {
 		meta: Object.keys(result).length > 0 ? result : null,
 		httpRoutes,
@@ -6939,6 +6950,92 @@ const normalizeLockfileScaffoldPath = (value) => {
 	return normalized;
 };
 
+//#endregion
+//#region src/cli/utils/typescript-runtime.ts
+const require$1 = createRequire(import.meta.url);
+let cachedTypeScript = null;
+const loadTypeScript = () => {
+	if (cachedTypeScript) return cachedTypeScript;
+	const loaded = require$1("typescript");
+	const resolved = "default" in loaded && loaded.default ? loaded.default : loaded;
+	cachedTypeScript = resolved;
+	return resolved;
+};
+const createTypeScriptProxy = () => new Proxy({}, { get(_target, property) {
+	return loadTypeScript()[property];
+} });
+
+//#endregion
+//#region src/cli/registry/schema-chain.ts
+const ts$3 = createTypeScriptProxy();
+const parse$2 = (source) => ts$3.createSourceFile("schema.ts", source, ts$3.ScriptTarget.Latest, true, ts$3.ScriptKind.TS);
+const isDefineSchemaCall = (node) => {
+	if (!ts$3.isCallExpression(node)) return false;
+	if (ts$3.isIdentifier(node.expression)) return node.expression.text === "defineSchema";
+	return ts$3.isPropertyAccessExpression(node.expression) && node.expression.name.text === "defineSchema";
+};
+const findDefineSchemaCall = (sourceFile) => {
+	let found = null;
+	const visit = (node) => {
+		if (found) return;
+		if (isDefineSchemaCall(node)) {
+			found = node;
+			return;
+		}
+		ts$3.forEachChild(node, visit);
+	};
+	visit(sourceFile);
+	return found;
+};
+/**
+* Resolve the real `defineSchema(...)` call and the methods chained onto it.
+*
+* Locating the call through the TypeScript AST is what keeps registration out
+* of comments and string literals that merely mention `defineSchema(`.
+*/
+const findDefineSchemaChain = (source) => {
+	const sourceFile = parse$2(source);
+	const defineSchemaCall = findDefineSchemaCall(sourceFile);
+	if (!defineSchemaCall) return null;
+	const calls = [];
+	let current = defineSchemaCall;
+	while (current.parent && ts$3.isPropertyAccessExpression(current.parent) && current.parent.expression === current && current.parent.parent && ts$3.isCallExpression(current.parent.parent) && current.parent.parent.expression === current.parent) {
+		const propertyAccess = current.parent;
+		const call = current.parent.parent;
+		const dotToken = propertyAccess.getChildren(sourceFile).find((child) => child.kind === ts$3.SyntaxKind.DotToken);
+		if (!dotToken) throw new Error("Schema chain property access is missing its dot token.");
+		calls.push({
+			closeParenIndex: call.end - 1,
+			dotIndex: dotToken.getStart(sourceFile),
+			end: call.end,
+			name: propertyAccess.name.text
+		});
+		current = call;
+	}
+	return {
+		calls,
+		defineSchemaEnd: defineSchemaCall.end
+	};
+};
+/**
+* Whether `source` really calls `name()` somewhere, ignoring comments and
+* string literals.
+*/
+const hasCallExpression = (source, name) => {
+	const sourceFile = parse$2(source);
+	let found = false;
+	const visit = (node) => {
+		if (found) return;
+		if (ts$3.isCallExpression(node) && ts$3.isIdentifier(node.expression) && node.expression.text === name) {
+			found = true;
+			return;
+		}
+		ts$3.forEachChild(node, visit);
+	};
+	visit(sourceFile);
+	return found;
+};
+
 //#endregion
 //#region src/cli/registry/state.ts
 const getPluginLockfilePath = (functionsDir) => join(functionsDir, "plugins.lock.json");
@@ -7080,7 +7177,6 @@ const READ_OPTIONAL_RUNTIME_ENV_PROPERTY_RE = /\breadOptionalRuntimeEnv\s*:/m;
 const READ_OPTIONAL_RUNTIME_ENV_RE = /(\s*readOptionalRuntimeEnv\s*:\s*\[)([\s\S]*?)(\]\s*,?)/m;
 const LEADING_WHITESPACE_RE = /^\s*/;
 const STRING_LITERAL_ARRAY_ENTRY_RE = /^(['"])([^'"]+)\1$/;
-const WHITESPACE_RE$2 = /\s/;
 const findMatchingObjectBraceIndex$1 = (source, openIndex) => {
 	let depth = 0;
 	let quote;
@@ -7390,79 +7486,28 @@ const getPlannedFileContent = (files, absolutePath) => {
 	const normalizedPath = normalizePath$1(relative(process.cwd(), absolutePath));
 	return files?.find((file) => file.path === normalizedPath)?.content;
 };
-const skipWhitespace$2 = (source, start) => {
-	let index = start;
-	while (index < source.length && WHITESPACE_RE$2.test(source[index] ?? "")) index += 1;
-	return index;
-};
-const findBalancedParenEnd$1 = (source, openParenIndex) => {
-	let depth = 0;
-	for (let index = openParenIndex; index < source.length; index += 1) {
-		const char = source[index];
-		if (char === "(") {
-			depth += 1;
-			continue;
-		}
-		if (char !== ")") continue;
-		depth -= 1;
-		if (depth === 0) return index;
-	}
-	return -1;
-};
 const findSchemaExtensionInsertIndex = (source) => {
-	const defineSchemaIndex = source.indexOf("defineSchema(");
-	if (defineSchemaIndex < 0) return {
+	const chain = findDefineSchemaChain(source);
+	if (!chain) return {
 		closeParenIndex: -1,
 		hasExtend: false,
 		insertIndex: -1
 	};
-	const defineSchemaOpenParenIndex = source.indexOf("(", defineSchemaIndex);
-	if (defineSchemaOpenParenIndex < 0) return {
+	const firstCall = chain.calls[0];
+	if (!firstCall) return {
 		closeParenIndex: -1,
 		hasExtend: false,
-		insertIndex: -1
+		insertIndex: chain.defineSchemaEnd
 	};
-	const defineSchemaCloseParenIndex = findBalancedParenEnd$1(source, defineSchemaOpenParenIndex);
-	if (defineSchemaCloseParenIndex < 0) return {
-		closeParenIndex: -1,
-		hasExtend: false,
-		insertIndex: -1
+	if (firstCall.name === "extend") return {
+		closeParenIndex: firstCall.closeParenIndex,
+		hasExtend: true,
+		insertIndex: firstCall.closeParenIndex
 	};
-	const cursor = defineSchemaCloseParenIndex + 1;
-	while (cursor < source.length) {
-		const nextSegmentIndex = skipWhitespace$2(source, cursor);
-		if (source.startsWith(".relations(", nextSegmentIndex) || source.startsWith(".triggers(", nextSegmentIndex)) return {
-			closeParenIndex: -1,
-			hasExtend: false,
-			insertIndex: nextSegmentIndex
-		};
-		if (!source.startsWith(".extend(", nextSegmentIndex)) return {
-			closeParenIndex: -1,
-			hasExtend: false,
-			insertIndex: nextSegmentIndex
-		};
-		const extendOpenParenIndex = source.indexOf("(", nextSegmentIndex);
-		if (extendOpenParenIndex < 0) return {
-			closeParenIndex: -1,
-			hasExtend: false,
-			insertIndex: -1
-		};
-		const extendCloseParenIndex = findBalancedParenEnd$1(source, extendOpenParenIndex);
-		if (extendCloseParenIndex < 0) return {
-			closeParenIndex: -1,
-			hasExtend: false,
-			insertIndex: -1
-		};
-		return {
-			closeParenIndex: extendCloseParenIndex,
-			hasExtend: true,
-			insertIndex: extendCloseParenIndex
-		};
-	}
 	return {
 		closeParenIndex: -1,
 		hasExtend: false,
-		insertIndex: cursor
+		insertIndex: firstCall.dotIndex
 	};
 };
 const buildSchemaRegistrationPlanFile = (functionsDir, descriptor, roots, bootstrapFiles) => {
@@ -7473,7 +7518,7 @@ const buildSchemaRegistrationPlanFile = (functionsDir, descriptor, roots, bootst
 	const pluginFactory = schemaRegistration.importName;
 	const pluginImportPath = resolveRelativeImportPath(schemaPath, join(schemaRegistration.target === "lib" ? roots.libRootDir : roots.functionsRootDir, schemaRegistration.path));
 	let source = bootstrappedSchemaSource ?? fs.readFileSync(schemaPath, "utf8");
-	if (!source.includes(`${pluginFactory}()`)) {
+	if (!hasCallExpression(source, pluginFactory)) {
 		if (!new RegExp(`import\\s+\\{[^}]*\\b${pluginFactory}\\b[^}]*\\}\\s+from\\s+['"]${pluginImportPath}['"];?`).test(source)) source = `import { ${pluginFactory} } from '${pluginImportPath}';\n${source}`;
 		const extensionTarget = findSchemaExtensionInsertIndex(source);
 		if (extensionTarget.hasExtend && extensionTarget.closeParenIndex >= 0) source = `${source.slice(0, extensionTarget.closeParenIndex)}, ${pluginFactory}()${source.slice(extensionTarget.closeParenIndex)}`;
@@ -7654,27 +7699,11 @@ const buildPluginInstallPlan = async (params) => {
 	};
 };
 
-//#endregion
-//#region src/cli/utils/typescript-runtime.ts
-const require$1 = createRequire(import.meta.url);
-let cachedTypeScript = null;
-const loadTypeScript = () => {
-	if (cachedTypeScript) return cachedTypeScript;
-	const loaded = require$1("typescript");
-	const resolved = "default" in loaded && loaded.default ? loaded.default : loaded;
-	cachedTypeScript = resolved;
-	return resolved;
-};
-const createTypeScriptProxy = () => new Proxy({}, { get(_target, property) {
-	return loadTypeScript()[property];
-} });
-
 //#endregion
 //#region src/cli/registry/schema-ownership.ts
 const OBJECT_ENTRY_INDENT = "  ";
 const LEADING_INDENT_RE = /^[ \t]*/;
 const LEGACY_MANAGED_COMMENT_RE = /^[ \t]*\/\* kitcn-managed [^*]+ \*\/\n?/gm;
-const WHITESPACE_RE$1 = /\s/;
 const ts$2 = createTypeScriptProxy();
 let printer = null;
 const getPrinter = () => {
@@ -7920,13 +7949,15 @@ const mergeIndexEntries = (params) => {
 	const targetParamName = params.existingInfo.indexParamName ?? params.existingInfo.varName ?? params.desiredInfo.indexParamName;
 	const desiredParamName = params.desiredInfo.indexParamName ?? params.desiredInfo.varName;
 	const desiredEntries = params.desiredInfo.indexEntries;
+	const unparsedThirdArgText = params.existingInfo.thirdArgText && !params.existingInfo.indexEntries ? params.existingInfo.thirdArgText : null;
 	if (!desiredEntries || desiredEntries.length === 0) return {
 		changed: false,
 		entries: params.existingInfo.indexEntries?.map((entry) => entry.getText(params.existingInfo.sourceFile)),
 		indexParamName: targetParamName,
-		requiresIndexArg: Boolean(params.existingInfo.thirdArgText)
+		requiresIndexArg: Boolean(params.existingInfo.thirdArgText),
+		verbatimIndexArgText: unparsedThirdArgText
 	};
-	if (params.existingInfo.thirdArgText && !params.existingInfo.indexEntries) throw new Error(`Schema patch conflict in ${params.displayPath}: ${params.pluginKey} indexes for table "${params.tableKey}" could not be merged into the existing schema callback.`);
+	if (unparsedThirdArgText) throw new Error(`Schema patch conflict in ${params.displayPath}: ${params.pluginKey} indexes for table "${params.tableKey}" could not be merged into the existing schema callback.`);
 	const existingEntries = params.existingInfo.indexEntries ?? [];
 	const existingMap = new Map(existingEntries.map((entry) => [getIndexIdentity(entry, params.existingInfo.sourceFile), entry]));
 	const nextEntries = existingEntries.map((entry) => entry.getText(params.existingInfo.sourceFile));
@@ -7946,13 +7977,14 @@ const mergeIndexEntries = (params) => {
 		changed,
 		entries: nextEntries,
 		indexParamName: targetParamName,
-		requiresIndexArg: Boolean(params.existingInfo.thirdArgText ?? nextEntries.length > 0)
+		requiresIndexArg: Boolean(params.existingInfo.thirdArgText ?? nextEntries.length > 0),
+		verbatimIndexArgText: null
 	};
 };
 const renderTableStatement = (params) => {
 	const fieldsText = renderObjectLiteral("  ", params.fieldEntries.map(ensureTrailingComma));
 	const indexEntries = params.indexEntries ?? [];
-	const indexBlock = indexEntries.length > 0 ? `,\n  (${params.indexParamName ?? params.varName}) => ${renderArrayLiteral("  ", indexEntries)}` : "";
+	const indexBlock = params.verbatimIndexArgText ? `,\n  ${params.verbatimIndexArgText}` : indexEntries.length > 0 ? `,\n  (${params.indexParamName ?? params.varName}) => ${renderArrayLiteral("  ", indexEntries)}` : "";
 	return `export const ${params.varName} = convexTable(\n  ${params.tableNameText},\n  ${fieldsText}${indexBlock}\n);`;
 };
 const insertDeclaration = (source, declaration) => {
@@ -7992,7 +8024,8 @@ const mergeTableDeclaration = (params) => {
 		indexEntries: indexMerge.requiresIndexArg ? indexMerge.entries : null,
 		indexParamName: indexMerge.indexParamName,
 		tableNameText: existingInfo.tableNameText,
-		varName: existingInfo.varName
+		varName: existingInfo.varName,
+		verbatimIndexArgText: indexMerge.verbatimIndexArgText
 	});
 	return {
 		content: replaceRange(params.source, existingInfo.statement.getStart(existingInfo.sourceFile), existingInfo.statement.end, nextStatement),
@@ -8015,43 +8048,15 @@ const updateTablesObject = (source, registrations) => {
 	if (!changed) return source;
 	return replaceRange(source, info.object.getStart(info.sourceFile), info.object.end, renderObjectLiteral(getIndentAt(source, info.object.getStart(info.sourceFile)), existingEntries));
 };
-const skipWhitespace$1 = (source, start) => {
-	let cursor = start;
-	while (cursor < source.length && WHITESPACE_RE$1.test(source[cursor])) cursor += 1;
-	return cursor;
-};
-const findBalancedParenEnd = (source, openParenIndex) => {
-	let depth = 0;
-	for (let index = openParenIndex; index < source.length; index += 1) {
-		const char = source[index];
-		if (char === "(") depth += 1;
-		else if (char === ")") {
-			depth -= 1;
-			if (depth === 0) return index;
-		}
-	}
-	return -1;
-};
 const findRelationsInsertIndex = (source) => {
-	const defineSchemaIndex = source.indexOf("defineSchema(");
-	if (defineSchemaIndex < 0) return -1;
-	const defineSchemaOpenParenIndex = source.indexOf("(", defineSchemaIndex);
-	if (defineSchemaOpenParenIndex < 0) return -1;
-	const defineSchemaCloseParenIndex = findBalancedParenEnd(source, defineSchemaOpenParenIndex);
-	if (defineSchemaCloseParenIndex < 0) return -1;
-	let cursor = defineSchemaCloseParenIndex + 1;
-	while (cursor < source.length) {
-		const nextSegmentIndex = skipWhitespace$1(source, cursor);
-		if (source.startsWith(".relations(", nextSegmentIndex)) return nextSegmentIndex;
-		if (source.startsWith(".triggers(", nextSegmentIndex)) return nextSegmentIndex;
-		if (!source.startsWith(".extend(", nextSegmentIndex)) return nextSegmentIndex;
-		const extendOpenParenIndex = source.indexOf("(", nextSegmentIndex);
-		if (extendOpenParenIndex < 0) return -1;
-		const extendCloseParenIndex = findBalancedParenEnd(source, extendOpenParenIndex);
-		if (extendCloseParenIndex < 0) return -1;
-		cursor = extendCloseParenIndex + 1;
-	}
-	return cursor;
+	const chain = findDefineSchemaChain(source);
+	if (!chain) return -1;
+	let insertIndex = chain.defineSchemaEnd;
+	for (const call of chain.calls) {
+		if (call.name !== "extend") return call.dotIndex;
+		insertIndex = call.end;
+	}
+	return insertIndex;
 };
 const mergeRelationProperty = (params) => {
 	const desiredInfo = readPropertyObject(params.desiredRelation, params.tableKey);
@@ -8171,13 +8176,32 @@ const readManagedChecksumFromSource = (source, unit) => {
 };
 const mergeOrmImports = (source, importNames) => {
 	if (importNames.length === 0) return source;
-	const sourceFile = parseSource(source);
-	const ormImport = sourceFile.statements.find((statement) => ts$2.isImportDeclaration(statement) && isStringLiteralLike(statement.moduleSpecifier) && statement.moduleSpecifier.text === "kitcn/orm");
-	if (!ormImport) return `${`import {\n  ${[...new Set(importNames)].sort().join(",\n  ")},\n} from 'kitcn/orm';\n\n`}${source}`;
-	if (!ormImport.importClause?.namedBindings || !ts$2.isNamedImports(ormImport.importClause.namedBindings)) return source;
-	const existingImports = ormImport.importClause.namedBindings.elements.map((element) => element.getText(sourceFile));
-	const nextImport = `import {\n  ${[...new Set([...existingImports, ...importNames])].sort((a, b) => a.localeCompare(b)).join(",\n  ")},\n} from 'kitcn/orm';`;
-	return replaceRange(source, ormImport.getStart(sourceFile), ormImport.end, nextImport);
+	const requiredNames = new Set(importNames);
+	const initialSourceFile = parseSource(source);
+	const typeOnlyReplacements = initialSourceFile.statements.flatMap((statement) => {
+		if (!ts$2.isImportDeclaration(statement) || !isStringLiteralLike(statement.moduleSpecifier) || statement.moduleSpecifier.text !== "kitcn/orm" || !statement.importClause?.isTypeOnly || !statement.importClause.namedBindings || !ts$2.isNamedImports(statement.importClause.namedBindings)) return [];
+		const remainingElements = statement.importClause.namedBindings.elements.filter((element) => !requiredNames.has(element.name.text));
+		if (remainingElements.length === statement.importClause.namedBindings.elements.length) return [];
+		const namedBindings = remainingElements.length > 0 ? `{ ${remainingElements.map((element) => element.getText(initialSourceFile)).join(", ")} }` : null;
+		const bindings = [statement.importClause.name?.text, namedBindings].filter((value) => Boolean(value));
+		const replacement = bindings.length > 0 ? `import type ${bindings.join(", ")} from ${statement.moduleSpecifier.getText(initialSourceFile)};` : "";
+		return [{
+			end: statement.end,
+			replacement,
+			start: statement.getStart(initialSourceFile)
+		}];
+	});
+	let workingSource = source;
+	for (const replacement of typeOnlyReplacements.sort((a, b) => b.start - a.start)) workingSource = replaceRange(workingSource, replacement.start, replacement.end, replacement.replacement);
+	const sourceFile = parseSource(workingSource);
+	const ormImport = sourceFile.statements.find((statement) => ts$2.isImportDeclaration(statement) && isStringLiteralLike(statement.moduleSpecifier) && statement.moduleSpecifier.text === "kitcn/orm" && statement.importClause !== void 0 && !statement.importClause.isTypeOnly && statement.importClause.namedBindings !== void 0 && ts$2.isNamedImports(statement.importClause.namedBindings));
+	if (!ormImport) return `${`import {\n  ${[...new Set(importNames)].sort().join(",\n  ")},\n} from 'kitcn/orm';\n\n`}${workingSource}`;
+	const namedBindings = ormImport.importClause?.namedBindings;
+	const specifiersByLocalName = /* @__PURE__ */ new Map();
+	for (const element of namedBindings.elements) specifiersByLocalName.set(element.name.text, element.getText(sourceFile));
+	for (const name of importNames) specifiersByLocalName.set(name, name);
+	const nextImport = `import {\n  ${[...specifiersByLocalName.values()].sort((a, b) => a.localeCompare(b)).join(",\n  ")},\n} from 'kitcn/orm';`;
+	return replaceRange(workingSource, ormImport.getStart(sourceFile), ormImport.end, nextImport);
 };
 const hasSchemaFragment = (source, tableKey) => {
 	if (new RegExp(`convexTable\\(\\s*['"]${escapeRegex(tableKey)}['"]`).test(source)) return true;
@@ -8258,6 +8282,39 @@ const reconcileRootSchemaOwnership = async (params) => {
 	};
 };
 
+//#endregion
+//#region src/cli/registry/items/ratelimit/ratelimit-crpc.ts
+const CRPC_META_RATELIMIT_RE = /ratelimit\?: string;/;
+const CRPC_RATELIMIT_BUCKET_RE = /ratelimit\?: RatelimitBucket;/;
+const CRPC_CREATE_LINE_RE = /const c = initCRPC\.create\(\);/;
+const CRPC_META_CREATE_RE = /const c = initCRPC\s*\.meta<\{\s*([\s\S]*?)\s*\}>\(\)\s*\.create\(\);/;
+const PUBLIC_MUTATION_LINE_RE = /export const publicMutation = c\.mutation(?:\.use\(ratelimit\.middleware\(\)\))?;/;
+/**
+* Wire ratelimit middleware into an existing `crpc.ts` source.
+*
+* Shared so other plugins can reproduce the ratelimit-patched baseline and
+* recognize it as managed content rather than a user edit.
+*/
+const patchRatelimitCrpcSource = (input) => {
+	let source = input;
+	if (!source.includes("from './plugins/ratelimit/plugin'")) if (source.includes("import type { ActionCtx, MutationCtx, QueryCtx }")) source = source.replace("import type { ActionCtx, MutationCtx, QueryCtx } from '../functions/generated/server';", `import { type RatelimitBucket, ratelimit } from './plugins/ratelimit/plugin';
+import type { ActionCtx, MutationCtx, QueryCtx } from '../functions/generated/server';`);
+	else source = `import { type RatelimitBucket, ratelimit } from './plugins/ratelimit/plugin';\n${source}`;
+	if (CRPC_META_RATELIMIT_RE.test(source)) source = source.replace(CRPC_META_RATELIMIT_RE, "ratelimit?: RatelimitBucket;");
+	if (!CRPC_RATELIMIT_BUCKET_RE.test(source)) {
+		if (CRPC_META_CREATE_RE.test(source)) source = source.replace(CRPC_META_CREATE_RE, (_match, fields) => {
+			return `const c = initCRPC\n  .meta<{\n${[...fields.split("\n").map((line) => line.trim()).filter(Boolean), "ratelimit?: RatelimitBucket;"].map((line) => `    ${line}`).join("\n")}\n  }>()\n  .create();`;
+		});
+		else if (CRPC_CREATE_LINE_RE.test(source)) source = source.replace(CRPC_CREATE_LINE_RE, `const c = initCRPC
+  .meta<{
+    ratelimit?: RatelimitBucket;
+  }>()
+  .create();`);
+	}
+	if (PUBLIC_MUTATION_LINE_RE.test(source)) source = source.replace(PUBLIC_MUTATION_LINE_RE, "export const publicMutation = c.mutation.use(ratelimit.middleware());");
+	return source;
+};
+
 //#endregion
 //#region src/cli/registry/items/auth/auth.template.ts
 const AUTH_TEMPLATE = `import { convex } from 'kitcn/auth';
@@ -10358,7 +10415,7 @@ function buildAuthCrpcRegistrationPlanFile(params) {
 		kind: "scaffold",
 		filePath: crpcPath,
 		content: renderAuthCrpcTemplate({ withRatelimit: source.includes("from './plugins/ratelimit/plugin'") || source.includes("RatelimitBucket") || source.includes("ratelimit.middleware()") }),
-		managedBaselineContent: baselineCrpcSource,
+		managedBaselineContent: [baselineCrpcSource, patchRatelimitCrpcSource(baselineCrpcSource)],
 		createReason: "Create crpc.ts with auth-aware procedures.",
 		updateReason: "Register auth-aware procedures in crpc.ts.",
 		skipReason: "Auth-aware procedures are already registered in crpc.ts."
@@ -10398,6 +10455,7 @@ app.use(
 		filePath: httpPath,
 		content: source,
 		managedBaselineContent: baselineHttpSource,
+		requiresExplicitOverwrite: false,
 		createReason: "Create http.ts with auth middleware.",
 		updateReason: "Register auth middleware in http.ts.",
 		skipReason: "Auth middleware is already registered in http.ts."
@@ -10555,6 +10613,7 @@ export default http;
 		kind: "scaffold",
 		filePath: httpPath,
 		content: source,
+		requiresExplicitOverwrite: false,
 		createReason: "Create Convex http.ts with auth routes.",
 		updateReason: "Register auth routes in Convex http.ts.",
 		skipReason: "Convex http.ts already registers auth routes."
@@ -10592,6 +10651,7 @@ function buildAuthConvexNextProviderPlanFile(params) {
 		kind: "scaffold",
 		filePath: providerPath,
 		content: source,
+		requiresExplicitOverwrite: false,
 		createReason: "Create auth-aware Convex client provider.",
 		updateReason: "Update Convex client provider with auth.",
 		skipReason: "Convex client provider already includes auth."
@@ -10616,6 +10676,7 @@ function buildAuthConvexStartProviderPlanFile(params) {
 		kind: "scaffold",
 		filePath: providerPath,
 		content: patchAuthConvexProviderSource(fs.readFileSync(providerPath, "utf8")),
+		requiresExplicitOverwrite: false,
 		createReason: "Create auth-aware Start provider.",
 		updateReason: "Update Start provider with auth.",
 		skipReason: "Start provider already includes auth."
@@ -10634,6 +10695,7 @@ function buildAuthConvexReactEntryPlanFile(params) {
 		kind: "scaffold",
 		filePath: entryPath,
 		content: source,
+		requiresExplicitOverwrite: false,
 		createReason: "Create auth-aware client entry.",
 		updateReason: "Update client entry with auth.",
 		skipReason: "Client entry already includes auth."
@@ -10897,11 +10959,6 @@ export function ratelimitExtension() {
 
 //#endregion
 //#region src/cli/registry/items/ratelimit/ratelimit-item.ts
-const CRPC_META_RATELIMIT_RE = /ratelimit\?: string;/;
-const CRPC_RATELIMIT_BUCKET_RE = /ratelimit\?: RatelimitBucket;/;
-const CRPC_CREATE_LINE_RE = /const c = initCRPC\.create\(\);/;
-const CRPC_META_CREATE_RE = /const c = initCRPC\s*\.meta<\{\s*([\s\S]*?)\s*\}>\(\)\s*\.create\(\);/;
-const PUBLIC_MUTATION_LINE_RE = /export const publicMutation = c\.mutation(?:\.use\(ratelimit\.middleware\(\)\))?;/;
 const RATELIMIT_FILES = [createRegistryFile({
 	id: "ratelimit-schema",
 	path: "schema.ts",
@@ -10922,27 +10979,12 @@ function buildRatelimitCrpcRegistrationPlanFile(params) {
 		functionsDir: params.functionsDir,
 		crpcFilePath: crpcPath
 	});
-	let source = fs.existsSync(crpcPath) ? fs.readFileSync(crpcPath, "utf8") : baselineCrpcSource;
-	if (!source.includes("from './plugins/ratelimit/plugin'")) if (source.includes("import type { ActionCtx, MutationCtx, QueryCtx }")) source = source.replace("import type { ActionCtx, MutationCtx, QueryCtx } from '../functions/generated/server';", `import { type RatelimitBucket, ratelimit } from './plugins/ratelimit/plugin';
-import type { ActionCtx, MutationCtx, QueryCtx } from '../functions/generated/server';`);
-	else source = `import { type RatelimitBucket, ratelimit } from './plugins/ratelimit/plugin';\n${source}`;
-	if (CRPC_META_RATELIMIT_RE.test(source)) source = source.replace(CRPC_META_RATELIMIT_RE, "ratelimit?: RatelimitBucket;");
-	if (!CRPC_RATELIMIT_BUCKET_RE.test(source)) {
-		if (CRPC_META_CREATE_RE.test(source)) source = source.replace(CRPC_META_CREATE_RE, (_match, fields) => {
-			return `const c = initCRPC\n  .meta<{\n${[...fields.split("\n").map((line) => line.trim()).filter(Boolean), "ratelimit?: RatelimitBucket;"].map((line) => `    ${line}`).join("\n")}\n  }>()\n  .create();`;
-		});
-		else if (CRPC_CREATE_LINE_RE.test(source)) source = source.replace(CRPC_CREATE_LINE_RE, `const c = initCRPC
-  .meta<{
-    ratelimit?: RatelimitBucket;
-  }>()
-  .create();`);
-	}
-	if (PUBLIC_MUTATION_LINE_RE.test(source)) source = source.replace(PUBLIC_MUTATION_LINE_RE, "export const publicMutation = c.mutation.use(ratelimit.middleware());");
 	return createPlanFile({
 		kind: "scaffold",
 		filePath: crpcPath,
-		content: source,
+		content: patchRatelimitCrpcSource(fs.existsSync(crpcPath) ? fs.readFileSync(crpcPath, "utf8") : baselineCrpcSource),
 		managedBaselineContent: baselineCrpcSource,
+		requiresExplicitOverwrite: false,
 		createReason: "Create crpc.ts with ratelimit middleware.",
 		updateReason: "Register ratelimit middleware in crpc.ts.",
 		skipReason: "Ratelimit middleware is already registered in crpc.ts."
@@ -12263,6 +12305,7 @@ function buildResendHttpRegistrationPlanFile(params) {
 		filePath: httpPath,
 		content: source,
 		managedBaselineContent: baselineHttpSource,
+		requiresExplicitOverwrite: false,
 		createReason: "Create http.ts with resend webhook route.",
 		updateReason: "Register resend webhook in http.ts.",
 		skipReason: "Resend webhook is already registered in http.ts."
@@ -15541,7 +15584,8 @@ async function runScaffoldCommandFlow(params) {
 			cwd: scaffoldProjectDir,
 			created: applyResult.created,
 			updated: applyResult.updated,
-			skipped: applyResult.skipped,
+			skipped: [...applyResult.skipped, ...applyResult.refused],
+			refused: applyResult.refused,
 			usedShadcn: params.template !== void 0 && params.template !== "expo",
 			template: params.template ?? null,
 			codegen: codegenResult.codegen,
@@ -15673,8 +15717,9 @@ async function applyPluginInstallPlanFiles(files, options) {
 	const result = {
 		created: [],
 		manualActions: [],
-		updated: [],
-		skipped: []
+		refused: [],
+		skipped: [],
+		updated: []
 	};
 	for (const file of files) {
 		if (file.manualActions?.length) result.manualActions.push(...file.manualActions);
@@ -15690,7 +15735,7 @@ async function applyPluginInstallPlanFiles(files, options) {
 			continue;
 		}
 		const managedBaselines = Array.isArray(file.managedBaselineContent) ? file.managedBaselineContent : typeof file.managedBaselineContent === "string" ? [file.managedBaselineContent] : [];
-		const requiresExplicitOverwrite = file.requiresExplicitOverwrite ?? (file.kind === "config" || file.kind === "scaffold" && file.templateId !== void 0 || file.kind === "env" && file.templateId !== LOCAL_CONVEX_ENV_TEMPLATE_ID && file.templateId !== KITCN_ENV_HELPER_TEMPLATE_ID);
+		const requiresExplicitOverwrite = file.requiresExplicitOverwrite ?? (file.kind === "config" || file.kind === "scaffold" || file.kind === "env" && file.templateId !== LOCAL_CONVEX_ENV_TEMPLATE_ID && file.templateId !== KITCN_ENV_HELPER_TEMPLATE_ID);
 		const existingContent = file.existingContent;
 		const matchesManagedBaseline = typeof existingContent === "string" && managedBaselines.some((managedBaselineContent) => isContentEquivalent({
 			filePath: file.path,
@@ -15700,7 +15745,7 @@ async function applyPluginInstallPlanFiles(files, options) {
 		let shouldOverwrite = options.overwrite || !requiresExplicitOverwrite || matchesManagedBaseline;
 		if (!shouldOverwrite && !options.yes && options.promptAdapter.isInteractive()) shouldOverwrite = await options.promptAdapter.confirm(`Overwrite ${file.path}?`);
 		if (!shouldOverwrite) {
-			result.skipped.push(file.path);
+			result.refused.push(file.path);
 			continue;
 		}
 		fs.mkdirSync(dirname(absolutePath), { recursive: true });
@@ -16970,4 +17015,4 @@ function isEntryPoint(entry, filename) {
 }
 
 //#endregion
-export { promptForScaffoldTemplateSelection as $, resolveCodegenTrimSegments as A, highlighter as At, runConfiguredCodegen as B, isEntryPoint as C, formatDependencyInstallCommand as Ct, parseInitCommandArgs as D, generateMeta as Dt, parseBackendRunJson as E, stripConvexCommandNoise as Et, resolveRunDeps as F, runMigrationFlow as G, runDevSchemaBackfillIfNeeded as H, runAfterScaffoldScript as I, withWorkingDirectory as J, trackProcess as K, runAggregateBackfillFlow as L, resolveDocTopic as M, resolveInitProjectDir as N, readPackageVersions as O, getConvexConfig as Ot, resolveMigrationConfig as P, promptForPluginSelection as Q, runAggregatePruneFlow as R, isConvexDevPreRunConflictFlag as S, detectPackageManager as St, parseArgs as T, serializeEnvValue as Tt, runInitCommandFlow as U, runConvexInitIfNeeded as V, runMigrationCreate as W, collectPluginScaffoldTemplates as X, createSpinner as Y, filterScaffoldTemplatePathMap as Z, formatInfoOutput as _, applyPlanningDependencyInstall as _t, cleanup as a, getPluginCatalogEntry as at, getDevAggregateBackfillStatePath as b, resolveSupportedDependencyWarnings as bt, createCommandEnv as c, buildPluginInstallPlan as ct, extractBackfillCliOptions as d, collectInstalledPluginKeys as dt, resolveAddTemplateDefaults as et, extractConcaveRunTargetArgs as f, getPluginLockfilePath as ft, formatDocsOutput as g, applyDependencyHintsInstall as gt, extractResetCliOptions as h, resolveSchemaInstalledPlugins as ht, buildInitializationPlan as i, resolveTemplatesByIdOrThrow as it, resolveConfiguredBackend as j, resolveBackfillConfig as k, logger as kt, ensureConvexGitignoreEntry as l, resolvePluginScaffoldRoots as lt, extractMigrationDownOptions as m, readPluginLockfile as mt, applyPluginInstallPlanFiles as n, resolvePresetScaffoldTemplates as nt, createBackendAdapter as o, getSupportedPluginKeys as ot, extractMigrationCliOptions as p, getSchemaFilePath as pt, withLocalCodegenEnv as q, assertNoRemovedDevPreRunFlag as r, resolveTemplateSelectionSource as rt, createBackendCommandEnv as s, isSupportedPluginKey as st, applyDependencyInstallPlan as t, resolvePluginPreset as tt, extractBackendRunTargetArgs as u, assertSchemaFileExists as ut, getAggregateBackfillDeploymentKey as v, applyPluginDependencyInstall as vt, isInitialized as w, resolveAuthEnvState as wt, hasRemoteConvexDeploymentEnv as x, resolveProjectScaffoldContext as xt, getConvexDeploymentCommandEnv as y, inspectPluginDependencyInstall as yt, runBackendFunction as z };
+export { promptForScaffoldTemplateSelection as $, resolveCodegenTrimSegments as A, PARSE_SNAPSHOT_SUFFIX as At, runConfiguredCodegen as B, isEntryPoint as C, formatDependencyInstallCommand as Ct, parseInitCommandArgs as D, generateMeta as Dt, parseBackendRunJson as E, stripConvexCommandNoise as Et, resolveRunDeps as F, runMigrationFlow as G, runDevSchemaBackfillIfNeeded as H, runAfterScaffoldScript as I, withWorkingDirectory as J, trackProcess as K, runAggregateBackfillFlow as L, resolveDocTopic as M, resolveInitProjectDir as N, readPackageVersions as O, getConvexConfig as Ot, resolveMigrationConfig as P, promptForPluginSelection as Q, runAggregatePruneFlow as R, isConvexDevPreRunConflictFlag as S, detectPackageManager as St, parseArgs as T, serializeEnvValue as Tt, runInitCommandFlow as U, runConvexInitIfNeeded as V, runMigrationCreate as W, collectPluginScaffoldTemplates as X, createSpinner as Y, filterScaffoldTemplatePathMap as Z, formatInfoOutput as _, applyPlanningDependencyInstall as _t, cleanup as a, getPluginCatalogEntry as at, getDevAggregateBackfillStatePath as b, resolveSupportedDependencyWarnings as bt, createCommandEnv as c, buildPluginInstallPlan as ct, extractBackfillCliOptions as d, collectInstalledPluginKeys as dt, resolveAddTemplateDefaults as et, extractConcaveRunTargetArgs as f, getPluginLockfilePath as ft, formatDocsOutput as g, applyDependencyHintsInstall as gt, extractResetCliOptions as h, resolveSchemaInstalledPlugins as ht, buildInitializationPlan as i, resolveTemplatesByIdOrThrow as it, resolveConfiguredBackend as j, highlighter as jt, resolveBackfillConfig as k, logger as kt, ensureConvexGitignoreEntry as l, resolvePluginScaffoldRoots as lt, extractMigrationDownOptions as m, readPluginLockfile as mt, applyPluginInstallPlanFiles as n, resolvePresetScaffoldTemplates as nt, createBackendAdapter as o, getSupportedPluginKeys as ot, extractMigrationCliOptions as p, getSchemaFilePath as pt, withLocalCodegenEnv as q, assertNoRemovedDevPreRunFlag as r, resolveTemplateSelectionSource as rt, createBackendCommandEnv as s, isSupportedPluginKey as st, applyDependencyInstallPlan as t, resolvePluginPreset as tt, extractBackendRunTargetArgs as u, assertSchemaFileExists as ut, getAggregateBackfillDeploymentKey as v, applyPluginDependencyInstall as vt, isInitialized as w, resolveAuthEnvState as wt, hasRemoteConvexDeploymentEnv as x, resolveProjectScaffoldContext as xt, getConvexDeploymentCommandEnv as y, inspectPluginDependencyInstall as yt, runBackendFunction as z };