dineway 0.2.33 → 0.2.35

package/dist/cli/index.mjs

@@ -1,61 +1,71 @@
 #!/usr/bin/env node
-import { i as runMigrations, n as getMigrationStatus, t as getMigrationFingerprint } from "../runner-DJiRFyLI.mjs";
+import { a as runMigrations, n as getMigrationFingerprint, r as getMigrationStatus } from "../runner-CVeq0266.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-BpSTdH1H.mjs";
-import { o as isMissingTableError } from "../loader-BDje8ME2.mjs";
-import "../object-cache-D51qOseS.mjs";
-import { n as slugify } from "../slugify-KSsVD_D3.mjs";
-import "../revision-De7OmYVD.mjs";
-import { t as ContentRepository } from "../content-CVCrcuvD.mjs";
-import { t as MediaRepository } from "../media-dvRjj4po.mjs";
-import { t as TaxonomyRepository } from "../taxonomy-BOBTJ_aE.mjs";
-import { t as OptionsRepository } from "../options-1dBRkoCl.mjs";
-import "../redirect-DG-o0CKV.mjs";
-import "../request-cache-BruBnFAR.mjs";
-import "../byline-registry-rkr73qSE.mjs";
-import "../field-defs-cache-CwrIyZFT.mjs";
-import { t as BylineRepository } from "../byline-Ctil4rij.mjs";
-import "../content-refresh-QvBIyb_g.mjs";
-import "../fts-manager-DX7ZkrCa.mjs";
-import "../public-discovery-CyDzK1-S.mjs";
-import { n as SchemaRegistry } from "../registry-D-IV_h50.mjs";
-import "../settings-CAsQLi0N.mjs";
-import { n as DinewayToolsService, r as integrationResponse, t as DinewayToolsError } from "../service-DeX1PRNt.mjs";
-import { i as parseEncryptionKeys, n as fingerprintKey, r as generateEncryptionKey, t as DinewaySecretsError } from "../secrets-AdCrGg1c.mjs";
-import { n as resolveAndValidateExternalUrl, t as SsrfError } from "../ssrf-C7tTSD1r.mjs";
-import { n as VERSION } from "../version-CJqc1mwj.mjs";
-import { t as IntegrationCredentialStore } from "../store-c4qx3gVh.mjs";
-import { a as reconcileManifestAccess, i as pluginManifestSchema } from "../manifest-schema-CfKD0thC.mjs";
-import { t as validateSeed } from "../validate-C9g9iX3q.mjs";
-import { t as applySeed } from "../apply-Bs2jXsms.mjs";
-import { a as createForgewayAccountClient, c as normalizeForgewayApiUrl, d as refreshForgewayAccountCredentials, f as removeStoredForgewayAccount, g as writeForgewayCredentials, h as readForgewayCredentials, i as completeForgewayAccountLogin, l as normalizeForgewayEmail, m as listForgewayCredentials, n as DEFAULT_FORGEWAY_API_BASE_URL, o as getForgewayDinewayAccount, p as sendForgewayAccountLoginLink, r as InvalidForgewayAccountCredentialsError, s as normalizeDinewayWebUrl, t as DEFAULT_DINEWAY_WEB_URL, u as readStoredForgewayAccount } from "../forgeway-account-lYJ8iX3G.mjs";
-import { n as output, t as configureOutputMode } from "../output-8j9oltTf.mjs";
+import "../d1-binding-D6HZa3ks.mjs";
+import { AtomicWriteConflict, atomicBatch, rowUnchanged } from "../database/batch.mjs";
+import { t as validateIdentifier } from "../validate-Co3j6T_K.mjs";
+import { l as listTablesLike } from "../dialect-helpers-C6xtO-Ui.mjs";
+import { n as getI18nConfig, r as isI18nEnabled } from "../config-XW5tMrH8.mjs";
+import { i as encodeBase64url } from "../base64-Cz-aU0X1.mjs";
+import "../types-BqxIv8Il.mjs";
+import { o as isMissingTableError } from "../loader-Cgsx23wU.mjs";
+import "../actor-DxUAJgQX.mjs";
+import "../atomic-authority-CnBQJ14T.mjs";
+import "../after-BVaUn7bK.mjs";
+import "../object-cache-BGjIlY9s.mjs";
+import { n as slugify } from "../slugify-Di8Q_MFq.mjs";
+import "../revision-090sZyGc.mjs";
+import { t as ContentRepository } from "../content-D9xKUSno.mjs";
+import { t as MediaRepository } from "../media-BZqwtRTZ.mjs";
+import { t as TaxonomyRepository } from "../taxonomy-DWxxLpp5.mjs";
+import { t as OptionsRepository } from "../options-BcqHWpc-.mjs";
+import "../redirect-HLI3wT5Y.mjs";
+import "../request-cache-DPmV5nk4.mjs";
+import "../byline-registry-CkuVVeJJ.mjs";
+import "../field-defs-cache-BKKFFf_V.mjs";
+import { t as BylineRepository } from "../byline-DEZKlzD9.mjs";
+import { n as DinewayToolsService, r as integrationResponse, t as DinewayToolsError } from "../service-CeEi6nax.mjs";
+import "../runtime-env-v-1UXPAH.mjs";
+import { i as parseEncryptionKeys, n as fingerprintKey, r as generateEncryptionKey, t as DinewaySecretsError } from "../secrets-BP2YTPWn.mjs";
+import "../content-refresh-9M9cc55-.mjs";
+import { n as resolveAndValidateExternalUrl, t as SsrfError } from "../ssrf-COxLChKv.mjs";
+import "../fts-manager-DA74x_uP.mjs";
+import "../public-discovery-CTql6jdZ.mjs";
+import { n as SchemaRegistry } from "../registry-DcV93OL_.mjs";
+import "../settings-DRFy8JQx.mjs";
+import { n as VERSION } from "../version-DpT-k_Ny.mjs";
+import { t as IntegrationCredentialStore } from "../store-CjmmGlVw.mjs";
+import { a as reconcileManifestAccess, i as pluginManifestSchema } from "../manifest-schema-DBXM_g8l.mjs";
+import "../migrations-C7YXse7V.mjs";
+import { t as validateSeed } from "../validate-CupwWNWL.mjs";
+import { t as applySeed } from "../apply-BTfAReIv.mjs";
+import { n as validateWorkersBindings, t as WORKERS_BUILD_METADATA } from "../workers-build-QVrquLLe.mjs";
+import { n as d1ReleaseRevision } from "../state-D8AogXCV.mjs";
+import { a as createForgewayAccountClient, c as normalizeForgewayApiUrl, d as refreshForgewayAccountCredentials, f as removeStoredForgewayAccount, g as writeForgewayCredentials, h as readForgewayCredentials, i as completeForgewayAccountLogin, l as normalizeForgewayEmail, m as listForgewayCredentials, n as DEFAULT_FORGEWAY_API_BASE_URL, o as getForgewayDinewayAccount, p as sendForgewayAccountLoginLink, r as InvalidForgewayAccountCredentialsError, s as normalizeDinewayWebUrl, t as DEFAULT_DINEWAY_WEB_URL, u as readStoredForgewayAccount } from "../forgeway-account-CnWOIusE.mjs";
+import { n as output, t as configureOutputMode } from "../output-CdmbQioY.mjs";
 import { createHeaderAwareFetch, isRedirectResponse, resolveCustomHeaders } from "../client/external-auth-headers.mjs";
-import { t as convertDataForRead } from "../portable-text-tIk9_uz_.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-C-y9VZDX.mjs";
+import { t as convertDataForRead } from "../portable-text-DH3Om_2D.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-6vLLT06O.mjs";
+import { t as migrateD1Release } from "../release-CZfAeyXm.mjs";
+import { t as createD1Dialect } from "../d1-dialect-BBxPg6Om.mjs";
 import { LocalStorage } from "../storage/local.mjs";
-import { r as fileExists$11, t as bundleCommand } from "../bundle-S6zx-V4D.mjs";
+import { r as fileExists$11, t as bundleCommand } from "../bundle-DImnxo71.mjs";
 import { createRequire } from "node:module";
 import { createHash } from "node:crypto";
-import { sql } from "kysely";
+import { Kysely, sql } from "kysely";
 import { z } from "zod";
 import { createGzipDecoder, unpackTar } from "modern-tar";
-import { createReadStream, createWriteStream, existsSync, readFileSync, writeFileSync } from "node:fs";
+import { createReadStream, 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 { access, mkdir, mkdtemp, readFile, readdir, realpath, rm, stat, writeFile } from "node:fs/promises";
 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, 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 { tmpdir } from "node:os";
+import { createJiti } from "jiti";
 import { spawn } from "node:child_process";
 import { parse } from "parse5";
 
@@ -858,6 +868,257 @@ const contentCommand = defineCommand({
 	}
 });
 
+//#endregion
+//#region src/cli/d1-project.ts
+const BINDING_NAME = /^[A-Za-z_][A-Za-z0-9_]*$/;
+const pluginDescriptor = z.object({
+	id: z.string(),
+	version: z.string(),
+	entrypoint: z.string(),
+	format: z.enum(["native", "standard"]).optional(),
+	options: z.unknown().optional()
+});
+const integrationSchema = z.object({
+	name: z.literal("dineway"),
+	api: z.object({ dinewayConfig: z.object({
+		database: z.object({
+			entrypoint: z.string(),
+			config: z.unknown()
+		}).optional(),
+		plugins: z.array(pluginDescriptor).default([])
+	}) })
+});
+async function firstExisting(cwd, files) {
+	for (const file of files) {
+		const path = resolve(cwd, file);
+		try {
+			await access(path);
+			return path;
+		} catch (error) {
+			if (!(error instanceof Error && "code" in error && error.code === "ENOENT")) throw error;
+		}
+	}
+}
+/** Read the public integration API without running Astro hooks or writing a bundled config. */
+async function readProjectDinewayConfig(cwd) {
+	const path = await firstExisting(cwd, [
+		"astro.config.mjs",
+		"astro.config.ts",
+		"astro.config.js",
+		"astro.config.mts",
+		"astro.config.cjs"
+	]);
+	if (!path) return void 0;
+	const jiti = createJiti(join(cwd, "package.json"), {
+		fsCache: false,
+		moduleCache: false,
+		nativeModules: [
+			"@astrojs/cloudflare",
+			"wrangler",
+			"miniflare"
+		]
+	});
+	const config = z.object({ integrations: z.array(z.unknown()).default([]) }).parse(await jiti.import(path, { default: true }));
+	const found = (await Promise.all(config.integrations.flat(Infinity))).flatMap((integration) => {
+		const parsed = integrationSchema.safeParse(integration);
+		return parsed.success ? [parsed.data.api.dinewayConfig] : [];
+	});
+	if (found.length > 1) throw new Error("Configure exactly one Dineway integration.");
+	return found[0];
+}
+async function readD1Project(cwd) {
+	const config = await readProjectDinewayConfig(cwd);
+	if (config?.database?.entrypoint !== "dineway/db/d1") throw new Error("Configure database: d1({ binding: 'DB' }) in this project's Dineway integration.");
+	const { binding } = z.object({ binding: z.string().regex(BINDING_NAME) }).parse(config.database.config);
+	const jiti = createJiti(join(cwd, "package.json"), {
+		fsCache: false,
+		moduleCache: false,
+		nativeModules: [
+			"@astrojs/cloudflare",
+			"wrangler",
+			"miniflare"
+		]
+	});
+	const plugins = [];
+	for (const descriptor of config.plugins) {
+		if (descriptor.format === "standard") throw new Error(`Plugin ${descriptor.id} must provide a verified native D1 migration plan.`);
+		const module = await jiti.import(descriptor.entrypoint);
+		if (typeof module.createPlugin !== "function") throw new Error(`Plugin ${descriptor.id} does not export createPlugin.`);
+		const createPlugin = module.createPlugin;
+		const plugin = createPlugin(descriptor.options ?? {});
+		if (plugin.id !== descriptor.id || plugin.version !== descriptor.version) throw new Error(`Plugin ${descriptor.id} descriptor and runtime versions differ. Rebuild the plugin before migrating.`);
+		plugins.push(plugin);
+	}
+	return {
+		binding,
+		plugins
+	};
+}
+const wranglerDatabaseSchema = z.object({
+	account_id: z.string().optional(),
+	compatibility_date: z.string().optional(),
+	d1_databases: z.array(z.object({
+		binding: z.string(),
+		database_name: z.string().optional(),
+		database_id: z.string().min(1)
+	}))
+});
+async function loadProjectWrangler(cwd, config, environment) {
+	const configPath = config ? resolve(cwd, config) : await firstExisting(cwd, [
+		"wrangler.jsonc",
+		"wrangler.json",
+		"wrangler.toml"
+	]);
+	if (!configPath) throw new Error("Add a Wrangler configuration with the site's D1 binding before migrating.");
+	const require = createRequire(join(cwd, "package.json"));
+	let entry;
+	try {
+		entry = require.resolve("wrangler");
+	} catch (cause) {
+		throw new Error("Install Wrangler in this project before migrating D1.", { cause });
+	}
+	const module = await import(pathToFileURL(entry).href);
+	if (!module || typeof module !== "object" || !("getPlatformProxy" in module) || !("unstable_readConfig" in module)) throw new Error("This Wrangler version does not expose the required configuration and D1 proxy APIs.");
+	const api = module;
+	return {
+		api,
+		configPath,
+		config: wranglerDatabaseSchema.parse(api.unstable_readConfig({
+			config: configPath,
+			env: environment
+		}, { hideWarnings: true }))
+	};
+}
+
+//#endregion
+//#region src/cli/commands/database.ts
+async function migrateProjectD1(options) {
+	if (options.local === options.remote) throw new Error("Choose exactly one target: --local or --remote.");
+	const cwd = resolve(options.cwd);
+	const project = await readD1Project(cwd);
+	const wrangler = await loadProjectWrangler(cwd, options.config, options.environment);
+	const bindings = wrangler.config.d1_databases.filter((item) => item.binding === project.binding);
+	if (bindings.length !== 1) throw new Error(`Wrangler must define exactly one D1 binding named ${project.binding}.`);
+	const selected = bindings[0];
+	const accountId = wrangler.config.account_id ?? process.env.CLOUDFLARE_ACCOUNT_ID;
+	if (options.remote && !accountId) throw new Error("Set account_id in Wrangler or CLOUDFLARE_ACCOUNT_ID to select the remote account explicitly.");
+	const revision = d1ReleaseRevision(project.plugins);
+	const target = {
+		binding: project.binding,
+		databaseId: selected.database_id,
+		accountId: options.remote ? accountId : void 0,
+		location: options.remote ? "remote" : "local",
+		revision
+	};
+	if (options.dryRun) return {
+		...target,
+		dryRun: true,
+		message: "Would verify and apply core and configured plugin migrations. No database connection was opened."
+	};
+	const directory = await mkdtemp(join(tmpdir(), "dineway-d1-"));
+	let proxy;
+	let db;
+	try {
+		const configPath = join(directory, "wrangler.json");
+		await writeFile(configPath, JSON.stringify({
+			name: "dineway-migration",
+			account_id: accountId,
+			compatibility_date: wrangler.config.compatibility_date ?? "2026-09-01",
+			d1_databases: [{
+				...selected,
+				remote: options.remote
+			}]
+		}));
+		proxy = await wrangler.api.getPlatformProxy({
+			configPath,
+			remoteBindings: options.remote,
+			persist: options.remote ? false : { path: join(cwd, ".wrangler/state/v3") }
+		});
+		const binding = proxy.env[project.binding];
+		if (!binding || typeof binding.batch !== "function" || typeof binding.prepare !== "function") throw new Error(`Wrangler did not provide D1 binding ${project.binding}.`);
+		db = new Kysely({ dialect: createD1Dialect(binding) });
+		const applied = await migrateD1Release(db, project.plugins, { adopt: options.adopt });
+		return {
+			...target,
+			dryRun: false,
+			applied
+		};
+	} finally {
+		try {
+			await db?.destroy();
+		} finally {
+			try {
+				await proxy?.dispose();
+			} finally {
+				await rm(directory, {
+					recursive: true,
+					force: true
+				});
+			}
+		}
+	}
+}
+const migrateCommand = defineCommand({
+	meta: {
+		name: "migrate",
+		description: "Install or upgrade D1 before starting or deploying the site"
+	},
+	args: {
+		cwd: {
+			type: "string",
+			default: process.cwd(),
+			description: "Project directory"
+		},
+		local: {
+			type: "boolean",
+			default: false,
+			description: "Migrate local Wrangler D1 state"
+		},
+		remote: {
+			type: "boolean",
+			default: false,
+			description: "Migrate the explicitly configured Cloudflare account and D1 database"
+		},
+		"dry-run": {
+			type: "boolean",
+			default: false,
+			description: "Validate configuration without connecting to D1 or writing files"
+		},
+		adopt: {
+			type: "boolean",
+			default: false,
+			description: "Verify and adopt an imported, upgraded Node database"
+		},
+		config: {
+			type: "string",
+			description: "Wrangler configuration path"
+		},
+		env: {
+			type: "string",
+			description: "Wrangler environment"
+		}
+	},
+	async run({ args }) {
+		const result = await migrateProjectD1({
+			cwd: args.cwd,
+			local: args.local,
+			remote: args.remote,
+			dryRun: args["dry-run"],
+			adopt: args.adopt,
+			config: args.config,
+			environment: args.env
+		});
+		consola.log(JSON.stringify(result, null, 2));
+	}
+});
+const databaseCommand = defineCommand({
+	meta: {
+		name: "database",
+		description: "Explicit database maintenance"
+	},
+	subCommands: { migrate: migrateCommand }
+});
+
 //#endregion
 //#region src/cli/paywall.ts
 const PAYWALL_MESSAGE_PATTERN = /\b(quota|credit|credits|upgrade|plan|billing|subscription|slot)\b/i;
@@ -1016,6 +1277,97 @@ async function handleCliPaywall(input) {
 	return 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/utils/astro-adapter.ts
 const CLOUDFLARE_ADAPTER_PACKAGE = "@astrojs/cloudflare";
@@ -1348,6 +1700,9 @@ async function readWorkersBuild(cwd) {
 	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);
+	if (!await exists(join(serverDir, WORKERS_BUILD_METADATA))) throw new Error("Missing Dineway build metadata. Rebuild the Cloudflare application before deploying.");
+	await assertInsideDirectory(serverDir, join(serverDir, WORKERS_BUILD_METADATA));
+	await validateWorkersBindings(serverDir, config);
 	const entrypoint = resolve(serverDir, config.main);
 	const assetsDir = resolve(serverDir, config.assets.directory);
 	await assertInsideDirectory(serverDir, entrypoint);
@@ -1363,203 +1718,12 @@ async function readWorkersBuild(cwd) {
 	};
 }
 
-//#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.",
+	description: "Deploy an Astro Worker with Wrangler, D1, and object storage.",
 	supportLevel: "experimental",
 	cli: {
 		npmPackage: null,
@@ -1568,7 +1732,7 @@ const cloudflareTarget = {
 			command: "wrangler",
 			args: ["--version"]
 		},
-		installHint: "Install wrangler in this project (for example: pnpm add -D wrangler@^4.131.1)."
+		installHint: "Install wrangler in this project (for example: pnpm add -D wrangler@^4.156.1)."
 	},
 	async checkAuth(cwd) {
 		return (await runCommand$1(resolveProviderCli(cwd, "wrangler"), ["whoami", "--json"], { cwd })).code === 0;
@@ -3480,8 +3644,7 @@ const targets = [
 	dockerTarget,
 	flyTarget,
 	gcpTarget,
-	cloudflareTarget,
-	chatgptSitesTarget
+	cloudflareTarget
 ];
 const DEFAULT_TARGET = "forgeway";
 function getTarget(name) {
@@ -3567,7 +3730,7 @@ const deployCommand = defineCommand({
 		},
 		site: {
 			type: "string",
-			description: "Forgeway site ID/slug or exact ChatGPT Sites project ID",
+			description: "Forgeway site ID/slug",
 			required: false
 		},
 		"place-id": {
@@ -3756,7 +3919,7 @@ async function fileExists$3(path) {
 const devCommand = defineCommand({
 	meta: {
 		name: "dev",
-		description: "Start dev server with local database"
+		description: "Start the development server"
 	},
 	args: {
 		database: {
@@ -3790,26 +3953,28 @@ const devCommand = defineCommand({
 			consola.error("No package.json found");
 			process.exit(1);
 		}
-		const database = resolveCliDatabaseTarget(cwd, args.database);
-		consola.info(`Database: ${database.display}`);
-		if (database.localPath && !await fileExists$3(database.localPath)) consola.start("Database not found, initializing...");
-		const db = createDatabase({ url: database.url });
-		try {
-			consola.start("Checking database migrations...");
-			const { applied } = await runMigrations(db);
-			if (applied.length > 0) consola.success(`Applied ${applied.length} migrations`);
-			else consola.info("Database up to date");
-		} catch (error) {
-			consola.error("Migration failed:", error);
+		const database = (await readProjectDinewayConfig(cwd))?.database?.entrypoint === "dineway/db/d1" ? void 0 : resolveCliDatabaseTarget(cwd, args.database);
+		if (database) {
+			consola.info(`Database: ${database.display}`);
+			if (database.localPath && !await fileExists$3(database.localPath)) consola.start("Database not found, initializing...");
+			const db = createDatabase({ url: database.url });
+			try {
+				consola.start("Checking database migrations...");
+				const { applied } = await runMigrations(db);
+				if (applied.length > 0) consola.success(`Applied ${applied.length} migrations`);
+				else consola.info("Database up to date");
+			} catch (error) {
+				consola.error("Migration failed:", error);
+				await db.destroy();
+				process.exit(1);
+			}
 			await db.destroy();
-			process.exit(1);
-		}
-		await db.destroy();
+		} else consola.info("Using the configured D1 binding. Run dineway database migrate --local before starting a fresh database.");
 		if (args.types) {
 			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-C-y9VZDX.mjs").then((n) => n.t);
+				const { createClientFromArgs } = await import("../client-factory-6vLLT06O.mjs").then((n) => n.t);
 				const client = createClientFromArgs({ url: remoteUrl });
 				const schema = await client.schemaExport();
 				const types = await client.schemaTypes();
@@ -3851,7 +4016,7 @@ const devCommand = defineCommand({
 			stdio: "inherit",
 			env: {
 				...process.env,
-				DINEWAY_DATABASE_URL: database.url
+				...database ? { DINEWAY_DATABASE_URL: database.url } : {}
 			}
 		});
 		child.on("error", (error) => {
@@ -4539,21 +4704,44 @@ const INTEGRATION_TOKEN_ENV_SOURCES = [
 	["tikhub", "TIKHUB_API_KEY"]
 ];
 async function importIntegrationCredentialsFromEnvironment(db, env) {
-	if (await new OptionsRepository(db).exists(INTEGRATION_CREDENTIAL_IMPORT_MARKER)) return {
+	const options = new OptionsRepository(db);
+	if (await options.exists(INTEGRATION_CREDENTIAL_IMPORT_MARKER)) return {
 		status: "already_completed",
 		providers: []
 	};
 	const credentials = collectEnvironmentCredentials(env);
 	const keys = await parseEncryptionKeys(env.DINEWAY_ENCRYPTION_KEY);
 	if (credentials.length > 0 && (!keys || keys.length === 0)) throw new DinewaySecretsError("DINEWAY_ENCRYPTION_KEY is required to import Integration credentials.", "ENCRYPTION_KEY_REQUIRED");
-	await db.transaction().execute(async (trx) => {
-		const store = new IntegrationCredentialStore(trx, { keys: keys ?? [] });
-		for (const entry of credentials) if (!await store.status(entry.provider)) await store.set(entry.provider, entry.credential, "environment");
-		await new OptionsRepository(trx).set(INTEGRATION_CREDENTIAL_IMPORT_MARKER, {
+	const store = new IntegrationCredentialStore(db, { keys: keys ?? [] });
+	const checks = [sql`NOT EXISTS (SELECT 1 FROM options WHERE name = ${INTEGRATION_CREDENTIAL_IMPORT_MARKER})`];
+	const statements = [];
+	for (const entry of credentials) {
+		const existing = await db.selectFrom("_dineway_integration_credentials").selectAll().where("provider", "=", entry.provider).executeTakeFirst();
+		if (existing) checks.push(rowUnchanged("_dineway_integration_credentials", existing));
+		else {
+			checks.push(sql`NOT EXISTS (SELECT 1 FROM _dineway_integration_credentials WHERE provider = ${entry.provider})`);
+			statements.push(await store.prepareSet(entry.provider, entry.credential, "environment"));
+		}
+	}
+	statements.push(db.insertInto("options").values({
+		name: INTEGRATION_CREDENTIAL_IMPORT_MARKER,
+		value: JSON.stringify({
 			completedAt: (/* @__PURE__ */ new Date()).toISOString(),
 			providerCount: credentials.length
+		})
+	}).compile());
+	try {
+		await atomicBatch(db, {
+			checks,
+			statements
 		});
-	});
+	} catch (error) {
+		if (error instanceof AtomicWriteConflict && await options.exists(INTEGRATION_CREDENTIAL_IMPORT_MARKER)) return {
+			status: "already_completed",
+			providers: []
+		};
+		throw error;
+	}
 	return {
 		status: credentials.length > 0 ? "imported" : "completed_empty",
 		providers: credentials.map((entry) => entry.provider)
@@ -5807,7 +5995,7 @@ const publishCommand = defineCommand({
 			const pluginDir = resolve(args.dir);
 			try {
 				const { runCommand } = await import("citty");
-				const { bundleCommand } = await import("../bundle-S6zx-V4D.mjs").then((n) => n.n);
+				const { bundleCommand } = await import("../bundle-DImnxo71.mjs").then((n) => n.n);
 				await runCommand(bundleCommand, { rawArgs: ["--dir", pluginDir] });
 			} catch {
 				consola.error("Build failed");
@@ -8291,6 +8479,7 @@ function isFileNotFound(error) {
 */
 const builtInCommands = {
 	init: initCommand,
+	database: databaseCommand,
 	account: accountCommand,
 	types: typesCommand,
 	dev: devCommand,