dineway 0.2.25 → 0.2.27

package/dist/cli/index.mjs

@@ -1,54 +1,60 @@
 #!/usr/bin/env node
-import { i as runMigrations, n as getMigrationStatus, t as getMigrationFingerprint } from "../runner-BWZ87FK-.mjs";
-import { t as createDatabase } from "../connection-CiJWiWya.mjs";
+import { i as runMigrations, n as getMigrationStatus, t as getMigrationFingerprint } from "../runner-CQnzfBpD.mjs";
+import { t as createDatabase } from "../connection-DJ3GzHVH.mjs";
 import { t as validateIdentifier } from "../validate-VPnKoIzW.mjs";
 import { l as listTablesLike } from "../dialect-helpers-fk43GbDb.mjs";
 import { n as getI18nConfig, r as isI18nEnabled } from "../config-CVssduLe.mjs";
 import { i as encodeBase64url } from "../base64-F8-DUraK.mjs";
-import "../types-C9F2TLQV.mjs";
-import { o as isMissingTableError } from "../loader-BCr2VSzt.mjs";
+import "../types-CFvpEEOl.mjs";
+import { o as isMissingTableError } from "../loader-CsX5pTud.mjs";
 import "../object-cache-D51qOseS.mjs";
 import { n as slugify } from "../slugify-KSsVD_D3.mjs";
-import { t as ContentRepository } from "../content-Bg_hMt4Q.mjs";
-import { t as MediaRepository } from "../media-D8pQJSug.mjs";
-import { t as TaxonomyRepository } from "../taxonomy-BU0eCfij.mjs";
-import { t as OptionsRepository } from "../options-DQPTH5n0.mjs";
-import "../redirect-8B-gorhg.mjs";
-import "../request-cache-CBFjCwSt.mjs";
-import "../byline-registry-BLgrU3dA.mjs";
-import "../field-defs-cache-sSdDeJXP.mjs";
-import { t as BylineRepository } from "../byline-DEBDPF8R.mjs";
-import "../content-refresh-CHBBZGwf.mjs";
-import "../fts-manager-C7pxxk6B.mjs";
-import { n as SchemaRegistry } from "../registry-D3n4-yUl.mjs";
-import "../settings-D-a7uy2z.mjs";
-import { n as VERSION } from "../version-BohmuXyf.mjs";
-import { i as parseEncryptionKeys, n as fingerprintKey, r as generateEncryptionKey, t as DinewaySecretsError } from "../secrets-Dw3lXI42.mjs";
-import { t as IntegrationCredentialStore } from "../store-DerEE3jG.mjs";
-import { a as reconcileManifestAccess, i as pluginManifestSchema } from "../manifest-schema-U5qGq-iB.mjs";
-import { n as resolveAndValidateExternalUrl, t as SsrfError } from "../ssrf-Dz2hqAiG.mjs";
-import { t as validateSeed } from "../validate-Drps_jbV.mjs";
-import { t as applySeed } from "../apply-Hodkn7PL.mjs";
-import { _ as readForgewayCredentials, a as InvalidForgewayAccountCredentialsError, c as getForgewayDinewayAccount, d as normalizeForgewayEmail, f as readStoredForgewayAccount, g as listForgewayCredentials, h as sendForgewayAccountLoginLink, i as DEFAULT_FORGEWAY_API_BASE_URL, l as normalizeDinewayWebUrl, m as removeStoredForgewayAccount, n as DinewayToolsService, o as completeForgewayAccountLogin, p as refreshForgewayAccountCredentials, r as DEFAULT_DINEWAY_WEB_URL, s as createForgewayAccountClient, t as DinewayToolsError, u as normalizeForgewayApiUrl, v as writeForgewayCredentials } from "../service-DOdvCW-9.mjs";
-import { n as output, t as configureOutputMode } from "../output-CXOC3BFr.mjs";
+import "../revision-De7OmYVD.mjs";
+import { t as ContentRepository } from "../content-CzUrmMC3.mjs";
+import { t as MediaRepository } from "../media-4xtXwq7L.mjs";
+import { t as TaxonomyRepository } from "../taxonomy--vcXXfwc.mjs";
+import { t as OptionsRepository } from "../options-1dBRkoCl.mjs";
+import "../redirect-CnG6nJ4H.mjs";
+import "../request-cache-DoT2mKBT.mjs";
+import "../byline-registry-CF9nobxT.mjs";
+import "../field-defs-cache-BIHTU5Yj.mjs";
+import { t as BylineRepository } from "../byline-MGIfM2Is.mjs";
+import "../content-refresh-C_jcjzOr.mjs";
+import "../fts-manager-BB44uXMm.mjs";
+import "../public-discovery-CyDzK1-S.mjs";
+import { n as SchemaRegistry } from "../registry-QxrUJAWY.mjs";
+import "../settings-CCqefqC9.mjs";
+import { n as VERSION } from "../version-BbuynKOY.mjs";
+import { i as parseEncryptionKeys, n as fingerprintKey, r as generateEncryptionKey, t as DinewaySecretsError } from "../secrets-MqvM60s_.mjs";
+import { t as IntegrationCredentialStore } from "../store-BtCoeap4.mjs";
+import { a as reconcileManifestAccess, i as pluginManifestSchema } from "../manifest-schema-owbEUmv1.mjs";
+import { n as resolveAndValidateExternalUrl, t as SsrfError } from "../ssrf-D00lPvtF.mjs";
+import { t as validateSeed } from "../validate-BHVQSpUy.mjs";
+import { t as applySeed } from "../apply-CS_138du.mjs";
+import { _ as readForgewayCredentials, a as InvalidForgewayAccountCredentialsError, c as getForgewayDinewayAccount, d as normalizeForgewayEmail, f as readStoredForgewayAccount, g as listForgewayCredentials, h as sendForgewayAccountLoginLink, i as DEFAULT_FORGEWAY_API_BASE_URL, l as normalizeDinewayWebUrl, m as removeStoredForgewayAccount, n as DinewayToolsService, o as completeForgewayAccountLogin, p as refreshForgewayAccountCredentials, r as DEFAULT_DINEWAY_WEB_URL, s as createForgewayAccountClient, t as DinewayToolsError, u as normalizeForgewayApiUrl, v as writeForgewayCredentials } from "../service-BB1n90wh.mjs";
+import { n as output, t as configureOutputMode } from "../output-A4ZfzzA0.mjs";
 import { createHeaderAwareFetch, isRedirectResponse, resolveCustomHeaders } from "../client/external-auth-headers.mjs";
-import { t as convertDataForRead } from "../portable-text-DQHE3b5v.mjs";
-import { _ as saveMarketplaceCredential, a as ensureProjectGitignoreDinewayLocalState, c as resolveDinewayBaseUrl, d as getCredentials, f as getMarketplaceCredential, g as saveCredentials, h as resolveCredentialKey, i as DEFAULT_DINEWAY_URL, l as resolveDinewayToken, m as removeMarketplaceCredential, n as connectionArgs, o as ensureProjectGitignoreEntry, p as removeCredentials, r as createClientFromArgs, s as readProjectEnv, u as upsertProjectEnv } from "../client-factory-Nyp2sznG.mjs";
+import { t as convertDataForRead } from "../portable-text-U85hOafW.mjs";
+import { _ as saveMarketplaceCredential, a as ensureProjectGitignoreDinewayLocalState, c as resolveDinewayBaseUrl, d as getCredentials, f as getMarketplaceCredential, g as saveCredentials, h as resolveCredentialKey, i as DEFAULT_DINEWAY_URL, l as resolveDinewayToken, m as removeMarketplaceCredential, n as connectionArgs, o as ensureProjectGitignoreEntry, p as removeCredentials, r as createClientFromArgs, s as readProjectEnv, u as upsertProjectEnv } from "../client-factory-DXfeovxp.mjs";
 import { LocalStorage } from "../storage/local.mjs";
-import { r as fileExists$11, t as bundleCommand } from "../bundle-dsO2-7eh.mjs";
+import { r as fileExists$11, t as bundleCommand } from "../bundle-DicQY2p2.mjs";
 import { createRequire } from "node:module";
 import { createHash } from "node:crypto";
 import { sql } from "kysely";
+import { z } from "zod";
 import { createGzipDecoder, unpackTar } from "modern-tar";
-import { createReadStream, existsSync, readFileSync, writeFileSync } from "node:fs";
-import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
+import { createReadStream, createWriteStream, existsSync, readFileSync, writeFileSync } from "node:fs";
+import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import sax from "sax";
 import { pathToFileURL } from "node:url";
 import { defineCommand, runCommand, runMain } from "citty";
 import { createInterface } from "node:readline/promises";
 import consola, { consola as consola$1 } from "consola";
 import pc from "picocolors";
-import { access, mkdir, readFile, readdir, stat, writeFile } from "node:fs/promises";
+import { access, cp, lstat, mkdir, mkdtemp, readFile, readdir, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
+import { pipeline } from "node:stream/promises";
+import { createGzip } from "node:zlib";
+import { packTar } from "modern-tar/fs";
 import { spawn } from "node:child_process";
 import { parse } from "parse5";
 
@@ -1011,6 +1017,12 @@ async function handleCliPaywall(input) {
 
 //#endregion
 //#region src/cli/commands/deploy/utils/astro-adapter.ts
+const CLOUDFLARE_ADAPTER_PACKAGE = "@astrojs/cloudflare";
+const CLOUDFLARE_ADAPTER_VERSION = "14.0.0";
+const CLOUDFLARE_IMPORT_PATTERN = /^import\s+cloudflare\s+from\s+["']@astrojs\/cloudflare["'];\n?/m;
+const CLOUDFLARE_ADAPTER_PROPERTY_PATTERN = /\badapter\s*:\s*cloudflare\s*\(/;
+const ANY_ADAPTER_PROPERTY_PATTERN = /\badapter\s*:/;
+const SESSION_PROPERTY_PATTERN = /\bsession\s*:/;
 const NODE_ADAPTER_PACKAGE = "@astrojs/node";
 const VERCEL_ADAPTER_PACKAGE = "@astrojs/vercel";
 const NODE_ADAPTER_VERSION = "^10.1.0";
@@ -1020,7 +1032,7 @@ const VERCEL_IMPORT_PATTERN = /^import\s+vercel\s+from\s+["']@astrojs\/vercel["'
 const CONDITIONAL_ADAPTER_FLAG_PATTERN = /^const\s+isVercelDeploy\s*=\s*process\.env\.VERCEL\s*===\s*["']1["']\s*\|\|\s*process\.env\.DINEWAY_DEPLOY_TARGET\s*===\s*["']forgeway["'];\n?/m;
 const SERVER_OUTPUT_PATTERN = /output:\s*["']server["'],/;
 const KNOWN_ADAPTER_FLAG_PATTERN = /\bisVercelDeploy\b/;
-const KNOWN_ADAPTER_CALL_PATTERN = /\b(?:node|vercel)\s*\(/;
+const KNOWN_ADAPTER_CALL_PATTERN = /\b(?:node|vercel|cloudflare)\s*\(/;
 const ADAPTER_PROPERTY_PATTERN = /\n?[ \t]*adapter\s*:/g;
 const COLLECT_UPLOAD_FUNCTION_PATTERN = /\bfunction\s+collectUploadIncludeFiles\s*\(/;
 const TRAILING_NEWLINES_PATTERN = /\n+$/;
@@ -1176,24 +1188,36 @@ function removeGeneratedVercelUploadHelper(source) {
 	for (const statement of GENERATED_UPLOAD_HELPER_IMPORTS) next = next.replace(`${statement}\n`, "");
 	return next;
 }
+function ensureWorkersSession(source) {
+	return SESSION_PROPERTY_PATTERN.test(source) ? source : source.replace(SERVER_OUTPUT_PATTERN, (match) => `${match}\n\tsession: { driver: { entrypoint: "dineway/astro/session-driver" } },`);
+}
 function configureAstroConfigSource(source, adapter) {
+	if (adapter === "cloudflare" && CLOUDFLARE_IMPORT_PATTERN.test(source) && CLOUDFLARE_ADAPTER_PROPERTY_PATTERN.test(source)) return ensureWorkersSession(source);
 	let next = source.replace(CONDITIONAL_ADAPTER_FLAG_PATTERN, "").replace(adapter === "vercel" ? NODE_IMPORT_PATTERN : VERCEL_IMPORT_PATTERN, "");
-	if (adapter === "node") next = removeGeneratedVercelUploadHelper(next);
-	const wantedImport = adapter === "vercel" ? `import vercel from "${VERCEL_ADAPTER_PACKAGE}";` : `import node from "${NODE_ADAPTER_PACKAGE}";`;
-	const wantedAdapter = adapter === "vercel" ? createVercelAdapterConfig() : "adapter: node({ mode: \"standalone\" }),";
+	if (adapter !== "cloudflare") next = next.replace(CLOUDFLARE_IMPORT_PATTERN, "");
+	if (adapter === "cloudflare") next = next.replace(NODE_IMPORT_PATTERN, "");
+	if (adapter !== "vercel") next = removeGeneratedVercelUploadHelper(next);
+	const wantedImport = adapter === "cloudflare" ? `import cloudflare from "${CLOUDFLARE_ADAPTER_PACKAGE}";` : adapter === "vercel" ? `import vercel from "${VERCEL_ADAPTER_PACKAGE}";` : `import node from "${NODE_ADAPTER_PACKAGE}";`;
+	const wantedAdapter = adapter === "cloudflare" ? "adapter: cloudflare({ imageService: \"passthrough\" })," : adapter === "vercel" ? createVercelAdapterConfig() : "adapter: node({ mode: \"standalone\" }),";
 	if (!next.includes(wantedImport)) next = insertImport(next, wantedImport);
 	if (adapter === "vercel") next = ensureGeneratedVercelUploadHelper(next);
 	const adapterReplacement = replaceKnownAdapterEntries(next, wantedAdapter);
 	next = adapterReplacement.source;
 	if (!adapterReplacement.replaced) {
+		if (adapter === "cloudflare" && ANY_ADAPTER_PROPERTY_PATTERN.test(next)) throw new Error("Cannot safely replace the custom Astro adapter. Configure @astrojs/cloudflare manually.");
 		if (!SERVER_OUTPUT_PATTERN.test(next)) throw new Error("astro.config.mjs must include output: \"server\" before deploy adapter setup.");
 		next = next.replace(SERVER_OUTPUT_PATTERN, (match) => `${match}\n\t${wantedAdapter}`);
 	}
-	return next;
+	return adapter === "cloudflare" ? ensureWorkersSession(next) : next;
 }
 function configurePackageJson(pkg, adapter) {
 	const dependencies = { ...pkg.dependencies };
-	if (adapter === "vercel") {
+	if (adapter !== "cloudflare") delete dependencies[CLOUDFLARE_ADAPTER_PACKAGE];
+	if (adapter === "cloudflare") {
+		delete dependencies[NODE_ADAPTER_PACKAGE];
+		delete dependencies[VERCEL_ADAPTER_PACKAGE];
+		dependencies[CLOUDFLARE_ADAPTER_PACKAGE] = dependencies[CLOUDFLARE_ADAPTER_PACKAGE] ?? CLOUDFLARE_ADAPTER_VERSION;
+	} else if (adapter === "vercel") {
 		delete dependencies[NODE_ADAPTER_PACKAGE];
 		dependencies[VERCEL_ADAPTER_PACKAGE] = dependencies[VERCEL_ADAPTER_PACKAGE] ?? VERCEL_ADAPTER_VERSION;
 	} else {
@@ -1249,6 +1273,331 @@ async function configureAstroDeployAdapter(cwd, adapter, dryRun = false) {
 	return [...await configureAstroConfig(cwd, adapter, dryRun), ...await configurePackage(cwd, adapter, dryRun)];
 }
 
+//#endregion
+//#region src/cli/commands/deploy/utils/workers.ts
+const WORKERS_BUILD_CONFIG = "dist/server/wrangler.json";
+const INVALID_NAME = /[^a-z0-9-]+/g;
+const EDGE_HYPHENS = /^-+|-+$/g;
+const workerBuildSchema = z.object({
+	main: z.string().min(1),
+	compatibility_date: z.string(),
+	compatibility_flags: z.array(z.string()),
+	no_bundle: z.literal(true),
+	assets: z.object({
+		binding: z.literal("ASSETS"),
+		directory: z.string().min(1)
+	})
+}).passthrough();
+async function exists(path) {
+	try {
+		await access(path);
+		return true;
+	} catch {
+		return false;
+	}
+}
+async function writeNewFile(cwd, path, content, dryRun = false) {
+	if (await exists(join(cwd, path))) return {
+		path,
+		action: "exists"
+	};
+	if (dryRun) return {
+		path,
+		action: "skipped"
+	};
+	await mkdir(dirname(join(cwd, path)), { recursive: true });
+	await assertInsideDirectory(cwd, dirname(join(cwd, path)));
+	await writeFile(join(cwd, path), content, "utf-8");
+	return {
+		path,
+		action: "created"
+	};
+}
+async function generateWorkersConfig(cwd, dryRun = false) {
+	const files = await configureAstroDeployAdapter(cwd, "cloudflare", dryRun);
+	for (const path of [
+		"wrangler.jsonc",
+		"wrangler.json",
+		"wrangler.toml"
+	]) if (await exists(join(cwd, path))) return [...files, {
+		path,
+		action: "exists"
+	}];
+	const config = {
+		name: (z.object({ name: z.string().optional() }).parse(JSON.parse(await readFile(join(cwd, "package.json"), "utf-8"))).name?.split("/").at(-1) ?? "dineway").toLowerCase().replace(INVALID_NAME, "-").replace(EDGE_HYPHENS, "").slice(0, 63).replace(EDGE_HYPHENS, "") || "dineway",
+		main: "@astrojs/cloudflare/entrypoints/server",
+		compatibility_date: "2026-09-01",
+		compatibility_flags: ["nodejs_compat"],
+		assets: { binding: "ASSETS" }
+	};
+	files.push(await writeNewFile(cwd, "wrangler.jsonc", JSON.stringify(config, null, "	") + "\n", dryRun));
+	return files;
+}
+async function assertInsideDirectory(root, path) {
+	if (!isInside(relative(await realpath(root), await realpath(path)))) throw new Error("Workers build files must stay inside the project output directory.");
+}
+function isInside(relativePath) {
+	return relativePath !== ".." && !relativePath.startsWith(`..${sep}`) && !isAbsolute(relativePath);
+}
+async function readWorkersBuild(cwd) {
+	const configPath = join(cwd, WORKERS_BUILD_CONFIG);
+	if (!await exists(configPath)) throw new Error("Missing Cloudflare Worker build. Install @astrojs/cloudflare and wrangler, then run the Astro build before deploying.");
+	await assertInsideDirectory(cwd, join(cwd, "dist"));
+	await assertInsideDirectory(join(cwd, "dist"), configPath);
+	const config = workerBuildSchema.parse(JSON.parse(await readFile(configPath, "utf-8")));
+	if (!config.compatibility_flags.includes("nodejs_compat")) throw new Error("Dineway Workers require compatibility_flags: [\"nodejs_compat\"].");
+	const serverDir = dirname(configPath);
+	const entrypoint = resolve(serverDir, config.main);
+	const assetsDir = resolve(serverDir, config.assets.directory);
+	await assertInsideDirectory(serverDir, entrypoint);
+	await assertInsideDirectory(join(cwd, "dist"), assetsDir);
+	const [realServer, realAssets] = await Promise.all([realpath(serverDir), realpath(assetsDir)]);
+	if (isInside(relative(realServer, realAssets)) || isInside(relative(realAssets, realServer))) throw new Error("Worker server modules and public assets must use separate output directories.");
+	return {
+		config,
+		configPath,
+		serverDir,
+		entrypoint,
+		assetsDir
+	};
+}
+
+//#endregion
+//#region src/cli/commands/deploy/targets/chatgpt-sites.ts
+const HOSTING_PATH = ".openai/hosting.json";
+const externalPersistence = z.unknown().refine((value) => value == null, "This Dineway Sites target uses external HTTP libSQL and S3; native D1/R2 bindings are not supported.");
+const hostingSchema = z.object({
+	project_id: z.string().min(1),
+	static: z.null().optional(),
+	d1: externalPersistence.optional(),
+	r2: externalPersistence.optional(),
+	capabilities: z.array(z.string()).optional()
+}).strict();
+const NON_RUNTIME_ENTRIES = new Set([
+	".prerender",
+	".vite",
+	"wrangler.json",
+	".dev.vars",
+	".env"
+]);
+const BINDING_KEYS = [
+	"kv_namespaces",
+	"d1_databases",
+	"r2_buckets",
+	"services",
+	"hyperdrive",
+	"vectorize",
+	"workflows",
+	"worker_loaders",
+	"queues",
+	"durable_objects",
+	"images",
+	"ai"
+];
+async function readHosting(cwd, projectId) {
+	await assertInsideDirectory(cwd, join(cwd, HOSTING_PATH));
+	if (!(await lstat(join(cwd, HOSTING_PATH))).isFile()) throw new Error("Sites hosting.json must be a regular file.");
+	const config = hostingSchema.parse(JSON.parse(await readFile(join(cwd, HOSTING_PATH), "utf-8")));
+	if (projectId && projectId !== config.project_id) throw new Error("--site does not match .openai/hosting.json. Reuse the existing Sites project ID.");
+	return config;
+}
+async function assertRegularTree(path) {
+	const stat = await lstat(path);
+	if (stat.isDirectory()) for (const entry of await readdir(path)) await assertRegularTree(join(path, entry));
+	else if (!stat.isFile()) throw new Error("Sites build output must not contain symlinks or special files.");
+}
+function hasBinding(value) {
+	if (Array.isArray(value)) return value.length > 0;
+	if (value && typeof value === "object") return Object.values(value).some(hasBinding);
+	return value !== void 0 && value !== null && value !== false && value !== "";
+}
+const chatgptSitesTarget = {
+	name: "chatgpt-sites",
+	label: "ChatGPT Sites",
+	description: "Prepare an Astro Worker archive for publishing through the Sites connector.",
+	supportLevel: "experimental",
+	async generateConfig(cwd, options) {
+		if (await exists(join(cwd, HOSTING_PATH))) await readHosting(cwd, options.site);
+		else if (!options.site && !options.dryRun) throw new Error("Register or select a Site with the Sites connector first, then pass its exact project ID with --site or save it in .openai/hosting.json.");
+		const files = await generateWorkersConfig(cwd, options.dryRun);
+		files.push(await writeNewFile(cwd, HOSTING_PATH, JSON.stringify({ project_id: options.site }, null, "	") + "\n", options.dryRun));
+		return files;
+	},
+	async deploy(cwd, options) {
+		if (options.dryRun) return { message: "[dry-run] Would prepare dist/server/index.js and dist/.openai/hosting.json for the Sites hosting skill. Publishing uses the Sites connector." };
+		const hosting = await readHosting(cwd, options.site);
+		if (await exists(join(cwd, "drizzle")) || await exists(join(cwd, "dist/.openai/drizzle"))) throw new Error("This Dineway Sites target does not support Drizzle/D1 migrations. Use external HTTP libSQL with Dineway's runtime migrations.");
+		const build = await readWorkersBuild(cwd);
+		const unsupported = BINDING_KEYS.filter((key) => hasBinding(build.config[key]));
+		if (unsupported.length) throw new Error(`Sites cannot provision this Worker's Wrangler bindings: ${unsupported.join(", ")}. Use Dineway database sessions, libsqlHttp(), and S3 storage. Manage Sites bindings with the Sites connector.`);
+		await assertRegularTree(build.serverDir);
+		await assertRegularTree(build.assetsDir);
+		await mkdir(join(cwd, ".dineway"), { recursive: true });
+		await assertInsideDirectory(cwd, join(cwd, ".dineway"));
+		const stage = await mkdtemp(join(cwd, ".dineway/sites-"));
+		try {
+			const dist = join(stage, "upload/dist");
+			await mkdir(join(dist, ".openai"), { recursive: true });
+			await cp(build.serverDir, join(dist, "server"), {
+				recursive: true,
+				filter: (path) => !NON_RUNTIME_ENTRIES.has(basename(path))
+			});
+			await cp(build.assetsDir, join(dist, "client"), { recursive: true });
+			if (build.entrypoint !== join(build.serverDir, "index.js")) {
+				const entry = "./" + relative(build.serverDir, build.entrypoint).split(sep).join("/");
+				await writeFile(join(dist, "server/index.js"), `export { default } from ${JSON.stringify(entry)};\n`);
+			}
+			await writeFile(join(dist, ".openai/hosting.json"), JSON.stringify(hosting, null, "	") + "\n");
+			const archivePath = join(cwd, ".dineway/sites-deploy.tar.gz");
+			const preparedArchive = join(stage, "site.tar.gz");
+			await pipeline(packTar(join(stage, "upload")), createGzip(), createWriteStream(preparedArchive, { mode: 384 }));
+			await rename(preparedArchive, archivePath);
+			return { message: `Sites archive prepared: ${archivePath}. Not published yet. Use the sites-hosting skill to push the matching source, save this version, and deploy through the Sites connector.` };
+		} finally {
+			await rm(stage, {
+				recursive: true,
+				force: true
+			});
+		}
+	}
+};
+
+//#endregion
+//#region src/cli/commands/deploy/utils/spawn.ts
+async function runCommand$1(command, args, options) {
+	return new Promise((resolve, reject) => {
+		const child = spawn(command, args, {
+			cwd: options.cwd,
+			env: {
+				...process.env,
+				...options.env
+			},
+			stdio: options.stdio === "inherit" ? "inherit" : [
+				"ignore",
+				"pipe",
+				"pipe"
+			],
+			shell: false
+		});
+		let stdout = "";
+		let stderr = "";
+		if (options.stdio !== "inherit") {
+			child.stdout?.on("data", (chunk) => {
+				stdout += chunk.toString();
+			});
+			child.stderr?.on("data", (chunk) => {
+				stderr += chunk.toString();
+			});
+		}
+		child.on("error", reject);
+		child.on("close", (code) => {
+			resolve({
+				code: code ?? 0,
+				stdout,
+				stderr
+			});
+		});
+	});
+}
+async function runCommandOrThrow(command, args, options) {
+	const result = await runCommand$1(command, args, options);
+	if (result.code !== 0) {
+		const detail = result.stderr.trim() || result.stdout.trim() || `exit code ${result.code}`;
+		throw new Error(`${command} ${args.join(" ")} failed: ${detail}`);
+	}
+	return result;
+}
+
+//#endregion
+//#region src/cli/commands/deploy/utils/cli-resolver.ts
+async function confirm(message) {
+	if (!process.stdin.isTTY) return false;
+	const rl = createInterface({
+		input: process.stdin,
+		output: process.stdout
+	});
+	try {
+		const answer = await rl.question(`${message} [y/N] `);
+		return answer.trim().toLowerCase() === "y" || answer.trim().toLowerCase() === "yes";
+	} finally {
+		rl.close();
+	}
+}
+function resolveProviderCli(cwd, binary) {
+	const local = join(cwd, "node_modules", ".bin", process.platform === "win32" ? `${binary}.cmd` : binary);
+	return existsSync(local) ? local : binary;
+}
+async function ensureTargetCli(target, cwd, options = {}) {
+	if (!target.cli) return;
+	if ((await runCommand$1(resolveProviderCli(cwd, target.cli.versionCommand.command), target.cli.versionCommand.args, { cwd }).catch(() => ({
+		code: 1,
+		stdout: "",
+		stderr: ""
+	}))).code === 0) return;
+	if (options.dryRun) {
+		consola.info(`[dry-run] Would verify ${target.cli.binary} CLI with ${target.cli.versionCommand.command} ${target.cli.versionCommand.args.join(" ")}`);
+		if (target.cli.npmPackage) consola.info(`[dry-run] Would offer to install ${target.cli.npmPackage}`);
+		else consola.info(`[dry-run] ${target.cli.installHint ?? `Install ${target.cli.binary} before deploying.`}`);
+		return;
+	}
+	if (!target.cli.npmPackage) throw new Error(`${target.label} CLI is required. ${target.cli.installHint ?? `Install ${target.cli.binary} and try again.`}`);
+	if (options.yes) throw new Error(`Install ${target.cli.npmPackage} and run this command again. The --yes flag does not approve global CLI installation.`);
+	if (!await confirm(`${target.label} CLI is not installed. Install ${target.cli.npmPackage} globally now?`)) throw new Error(`Install ${target.cli.npmPackage} and run this command again.`);
+	await runCommandOrThrow("npm", [
+		"install",
+		"--global",
+		target.cli.npmPackage
+	], {
+		cwd,
+		stdio: "inherit"
+	});
+}
+
+//#endregion
+//#region src/cli/commands/deploy/targets/cloudflare.ts
+const cloudflareTarget = {
+	name: "cloudflare",
+	label: "Cloudflare Workers",
+	description: "Deploy an Astro Worker with Wrangler and remote libSQL/object storage.",
+	supportLevel: "experimental",
+	cli: {
+		npmPackage: null,
+		binary: "wrangler",
+		versionCommand: {
+			command: "wrangler",
+			args: ["--version"]
+		},
+		installHint: "Install wrangler in this project (for example: pnpm add -D wrangler@^4.131.1)."
+	},
+	async checkAuth(cwd) {
+		return (await runCommand$1(resolveProviderCli(cwd, "wrangler"), ["whoami", "--json"], { cwd })).code === 0;
+	},
+	async login(cwd) {
+		if (!process.stdin.isTTY) throw new Error("Cloudflare authentication is required. Set CLOUDFLARE_API_TOKEN and CLOUDFLARE_ACCOUNT_ID or run wrangler login interactively.");
+		await runCommandOrThrow(resolveProviderCli(cwd, "wrangler"), ["login"], {
+			cwd,
+			stdio: "inherit"
+		});
+	},
+	generateConfig(cwd, options) {
+		return generateWorkersConfig(cwd, options.dryRun);
+	},
+	async deploy(cwd, options) {
+		if (options.dryRun) return { message: `[dry-run] Would run wrangler deploy --config ${WORKERS_BUILD_CONFIG}.` };
+		await readWorkersBuild(cwd);
+		await runCommandOrThrow(resolveProviderCli(cwd, "wrangler"), [
+			"deploy",
+			"--config",
+			WORKERS_BUILD_CONFIG
+		], {
+			cwd,
+			env: options.env,
+			stdio: "inherit"
+		});
+		return { message: "Cloudflare deployment complete. Wrangler printed the deployed URL above." };
+	}
+};
+
 //#endregion
 //#region src/cli/commands/deploy/utils/dockerfile.ts
 const NODE_START_COMMAND = "node ./dist/server/entry.mjs";
@@ -1379,52 +1728,6 @@ const dockerTarget = {
 	}
 };
 
-//#endregion
-//#region src/cli/commands/deploy/utils/spawn.ts
-async function runCommand$1(command, args, options) {
-	return new Promise((resolve, reject) => {
-		const child = spawn(command, args, {
-			cwd: options.cwd,
-			env: {
-				...process.env,
-				...options.env
-			},
-			stdio: options.stdio === "inherit" ? "inherit" : [
-				"ignore",
-				"pipe",
-				"pipe"
-			],
-			shell: false
-		});
-		let stdout = "";
-		let stderr = "";
-		if (options.stdio !== "inherit") {
-			child.stdout?.on("data", (chunk) => {
-				stdout += chunk.toString();
-			});
-			child.stderr?.on("data", (chunk) => {
-				stderr += chunk.toString();
-			});
-		}
-		child.on("error", reject);
-		child.on("close", (code) => {
-			resolve({
-				code: code ?? 0,
-				stdout,
-				stderr
-			});
-		});
-	});
-}
-async function runCommandOrThrow(command, args, options) {
-	const result = await runCommand$1(command, args, options);
-	if (result.code !== 0) {
-		const detail = result.stderr.trim() || result.stdout.trim() || `exit code ${result.code}`;
-		throw new Error(`${command} ${args.join(" ")} failed: ${detail}`);
-	}
-	return result;
-}
-
 //#endregion
 //#region src/cli/commands/deploy/targets/fly.ts
 const FLY_URL_RE = /https:\/\/[^\s"]+\.fly\.dev[^\s"]*/;
@@ -3168,47 +3471,6 @@ const railwayTarget = {
 	}
 };
 
-//#endregion
-//#region src/cli/commands/deploy/utils/cli-resolver.ts
-async function confirm(message) {
-	if (!process.stdin.isTTY) return false;
-	const rl = createInterface({
-		input: process.stdin,
-		output: process.stdout
-	});
-	try {
-		const answer = await rl.question(`${message} [y/N] `);
-		return answer.trim().toLowerCase() === "y" || answer.trim().toLowerCase() === "yes";
-	} finally {
-		rl.close();
-	}
-}
-async function ensureTargetCli(target, cwd, options = {}) {
-	if (!target.cli) return;
-	if ((await runCommand$1(target.cli.versionCommand.command, target.cli.versionCommand.args, { cwd }).catch(() => ({
-		code: 1,
-		stdout: "",
-		stderr: ""
-	}))).code === 0) return;
-	if (options.dryRun) {
-		consola.info(`[dry-run] Would verify ${target.cli.binary} CLI with ${target.cli.versionCommand.command} ${target.cli.versionCommand.args.join(" ")}`);
-		if (target.cli.npmPackage) consola.info(`[dry-run] Would offer to install ${target.cli.npmPackage}`);
-		else consola.info(`[dry-run] ${target.cli.installHint ?? `Install ${target.cli.binary} before deploying.`}`);
-		return;
-	}
-	if (!target.cli.npmPackage) throw new Error(`${target.label} CLI is required. ${target.cli.installHint ?? `Install ${target.cli.binary} and try again.`}`);
-	if (options.yes) throw new Error(`Install ${target.cli.npmPackage} and run this command again. The --yes flag does not approve global CLI installation.`);
-	if (!await confirm(`${target.label} CLI is not installed. Install ${target.cli.npmPackage} globally now?`)) throw new Error(`Install ${target.cli.npmPackage} and run this command again.`);
-	await runCommandOrThrow("npm", [
-		"install",
-		"--global",
-		target.cli.npmPackage
-	], {
-		cwd,
-		stdio: "inherit"
-	});
-}
-
 //#endregion
 //#region src/cli/commands/deploy/index.ts
 const targets = [
@@ -3216,7 +3478,9 @@ const targets = [
 	railwayTarget,
 	dockerTarget,
 	flyTarget,
-	gcpTarget
+	gcpTarget,
+	cloudflareTarget,
+	chatgptSitesTarget
 ];
 const DEFAULT_TARGET = "forgeway";
 function getTarget(name) {
@@ -3266,7 +3530,7 @@ async function resolveTarget(cwd, explicitTarget) {
 const deployCommand = defineCommand({
 	meta: {
 		name: "deploy",
-		description: "Deploy a Dineway Node server through a provider CLI"
+		description: "Deploy a Dineway site to a hosting provider"
 	},
 	args: {
 		target: {
@@ -3302,7 +3566,7 @@ const deployCommand = defineCommand({
 		},
 		site: {
 			type: "string",
-			description: "Forgeway deployment site ID or slug",
+			description: "Forgeway site ID/slug or exact ChatGPT Sites project ID",
 			required: false
 		},
 		"place-id": {
@@ -3396,10 +3660,8 @@ const deployCommand = defineCommand({
 			const build = options.dryRun ? null : await runBuild(cwd, options.env);
 			consola.info(options.dryRun ? "[dry-run] Would run build" : `Built with ${build?.display}`);
 		}
-		if (!options.dryRun) {
-			await ensureProjectGitignoreDinewayLocalState(cwd);
-			await writeDeployTarget(cwd, target.name);
-		} else {
+		if (!options.dryRun) await ensureProjectGitignoreDinewayLocalState(cwd);
+		else {
 			consola.info("[dry-run] Would ensure Dineway local state entries in .gitignore");
 			consola.info(`[dry-run] Would save .dineway/deploy.json target=${target.name}`);
 		}
@@ -3418,6 +3680,7 @@ const deployCommand = defineCommand({
 			})) process.exit(2);
 			throw error;
 		});
+		if (!options.dryRun) await writeDeployTarget(cwd, target.name);
 		if (result.url) consola.success(result.url);
 		consola.success(result.message);
 	}
@@ -3545,7 +3808,7 @@ const devCommand = defineCommand({
 			const remoteUrl = pkg.dineway?.url || process.env.DINEWAY_URL;
 			if (!remoteUrl) consola.warn("No remote URL configured. Set DINEWAY_URL or dineway.url in package.json");
 			else try {
-				const { createClientFromArgs } = await import("../client-factory-Nyp2sznG.mjs").then((n) => n.t);
+				const { createClientFromArgs } = await import("../client-factory-DXfeovxp.mjs").then((n) => n.t);
 				const client = createClientFromArgs({ url: remoteUrl });
 				const schema = await client.schemaExport();
 				const types = await client.schemaTypes();
@@ -3930,6 +4193,7 @@ async function exportCollections(db) {
 			supports: collection.supports.length > 0 ? collection.supports : void 0,
 			urlPattern: collection.urlPattern || void 0,
 			urlField: collection.urlField || void 0,
+			publicDiscovery: collection.publicDiscovery,
 			fields: fields.map((field) => ({
 				slug: field.slug,
 				label: field.label,
@@ -5540,7 +5804,7 @@ const publishCommand = defineCommand({
 			const pluginDir = resolve(args.dir);
 			try {
 				const { runCommand } = await import("citty");
-				const { bundleCommand } = await import("../bundle-dsO2-7eh.mjs").then((n) => n.n);
+				const { bundleCommand } = await import("../bundle-DicQY2p2.mjs").then((n) => n.n);
 				await runCommand(bundleCommand, { rawArgs: ["--dir", pluginDir] });
 			} catch {
 				consola.error("Build failed");
@@ -7853,7 +8117,7 @@ function isFileNotFound(error) {
 * - search: Full-text search
 * - taxonomy: Manage taxonomies and terms
 * - menu: Manage navigation menus
-* - deploy: Deploy a standard Dineway Node server through a provider CLI
+* - deploy: Deploy a Dineway site to a hosting provider
 * - plugin: Plugin management (init, bundle, validate, publish, login, logout)
 */
 const builtInCommands = {