void 0.10.13 → 0.20.0

package/dist/runtime/ws.d.mts

@@ -1,8 +1,7 @@
-import { t as StandardSchemaV1 } from "../standard-schema-DJ0HW7QP.mjs";
-import { r as AuthUser } from "../auth-qgMlYp7Z.mjs";
-import { a as CloudEnv } from "../handler-Cjh8uM3Y.mjs";
+import { t as StandardSchemaV1 } from "../standard-schema-Fo_vCAZh.mjs";
+import { r as AuthUser } from "../auth-DkcFflXV.mjs";
+import { a as CloudEnv } from "../handler-D1hLsObx.mjs";
 import { WebSocketRouteMap } from "void/routes";
-
 //#region src/runtime/ws.d.ts
 type MaybePromise<T> = T | Promise<T>;
 type ParamsRecord = Record<string, string>;
@@ -17,19 +16,19 @@ type ServerEventOf<P extends keyof WebSocketRouteMap> = WsEntry<P> extends {
   server: infer T;
 } ? T : never;
 type HasParams<P extends keyof WebSocketRouteMap> = ParamsOf<P> extends Record<string, never> ? false : [keyof ParamsOf<P>] extends [never] ? false : true;
-type WebSocketConnection<ServerEvent = unknown> = {
+export type WebSocketConnection<ServerEvent = unknown> = {
   readonly id: string;
   readonly state: unknown;
   send(event: ServerEvent): Promise<void>;
   close(code?: number, reason?: string): void;
   setState(data: unknown): void;
 };
-type RoomController<ServerEvent = unknown> = {
+export type RoomController<ServerEvent = unknown> = {
   broadcast(event: ServerEvent, excludeIds?: Array<string>): Promise<void>;
   getConnections(): Iterable<WebSocketConnection<ServerEvent>>;
   getConnection(id: string): WebSocketConnection<ServerEvent> | undefined;
 };
-type WebSocketBaseContext = {
+export type WebSocketBaseContext = {
   readonly id: string;
   readonly params: ParamsRecord;
   readonly user: AuthUser | null;
@@ -37,14 +36,14 @@ type WebSocketBaseContext = {
   readonly env: CloudEnv["Bindings"];
   readonly storage: DurableObjectStorage;
 };
-type RoomContext<ServerEvent = unknown> = WebSocketBaseContext & {
+export type RoomContext<ServerEvent = unknown> = WebSocketBaseContext & {
   readonly room: RoomController<ServerEvent>;
   readonly connection: WebSocketConnection<ServerEvent>;
 };
-type SocketContext<ServerEvent = unknown> = WebSocketBaseContext & {
+export type SocketContext<ServerEvent = unknown> = WebSocketBaseContext & {
   readonly socket: WebSocketConnection<ServerEvent>;
 };
-type RoomDefinition<ClientSchema extends StandardSchemaV1 = StandardSchemaV1, ServerSchema extends StandardSchemaV1 = StandardSchemaV1> = {
+export type RoomDefinition<ClientSchema extends StandardSchemaV1 = StandardSchemaV1, ServerSchema extends StandardSchemaV1 = StandardSchemaV1> = {
   readonly __kind: "room";
   readonly messages: {
     client: ClientSchema;
@@ -60,7 +59,7 @@ type RoomDefinition<ClientSchema extends StandardSchemaV1 = StandardSchemaV1, Se
   }) => MaybePromise<void>;
   onRequest?: (ctx: RoomContext<StandardSchemaV1.InferInput<ServerSchema>>) => MaybePromise<Response>;
 };
-type SocketDefinition<ClientSchema extends StandardSchemaV1 = StandardSchemaV1, ServerSchema extends StandardSchemaV1 = StandardSchemaV1> = {
+export type SocketDefinition<ClientSchema extends StandardSchemaV1 = StandardSchemaV1, ServerSchema extends StandardSchemaV1 = StandardSchemaV1> = {
   readonly __kind: "socket";
   readonly messages: {
     client: ClientSchema;
@@ -76,15 +75,15 @@ type SocketDefinition<ClientSchema extends StandardSchemaV1 = StandardSchemaV1,
   }) => MaybePromise<void>;
   onRequest?: (ctx: SocketContext<StandardSchemaV1.InferInput<ServerSchema>>) => MaybePromise<Response>;
 };
-type AnyWebSocketDefinition = RoomDefinition | SocketDefinition;
-declare function defineRoom<ClientSchema extends StandardSchemaV1, ServerSchema extends StandardSchemaV1>(definition: Omit<RoomDefinition<ClientSchema, ServerSchema>, "__kind">): RoomDefinition<ClientSchema, ServerSchema>;
-declare function defineWebSocket<ClientSchema extends StandardSchemaV1, ServerSchema extends StandardSchemaV1>(definition: Omit<SocketDefinition<ClientSchema, ServerSchema>, "__kind">): SocketDefinition<ClientSchema, ServerSchema>;
-type VoidSocketCloseEvent = {
+export type AnyWebSocketDefinition = RoomDefinition | SocketDefinition;
+export declare function defineRoom<ClientSchema extends StandardSchemaV1, ServerSchema extends StandardSchemaV1>(definition: Omit<RoomDefinition<ClientSchema, ServerSchema>, "__kind">): RoomDefinition<ClientSchema, ServerSchema>;
+export declare function defineWebSocket<ClientSchema extends StandardSchemaV1, ServerSchema extends StandardSchemaV1>(definition: Omit<SocketDefinition<ClientSchema, ServerSchema>, "__kind">): SocketDefinition<ClientSchema, ServerSchema>;
+export type VoidSocketCloseEvent = {
   code?: number;
   reason?: string;
   wasClean?: boolean;
 };
-type ConnectCommonOptions = {
+export type ConnectCommonOptions = {
   baseURL?: string;
   reconnect?: boolean;
   reconnectDelayMs?: number;
@@ -102,7 +101,7 @@ type ListenerMap<ServerEvent> = {
   close: (event: VoidSocketCloseEvent) => void;
   error: (error: unknown) => void;
 };
-declare class VoidSocket<P extends keyof WebSocketRouteMap & string> {
+export declare class VoidSocket<P extends keyof WebSocketRouteMap & string> {
   private readonly url;
   private readonly options;
   private socket;
@@ -117,7 +116,6 @@ declare class VoidSocket<P extends keyof WebSocketRouteMap & string> {
   close(code?: number, reason?: string): void;
   on<K extends keyof ListenerMap<ServerEventOf<P>>>(type: K, handler: ListenerMap<ServerEventOf<P>>[K]): () => void;
 }
-declare function connect<P extends keyof WebSocketRouteMap & string>(path: HasParams<P> extends false ? P : never): VoidSocket<P>;
-declare function connect<P extends keyof WebSocketRouteMap & string>(path: P, options: ConnectOptions<P>): VoidSocket<P>;
-//#endregion
-export { AnyWebSocketDefinition, ConnectCommonOptions, RoomContext, RoomController, RoomDefinition, SocketContext, SocketDefinition, VoidSocket, VoidSocketCloseEvent, WebSocketBaseContext, WebSocketConnection, connect, defineRoom, defineWebSocket };
+export declare function connect<P extends keyof WebSocketRouteMap & string>(path: HasParams<P> extends false ? P : never): VoidSocket<P>;
+export declare function connect<P extends keyof WebSocketRouteMap & string>(path: P, options: ConnectOptions<P>): VoidSocket<P>;
+//#endregion

package/dist/{scan-ChWt4pX1.mjs → scan-BMH4rzlv.mjs}

@@ -1,8 +1,9 @@
-import { a as join, i as isAbsolute, t as basename } from "./dist-DaKKDf8D.mjs";
-import { n as readProjectPaths } from "./project-paths-BQd7OmIo.mjs";
-import { n as globSync, t as glob } from "./dist-BuiRJkTd.mjs";
-import { c as isIdentifier, d as isObjectExpression, l as isLiteral, s as isCallExpression } from "./entry-D7yy4xVH.mjs";
-import { c as parseWebSocketFilename, o as isRouteEnabledForEnvironment, s as parseRouteFilename, t as scanPages } from "./scan-NU4xKGci.mjs";
+import { a as isAbsolute, o as join, t as basename } from "./dist-BrsS7cai.mjs";
+import { n as readProjectPaths } from "./project-paths-SK8nMHPp.mjs";
+import { n as globSync, t as glob } from "./dist-m40_XgNh.mjs";
+import { c as isIdentifier, d as isObjectExpression, l as isLiteral, s as isCallExpression } from "./entry-DU3oDoQ3.mjs";
+import { c as parseWebSocketFilename, o as isRouteEnabledForEnvironment, s as parseRouteFilename, t as scanPages } from "./scan-CpK-57ug.mjs";
+import { i as scanEmailHandlers } from "./email-Ce6SQq-i.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import { pathToFileURL } from "node:url";
 import { parseSync } from "vite";
@@ -56,7 +57,8 @@ function resolveDir(root, dir) {
 function parseJobFiles(root, jobsDir, files) {
 	const jobsDirPath = resolveDir(root, jobsDir);
 	return files.filter((filePath) => !filePath.split("/").some((segment) => segment.startsWith("_"))).sort((leftFilePath, rightFilePath) => leftFilePath.localeCompare(rightFilePath)).map((filePath) => {
-		const source = readFileSync(join(jobsDirPath, filePath), "utf-8");
+		const absPath = join(jobsDirPath, filePath);
+		const source = readFileSync(absPath, "utf-8");
 		return {
 			filePath,
 			name: extractJobName(filePath),
@@ -65,7 +67,8 @@ function parseJobFiles(root, jobsDir, files) {
 	});
 }
 async function scanJobs(root, jobsDir = "crons") {
-	return parseJobFiles(root, jobsDir, await glob(`**/*.{${JOB_EXTENSIONS.join(",")}}`, {
+	const pattern = `**/*.{${JOB_EXTENSIONS.join(",")}}`;
+	return parseJobFiles(root, jobsDir, await glob(pattern, {
 		cwd: resolveDir(root, jobsDir),
 		absolute: false
 	}).catch(() => []));
@@ -92,9 +95,9 @@ const QUEUE_EXTENSIONS = [
 	"mjs"
 ];
 function extractName(filePath) {
-	return filePath.replace(/\.[^.]+$/, "");
+	return filePath.replace(/\.[^.]+$/, "").replaceAll("/", "-");
 }
-function deriveBindingName(name) {
+function deriveQueueBindingName(name) {
 	return "QUEUE_" + name.toUpperCase().replace(/[^A-Z0-9]/g, "_");
 }
 function extractConsumerOption(source, name) {
@@ -104,23 +107,39 @@ function extractConsumerOption(source, name) {
 }
 function parseQueueFiles(root, queuesDir, files) {
 	const queuesDirPath = isAbsolute(queuesDir) ? queuesDir : join(root, queuesDir);
-	return files.filter((filePath) => !filePath.split("/").some((segment) => segment.startsWith("_"))).sort((leftFilePath, rightFilePath) => leftFilePath.localeCompare(rightFilePath)).map((filePath) => {
-		const source = readFileSync(join(queuesDirPath, filePath), "utf-8");
+	const definitions = files.filter((filePath) => !filePath.split("/").some((segment) => segment.startsWith("_"))).sort().map((filePath) => {
+		const absPath = join(queuesDirPath, filePath);
+		const source = readFileSync(absPath, "utf-8");
 		const name = extractName(filePath);
 		return {
 			filePath,
 			name,
-			bindingName: deriveBindingName(name),
+			bindingName: deriveQueueBindingName(name),
 			maxBatchSize: extractConsumerOption(source, "maxBatchSize"),
 			maxBatchTimeout: extractConsumerOption(source, "maxBatchTimeout"),
 			maxRetries: extractConsumerOption(source, "maxRetries"),
 			retryDelay: extractConsumerOption(source, "retryDelay")
 		};
 	});
+	const filesByName = /* @__PURE__ */ new Map();
+	for (const definition of definitions) {
+		const matchingFiles = filesByName.get(definition.name) ?? [];
+		matchingFiles.push(definition.filePath);
+		filesByName.set(definition.name, matchingFiles);
+	}
+	const collisions = [...filesByName].filter(([, matchingFiles]) => matchingFiles.length > 1).sort(([leftName], [rightName]) => leftName < rightName ? -1 : leftName > rightName ? 1 : 0).map(([name, matchingFiles]) => `  ${JSON.stringify(name)}: ${matchingFiles.map((file) => JSON.stringify(file)).join(", ")}`);
+	if (collisions.length > 0) throw new Error([
+		"queue: Multiple queue files resolve to the same queue name:",
+		...collisions,
+		"Rename the conflicting files so each queue has a unique name."
+	].join("\n"));
+	return definitions;
 }
 async function scanQueues(root, queuesDir = "queues") {
-	return parseQueueFiles(root, queuesDir, await glob(`**/*.{${QUEUE_EXTENSIONS.join(",")}}`, {
-		cwd: isAbsolute(queuesDir) ? queuesDir : join(root, queuesDir),
+	const pattern = `**/*.{${QUEUE_EXTENSIONS.join(",")}}`;
+	const queuesDirPath = isAbsolute(queuesDir) ? queuesDir : join(root, queuesDir);
+	return parseQueueFiles(root, queuesDir, await glob(pattern, {
+		cwd: queuesDirPath,
 		absolute: false
 	}).catch(() => []));
 }
@@ -128,8 +147,9 @@ function scanQueuesSync(root, queuesDir = "queues") {
 	const pattern = `**/*.{${QUEUE_EXTENSIONS.join(",")}}`;
 	let files;
 	try {
+		const queuesDirPath = isAbsolute(queuesDir) ? queuesDir : join(root, queuesDir);
 		files = globSync(pattern, {
-			cwd: isAbsolute(queuesDir) ? queuesDir : join(root, queuesDir),
+			cwd: queuesDirPath,
 			absolute: false
 		});
 	} catch {
@@ -268,7 +288,8 @@ function parseWebSocketFiles(root, files, paths = readProjectPaths(root), enviro
 	});
 }
 async function scanWebSocketRoutes(root, paths = readProjectPaths(root), environment) {
-	return parseWebSocketFiles(root, await glob(`**/*.{${HANDLER_EXTENSIONS.join(",")}}`, {
+	const pattern = `**/*.{${HANDLER_EXTENSIONS.join(",")}}`;
+	return parseWebSocketFiles(root, await glob(pattern, {
 		cwd: paths.routesDir,
 		absolute: false
 	}).catch(() => []), paths, environment);
@@ -324,7 +345,7 @@ function compareRouteSpecificity(a, b) {
 */
 async function scanRoutes(root, options) {
 	const paths = options?.paths ?? readProjectPaths(root);
-	const [routeFiles, websockets, middlewareFiles, jobs, queues, pages] = await Promise.all([
+	const [routeFiles, websockets, middlewareFiles, jobs, queues, pages, email] = await Promise.all([
 		glob(ROUTE_PATTERN, {
 			cwd: paths.routesDir,
 			absolute: false
@@ -339,7 +360,8 @@ async function scanRoutes(root, options) {
 		scanPages(root, {
 			output: options?.output,
 			paths
-		})
+		}),
+		scanEmailHandlers(paths.sourceRoot)
 	]);
 	const routesDir = paths.routesDir;
 	return {
@@ -351,7 +373,8 @@ async function scanRoutes(root, options) {
 		middleware: parseMiddlewareDefinitions(middlewareFiles),
 		jobs,
 		queues,
-		pages
+		pages,
+		email
 	};
 }
 function scanMiddlewareSync(root, paths = readProjectPaths(root)) {

package/dist/{scan-NU4xKGci.mjs → scan-CpK-57ug.mjs}

@@ -1,6 +1,6 @@
-import { a as join, n as dirname, r as extname, t as basename } from "./dist-DaKKDf8D.mjs";
-import { n as readProjectPaths } from "./project-paths-BQd7OmIo.mjs";
-import { t as glob } from "./dist-BuiRJkTd.mjs";
+import { i as extname, n as dirname, o as join, t as basename } from "./dist-BrsS7cai.mjs";
+import { n as readProjectPaths } from "./project-paths-SK8nMHPp.mjs";
+import { t as glob } from "./dist-m40_XgNh.mjs";
 import { existsSync, readFileSync } from "node:fs";
 //#region src/router/parse-filename.ts
 const EXTENSIONS = [
@@ -194,7 +194,8 @@ async function scanPages(root, options) {
 		layouts: [],
 		namedLayouts: []
 	};
-	const files = await glob(`**/*.{${COMPONENT_EXTENSIONS.join(",")}}`, {
+	const pattern = `**/*.{${COMPONENT_EXTENSIONS.join(",")}}`;
+	const files = await glob(pattern, {
 		cwd: pagesDir,
 		absolute: false
 	});

package/dist/{secret-Dt32J6RI.mjs → secret-BqTxGqki.mjs}

@@ -1,11 +1,16 @@
-import { D as outro, E as note, O as password, S as confirm, T as log, a as cliTitle, j as isCancel, w as intro, x as cancel } from "./agents-CtgBYqld.mjs";
-import { b as readProjectConfig, f as getToken, n as PlatformClient } from "./client-Gb71-XkG.mjs";
-import { r as resolveProjectBySlug, t as getRequestedProjectSlug } from "./resolve-project-BBMtLLV9.mjs";
+import { A as password, C as cancel, D as log, E as intro, F as isCancel, O as note, k as outro, r as cliTitle, w as confirm } from "./output-tFQLLj26.mjs";
+import { b as readDeploymentPlatform, c as getToken, x as readProjectConfig } from "./auth-W9WII-mN.mjs";
+import { m as validateSecretValues } from "./env-validation-ENpMy6Ez.mjs";
+import { n as PlatformClient } from "./client-CyCHWSO_.mjs";
+import { r as resolveProjectBySlug, t as getRequestedProjectSlug } from "./resolve-project--Vxawf7z.mjs";
 import { readFileSync } from "node:fs";
 //#region src/cli/secret.ts
 async function runSecretCommand(root, args) {
 	console.log();
 	intro(cliTitle("secret"));
+	const platform = readDeploymentPlatform(root);
+	if (platform === "cloudflare") return runCloudflareSecretCommand(root, args);
+	if (platform === "none") throw new Error("secret: Deployment is disabled. Run `void init` to choose a platform.");
 	const token = getToken(root);
 	if (!token) {
 		log.error("Not logged in. Run `void auth login` first.");
@@ -15,7 +20,8 @@ async function runSecretCommand(root, args) {
 	const requestedProjectName = getRequestedProjectSlug({ projectSlug: args.projectName });
 	let projectId;
 	if (requestedProjectName) {
-		const config = resolveProjectBySlug(await client.listProjects(), requestedProjectName);
+		const projects = await client.listProjects();
+		const config = resolveProjectBySlug(projects, requestedProjectName);
 		if (!config) throw new Error(`secret: No project found with slug '${requestedProjectName}'.`);
 		projectId = config.projectId;
 	} else {
@@ -35,6 +41,10 @@ async function runSecretCommand(root, args) {
 	}
 	if (args.action === "put") {
 		const value = args.value ?? await readSecretValue();
+		await validateSecretValues(root, [{
+			name: args.name,
+			value
+		}]);
 		await client.setSecret(projectId, args.name, value);
 		outro(`Secret ${args.name} set.`);
 		return;
@@ -46,6 +56,7 @@ async function runSecretCommand(root, args) {
 			outro("Nothing to sync.");
 			return;
 		}
+		await validateSecretValues(root, secrets);
 		log.info(`Found ${secrets.length} secret(s):`);
 		for (const s of secrets) log.message(`  ${s.name}`);
 		const proceed = await confirm({ message: `This will overwrite ${secrets.length} secret(s) in the remote environment. Continue?` });
@@ -63,6 +74,52 @@ async function runSecretCommand(root, args) {
 	await client.deleteSecret(projectId, args.name);
 	outro(`Secret ${args.name} deleted.`);
 }
+async function runCloudflareSecretCommand(root, args) {
+	if (args.projectName) throw new Error("secret: --project selects a Void platform project and is not used for direct Cloudflare apps.");
+	const { deleteCloudflareSecret, listCloudflareSecrets, putCloudflareSecret, resolveCloudflareOperationContext, syncCloudflareSecrets } = await import("./cloudflare-operations-CPTpRW6d.mjs").then((n) => n.t);
+	const context = resolveCloudflareOperationContext(root);
+	if (args.action === "list") {
+		const secrets = await listCloudflareSecrets(context);
+		if (secrets.length === 0) {
+			outro("No secrets set.");
+			return;
+		}
+		note(secrets.map((name) => `  ${name}`).join("\n"), "Secrets");
+		outro(`${secrets.length} secret(s)`);
+		return;
+	}
+	if (args.action === "put") {
+		const value = args.value ?? await readSecretValue();
+		await validateSecretValues(root, [{
+			name: args.name,
+			value
+		}]);
+		await putCloudflareSecret(context, args.name, value);
+		outro(`Secret ${args.name} set.`);
+		return;
+	}
+	if (args.action === "sync") {
+		const secrets = parseDotenvFile(args.file);
+		if (secrets.length === 0) {
+			log.warn("No secrets found in file.");
+			outro("Nothing to sync.");
+			return;
+		}
+		await validateSecretValues(root, secrets);
+		log.info(`Found ${secrets.length} secret(s):`);
+		for (const secret of secrets) log.message(`  ${secret.name}`);
+		const proceed = await confirm({ message: `This will overwrite ${secrets.length} secret(s) in the Cloudflare Worker. Continue?` });
+		if (isCancel(proceed) || !proceed) {
+			cancel("Secret sync cancelled.");
+			process.exit(0);
+		}
+		await syncCloudflareSecrets(context, secrets);
+		outro(`Synced ${secrets.length} secret(s).`);
+		return;
+	}
+	await deleteCloudflareSecret(context, args.name);
+	outro(`Secret ${args.name} deleted.`);
+}
 const SECRET_KEY_RE = /^[A-Z][A-Z0-9_]*$/;
 function parseDotenvFile(filePath) {
 	const content = readFileSync(filePath, "utf-8");
@@ -95,7 +152,7 @@ async function readSecretValue() {
 		message: "Enter secret value:",
 		mask: "*"
 	});
-	if (isCancel(result)) {
+	if (isCancel(result) || typeof result === "symbol") {
 		cancel("Secret command cancelled.");
 		process.exit(0);
 	}

package/dist/{skills-CLjN0uUO.mjs → skills-Q46GZMO-.mjs}

@@ -1,5 +1,5 @@
-import { a as join, s as relative } from "./dist-DaKKDf8D.mjs";
-import { T as log, r as getPackageDir } from "./agents-CtgBYqld.mjs";
+import { c as relative, o as join } from "./dist-BrsS7cai.mjs";
+import { D as log, p as getPackageDir } from "./output-tFQLLj26.mjs";
 import { existsSync, mkdirSync, readFileSync, readdirSync, readlinkSync, symlinkSync } from "node:fs";
 //#region src/cli/skills.ts
 function parseSkills(skillsDir) {
@@ -28,7 +28,8 @@ function linkSkills(root, skillsDir, skills, agentSkillsDir) {
 	let linked = 0;
 	for (const skill of skills) {
 		const linkPath = join(targetDir, skill.dirName);
-		const relativeTarget = relative(targetDir, join(skillsDir, skill.dirName));
+		const sourcePath = join(skillsDir, skill.dirName);
+		const relativeTarget = relative(targetDir, sourcePath);
 		if (existsSync(linkPath)) {
 			try {
 				if (readlinkSync(linkPath) === relativeTarget) {
@@ -46,7 +47,8 @@ function linkSkills(root, skillsDir, skills, agentSkillsDir) {
 	return linked;
 }
 function linkSkillsForSpecificAgents(root, agents) {
-	const skillsDir = join(getPackageDir(), "skills");
+	const packageDir = getPackageDir();
+	const skillsDir = join(packageDir, "skills");
 	const skills = parseSkills(skillsDir);
 	if (skills.length === 0) return 0;
 	if (agents.length === 0) return 0;

package/dist/{standard-schema-DJ0HW7QP.d.mts → standard-schema-Fo_vCAZh.d.mts}

@@ -1,11 +1,11 @@
 //#region src/standard-schema.d.ts
 /**
-* Standard Schema V1 types, inlined from the spec.
-* https://github.com/standard-schema/standard-schema
-*
-* Per the spec's design, libraries may copy these types directly
-* to avoid requiring `@standard-schema/spec` as a dependency.
-*/
+ * Standard Schema V1 types, inlined from the spec.
+ * https://github.com/standard-schema/standard-schema
+ *
+ * Per the spec's design, libraries may copy these types directly
+ * to avoid requiring `@standard-schema/spec` as a dependency.
+ */
 type StandardSchemaV1<Input = unknown, Output = Input> = {
   readonly "~standard": StandardSchemaV1.Props<Input, Output>;
 };

package/dist/{subcommand-prompt-BzV8iQZo.mjs → subcommand-prompt-WfySCQ7S.mjs}

@@ -1,4 +1,4 @@
-import { _ as S_RADIO_ACTIVE, b as S_STEP_SUBMIT, g as S_CHECKBOX_INACTIVE, h as S_CHECKBOX_ACTIVE, m as S_BAR_END, p as S_BAR, u as import_picocolors, v as S_RADIO_INACTIVE, y as S_STEP_ACTIVE } from "./agents-CtgBYqld.mjs";
+import { R as wrapAnsi, S as S_STEP_SUBMIT, _ as S_CHECKBOX_INACTIVE, b as S_RADIO_INACTIVE, c as import_picocolors, g as S_CHECKBOX_ACTIVE, h as S_BAR_END, m as S_BAR, x as S_STEP_ACTIVE, y as S_RADIO_ACTIVE } from "./output-tFQLLj26.mjs";
 //#region src/cli/subcommand-prompt.ts
 function promptSubcommand(command, subcommands) {
 	return new Promise((resolve) => {
@@ -6,7 +6,7 @@ function promptSubcommand(command, subcommands) {
 		let phase = "select";
 		let cursor = 0;
 		let input = "";
-		let prevLineCount = 0;
+		let previousFrame = "";
 		let resolved = false;
 		let selectedSub = null;
 		let selectedArg;
@@ -20,9 +20,45 @@ function promptSubcommand(command, subcommands) {
 		stdin.resume();
 		stdout.write("\x1B[?25l");
 		function clear() {
-			if (prevLineCount > 0) stdout.write(`\x1B[${prevLineCount}A\x1B[0J`);
+			if (previousFrame) {
+				const rows = wrapAnsi(previousFrame, stdout.columns || 80, {
+					hard: true,
+					trim: false
+				}).split("\n").length;
+				stdout.write(`\x1B[${rows}A\r\x1B[0J`);
+				previousFrame = "";
+			}
+		}
+		function truncate(text, columns = (stdout.columns || 80) - 1, tail = false) {
+			const width = Math.max(1, columns - 1);
+			const wrap = (value) => wrapAnsi(value, width, {
+				hard: true,
+				trim: false
+			});
+			const lines = wrap(text).split("\n");
+			if (lines.length === 1) return lines[0];
+			if (tail) {
+				const suffix = Array.from(text).slice(-width);
+				while (wrap(suffix.join("")).includes("\n")) suffix.shift();
+				return `…${suffix.join("")}`;
+			}
+			return `${lines[0]}…`;
+		}
+		function writeFrame(header, options, footer) {
+			const count = Math.max(1, Math.min(7, (stdout.rows || 24) - footer.length - 5));
+			const start = Math.max(0, Math.min(cursor - Math.floor(count / 2), options.length - count));
+			previousFrame = [
+				truncate(header),
+				import_picocolors.default.gray(S_BAR),
+				...options.slice(start, start + count).map((option) => truncate(option)),
+				import_picocolors.default.gray(S_BAR),
+				...footer.map((line) => truncate(line)),
+				import_picocolors.default.gray(S_BAR_END)
+			].join("\n");
+			stdout.write(previousFrame + "\n");
 		}
 		function render() {
+			if (resolved) return;
 			clear();
 			if (phase === "select") renderSelect();
 			else if (phase === "flags") renderFlags();
@@ -37,8 +73,6 @@ function promptSubcommand(command, subcommands) {
 		function renderSelect() {
 			const lines = [];
 			const focused = subcommands[cursor];
-			lines.push(`${import_picocolors.default.cyan(S_STEP_ACTIVE)}  ${import_picocolors.default.cyan(title)}`);
-			lines.push(import_picocolors.default.gray(S_BAR));
 			const maxName = Math.max(...subcommands.map((s) => s.name.length));
 			for (let i = 0; i < subcommands.length; i++) {
 				const sub = subcommands[i];
@@ -46,26 +80,24 @@ function promptSubcommand(command, subcommands) {
 				const radio = isFocused ? import_picocolors.default.green(S_RADIO_ACTIVE) : import_picocolors.default.dim(S_RADIO_INACTIVE);
 				const name = sub.name.padEnd(maxName);
 				let suffix = "";
-				if (sub.arg) if (isFocused && input.length > 0) suffix = `  ${import_picocolors.default.cyan(input)}`;
-				else suffix = `  ${import_picocolors.default.dim(sub.arg)}`;
-				else if (sub.hint) suffix = `  ${import_picocolors.default.dim(sub.hint)}`;
+				if (sub.arg) {
+					if (isFocused && input.length > 0) suffix = `  ${import_picocolors.default.cyan(truncate(input, (stdout.columns || 80) - maxName - 9, true))}`;
+					else suffix = `  ${import_picocolors.default.dim(sub.arg)}`;
+				} else if (sub.hint) suffix = `  ${import_picocolors.default.dim(sub.hint)}`;
 				if (isFocused) lines.push(`${import_picocolors.default.gray(S_BAR)}  ${radio} ${import_picocolors.default.reset(name)}${suffix}`);
 				else lines.push(`${import_picocolors.default.gray(S_BAR)}  ${radio} ${import_picocolors.default.dim(name)}${suffix}`);
 			}
-			lines.push(import_picocolors.default.gray(S_BAR));
-			lines.push(`${import_picocolors.default.gray(S_BAR)}  ${import_picocolors.default.dim(focused.description)}`);
-			if (focused.arg) if (focused.arg.startsWith("<")) lines.push(`${import_picocolors.default.gray(S_BAR)}  ${import_picocolors.default.dim(`Type ${focused.arg}, then press Enter`)}`);
-			else lines.push(`${import_picocolors.default.gray(S_BAR)}  ${import_picocolors.default.dim(`Type ${focused.arg}, then press Enter, or press Enter to skip`)}`);
-			lines.push(import_picocolors.default.gray(S_BAR_END));
-			stdout.write(lines.join("\n") + "\n");
-			prevLineCount = lines.length;
+			const footer = [`${import_picocolors.default.gray(S_BAR)}  ${import_picocolors.default.dim(focused.description)}`];
+			if (focused.arg) {
+				if (focused.arg.startsWith("<")) footer.push(`${import_picocolors.default.gray(S_BAR)}  ${import_picocolors.default.dim(`Type ${focused.arg}, then press Enter`)}`);
+				else footer.push(`${import_picocolors.default.gray(S_BAR)}  ${import_picocolors.default.dim(`Type ${focused.arg}, then press Enter, or press Enter to skip`)}`);
+			}
+			writeFrame(`${import_picocolors.default.cyan(S_STEP_ACTIVE)}  ${import_picocolors.default.cyan(title)}`, lines, footer);
 		}
 		function renderFlags() {
 			const flags = selectedSub.flags;
 			const focused = flags[cursor];
 			const lines = [];
-			lines.push(headerLine());
-			lines.push(import_picocolors.default.gray(S_BAR));
 			const maxFlag = Math.max(...flags.map((f) => f.name.length));
 			for (let i = 0; i < flags.length; i++) {
 				const flag = flags[i];
@@ -74,22 +106,20 @@ function promptSubcommand(command, subcommands) {
 				const checkbox = state.enabled ? import_picocolors.default.green(S_CHECKBOX_ACTIVE) : isFocused ? S_CHECKBOX_INACTIVE : import_picocolors.default.dim(S_CHECKBOX_INACTIVE);
 				const name = flag.name.padEnd(maxFlag);
 				let valueText = "";
-				if (flag.arg) if (state.enabled && state.value.length > 0) valueText = `  ${isFocused ? import_picocolors.default.cyan(state.value) : import_picocolors.default.dim(state.value)}`;
-				else valueText = `  ${import_picocolors.default.dim(flag.arg)}`;
+				if (flag.arg) {
+					if (state.enabled && state.value.length > 0) {
+						const value = truncate(state.value, (stdout.columns || 80) - maxFlag - 9, true);
+						valueText = `  ${isFocused ? import_picocolors.default.cyan(value) : import_picocolors.default.dim(value)}`;
+					} else valueText = `  ${import_picocolors.default.dim(flag.arg)}`;
+				}
 				if (isFocused) lines.push(`${import_picocolors.default.gray(S_BAR)}  ${checkbox} ${import_picocolors.default.reset(name)}${valueText}`);
 				else lines.push(`${import_picocolors.default.gray(S_BAR)}  ${checkbox} ${import_picocolors.default.dim(name)}${valueText}`);
 			}
-			lines.push(import_picocolors.default.gray(S_BAR));
-			lines.push(`${import_picocolors.default.gray(S_BAR)}  ${import_picocolors.default.dim(focused.description)}`);
-			lines.push(import_picocolors.default.gray(S_BAR_END));
-			stdout.write(lines.join("\n") + "\n");
-			prevLineCount = lines.length;
+			writeFrame(headerLine(), lines, [`${import_picocolors.default.gray(S_BAR)}  ${import_picocolors.default.dim(focused.description)}`]);
 		}
 		function renderMultiSelect() {
 			const options = selectedSub.followUp.options;
 			const lines = [];
-			lines.push(headerLine());
-			lines.push(import_picocolors.default.gray(S_BAR));
 			const maxLabel = Math.max(...options.map((o) => o.label.length));
 			for (let i = 0; i < options.length; i++) {
 				const opt = options[i];
@@ -100,25 +130,16 @@ function promptSubcommand(command, subcommands) {
 				if (isFocused) lines.push(`${import_picocolors.default.gray(S_BAR)}  ${checkbox} ${import_picocolors.default.reset(label)}`);
 				else lines.push(`${import_picocolors.default.gray(S_BAR)}  ${checkbox} ${import_picocolors.default.dim(label)}`);
 			}
-			lines.push(import_picocolors.default.gray(S_BAR));
-			lines.push(`${import_picocolors.default.gray(S_BAR)}  ${import_picocolors.default.dim("space to toggle, enter to confirm")}`);
-			lines.push(import_picocolors.default.gray(S_BAR_END));
-			stdout.write(lines.join("\n") + "\n");
-			prevLineCount = lines.length;
+			writeFrame(headerLine(), lines, [`${import_picocolors.default.gray(S_BAR)}  ${import_picocolors.default.dim("space to toggle, enter to confirm")}`]);
 		}
 		function renderRepeatInput() {
 			const followUp = selectedSub.followUp;
 			const lines = [];
-			lines.push(headerLine());
-			lines.push(import_picocolors.default.gray(S_BAR));
 			for (const entry of repeatEntries) lines.push(`${import_picocolors.default.gray(S_BAR)}  ${import_picocolors.default.dim(entry)}`);
-			if (repeatInput.length > 0) lines.push(`${import_picocolors.default.gray(S_BAR)}  ${import_picocolors.default.cyan(repeatInput)}`);
+			if (repeatInput.length > 0) lines.push(`${import_picocolors.default.gray(S_BAR)}  ${import_picocolors.default.cyan(truncate(repeatInput, (stdout.columns || 80) - 4, true))}`);
 			else lines.push(`${import_picocolors.default.gray(S_BAR)}  ${import_picocolors.default.dim(followUp.placeholder)}`);
-			lines.push(import_picocolors.default.gray(S_BAR));
-			lines.push(`${import_picocolors.default.gray(S_BAR)}  ${import_picocolors.default.dim("enter to add, empty to finish")}`);
-			lines.push(import_picocolors.default.gray(S_BAR_END));
-			stdout.write(lines.join("\n") + "\n");
-			prevLineCount = lines.length;
+			cursor = lines.length - 1;
+			writeFrame(headerLine(), lines, [`${import_picocolors.default.gray(S_BAR)}  ${import_picocolors.default.dim("enter to add, empty to finish")}`]);
 		}
 		function cleanup() {
 			if (resolved) return;
@@ -126,6 +147,8 @@ function promptSubcommand(command, subcommands) {
 			stdin.setRawMode(wasRaw);
 			stdin.pause();
 			stdin.removeListener("data", onData);
+			stdout.removeListener("resize", render);
+			process.removeListener("exit", onExit);
 			stdout.write("\x1B[?25h");
 		}
 		function submit(result) {
@@ -200,7 +223,6 @@ function promptSubcommand(command, subcommands) {
 				if (focused.arg && focused.arg.startsWith("<") && input.length === 0) return;
 				selectedSub = focused;
 				selectedArg = focused.arg ? input || void 0 : void 0;
-				clear();
 				advancePhase();
 				return;
 			}
@@ -239,7 +261,6 @@ function promptSubcommand(command, subcommands) {
 			if (key === "\r" || key === "\n") {
 				for (let i = 0; i < flags.length; i++) if (flagStates[i].enabled && flags[i].arg && flagStates[i].value.length === 0) return;
 				for (let i = 0; i < flags.length; i++) if (flagStates[i].enabled) selectedFlags[flags[i].name] = flags[i].arg ? flagStates[i].value : true;
-				clear();
 				advancePhase();
 				return;
 			}
@@ -278,7 +299,6 @@ function promptSubcommand(command, subcommands) {
 				const selected = options.filter((_, i) => multiSelectStates[i]);
 				if (selected.length === 0) return;
 				selectedFlags[followUp.flag] = selected.map((o) => o.value).join(",");
-				clear();
 				finalize();
 				return;
 			}
@@ -289,10 +309,7 @@ function promptSubcommand(command, subcommands) {
 					repeatEntries.push(repeatInput);
 					repeatInput = "";
 					render();
-				} else {
-					clear();
-					finalize();
-				}
+				} else finalize();
 				return;
 			}
 			if (key === "" || key === "\b") {
@@ -338,9 +355,11 @@ function promptSubcommand(command, subcommands) {
 			}
 		}
 		stdin.on("data", onData);
-		process.on("exit", () => {
+		stdout.on("resize", render);
+		function onExit() {
 			if (!resolved) stdout.write("\x1B[?25h");
-		});
+		}
+		process.on("exit", onExit);
 		render();
 	});
 }