dineway 0.1.34 → 0.1.36

package/dist/cli/index.mjs

@@ -2,7 +2,7 @@
 import { t as __exportAll } from "../chunk-ClPoSABd.mjs";
 import { n as createDatabase } from "../connection-BCNICDWN.mjs";
 import { c as listTablesLike } from "../dialect-helpers-TkdbkFad.mjs";
-import { r as runMigrations, t as getMigrationStatus } from "../runner-lqEiJbO-.mjs";
+import { i as runMigrations, n as getMigrationStatus, t as getMigrationFingerprint } from "../runner-S3smkgdc.mjs";
 import { r as isI18nEnabled } from "../config-XW5tMrH8.mjs";
 import { n as slugify } from "../slugify-BzGxlOFx.mjs";
 import { t as ContentRepository } from "../content-DvpMad_N.mjs";
@@ -27,9 +27,9 @@ import { createHeaderAwareFetch, customHeadersInterceptor, isRedirectResponse, r
 import { o as convertDataForRead } from "../transport-B7kO-4ee.mjs";
 import { DinewayClient } from "../client/index.mjs";
 import { LocalStorage } from "../storage/local.mjs";
+import { createHash } from "node:crypto";
 import { imageSize } from "image-size";
 import { createGzipDecoder, unpackTar } from "modern-tar";
-import { createHash } from "node:crypto";
 import { createReadStream, createWriteStream, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, extname, isAbsolute, join, relative, resolve } from "node:path";
 import { defineCommand, runCommand, runMain } from "citty";
@@ -190,7 +190,7 @@ function removeMarketplaceCredential(registryUrl) {
 //#region src/cli/project-env.ts
 const DEFAULT_DINEWAY_URL = "http://localhost:4321";
 const ENV_KEY_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
-const LINE_SPLIT_PATTERN = /\r?\n/;
+const LINE_SPLIT_PATTERN$1 = /\r?\n/;
 const NEWLINE_PATTERN = /\r?\n/g;
 function parseDotenvValue(value) {
 	const trimmed = value.trim();
@@ -199,7 +199,7 @@ function parseDotenvValue(value) {
 }
 function parseDotenv(text) {
 	const env = {};
-	for (const line of text.split(LINE_SPLIT_PATTERN)) {
+	for (const line of text.split(LINE_SPLIT_PATTERN$1)) {
 		const trimmed = line.trim();
 		if (!trimmed || trimmed.startsWith("#")) continue;
 		const normalized = trimmed.startsWith("export ") ? trimmed.slice(7).trim() : trimmed;
@@ -233,7 +233,7 @@ function formatEnvValue(value) {
 async function upsertProjectEnv(cwd, values) {
 	const envPath = join(cwd, ".env");
 	const existing = await readFile(envPath, "utf-8").catch(() => "");
-	const lines = existing ? existing.split(LINE_SPLIT_PATTERN) : [];
+	const lines = existing ? existing.split(LINE_SPLIT_PATTERN$1) : [];
 	const seen = /* @__PURE__ */ new Set();
 	const nextLines = lines.map((line) => {
 		const trimmed = line.trim();
@@ -255,7 +255,7 @@ async function upsertProjectEnv(cwd, values) {
 async function ensureProjectGitignoreEntry(cwd, entry) {
 	const gitignorePath = join(cwd, ".gitignore");
 	const existing = await readFile(gitignorePath, "utf-8").catch(() => "");
-	if (existing.split(LINE_SPLIT_PATTERN).map((line) => line.trim()).includes(entry)) return;
+	if (existing.split(LINE_SPLIT_PATTERN$1).map((line) => line.trim()).includes(entry)) return;
 	await writeFile(gitignorePath, `${existing}${existing && !existing.endsWith("\n") ? "\n" : ""}${entry}\n`, "utf-8");
 }
 
@@ -1637,7 +1637,7 @@ async function writeForgewayCredentials(credentials, cwd) {
 	await writeStore(store, cwd);
 }
 function shadowGrantKey(platformApiUrl, placeId) {
-	return `${platformApiUrl.replace(TRAILING_SLASH_PATTERN$1, "")}#${placeId}`;
+	return `${platformApiUrl.replace(TRAILING_SLASH_PATTERN$1, "")}#${placeId ?? "__unbound__"}`;
 }
 async function readForgewayShadowGrant(platformApiUrl, placeId, cwd) {
 	const store = await readStore(cwd);
@@ -1665,23 +1665,37 @@ const DATABASE_ENV_VAR_NAMES = ["DINEWAY_DATABASE_URL", "DINEWAY_DATABASE_AUTH_T
 const POLL_INTERVAL_MS$1 = 5e3;
 const POLL_TIMEOUT_MS$1 = 3e5;
 const DIRECT_UPLOAD_CONCURRENCY = 8;
-const DEFAULT_BOOTSTRAP_PLACE_ID = "ChIJs5ydyTiuEmsR0fRSlU0C7k0";
+const FILE_HASH_CONCURRENCY = 8;
 const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 const PLACE_ID_PATTERN = /^[A-Za-z0-9_-]{10,}$/;
 const SLUG_SEPARATOR_PATTERN = /[^a-z0-9]+/g;
 const LEADING_TRAILING_HYPHEN_PATTERN = /^-+|-+$/g;
+const DIACRITICS_PATTERN = /[\u0300-\u036f]/g;
+const NON_COMPARE_PATTERN = /[^\p{Letter}\p{Number}]+/gu;
+const LOCATION_PARTS_PATTERN = /[,;|/]+|\s+-\s+/u;
 const JWT_PATTERN = /[A-Za-z0-9_-]{32,}\.[A-Za-z0-9_-]{16,}\.[A-Za-z0-9_-]{16,}/g;
 const TOKEN_ASSIGNMENT_PATTERN = /(DINEWAY_DATABASE_AUTH_TOKEN|DATABASE_AUTH_TOKEN|AUTH_TOKEN)=\S+/gi;
 const TRAILING_SLASH_PATTERN = /\/$/;
+const LEADING_SLASHES_PATTERN = /^\/+/;
+const TRAILING_SLASHES_PATTERN = /\/+$/;
+const REGEXP_ESCAPE_PATTERN = /[|\\{}()[\]^$+?.]/g;
+const LINE_SPLIT_PATTERN = /\r?\n/;
 const BACKSLASH_PATTERN = /\\/g;
-const DIACRITICS_PATTERN = /[\u0300-\u036f]/g;
-const NON_COMPARE_PATTERN = /[^\p{Letter}\p{Number}]+/gu;
-const LOCATION_PARTS_PATTERN = /[,;|/]+|\s+-\s+/u;
 const SHADOW_EMAIL_PATTERN = /^shadow_[a-f0-9]{16}@dineway\.ai$/i;
+const FOOD_TYPES = new Set([
+	"restaurant",
+	"cafe",
+	"food",
+	"meal_takeaway",
+	"meal_delivery",
+	"bakery"
+]);
 const EXCLUDE_PATTERNS = [
 	"node_modules",
 	".git",
 	".next",
+	".astro",
+	".plan",
 	".env",
 	".env.local",
 	"dist",
@@ -1703,7 +1717,11 @@ const EXCLUDE_PATTERNS = [
 	".turbo",
 	".cache",
 	"skills",
-	"coverage"
+	"coverage",
+	"uploads",
+	"data.db",
+	"data.db-shm",
+	"data.db-wal"
 ];
 var ForgewayApiError = class extends Error {
 	constructor(message, status) {
@@ -1739,6 +1757,39 @@ function getEnv(name) {
 	const value = process.env[name];
 	return value && value.trim() ? value.trim() : void 0;
 }
+function isVerboseDeploy(options) {
+	return options?.verbose === true || getEnv("DINEWAY_DEPLOY_VERBOSE") === "1";
+}
+function formatDuration(ms) {
+	if (ms < 1e3) return `${ms}ms`;
+	return `${Math.round(ms / 100) / 10}s`;
+}
+function formatBytes$1(bytes) {
+	if (bytes < 1024) return `${bytes} B`;
+	const units = [
+		"KB",
+		"MB",
+		"GB"
+	];
+	let value = bytes / 1024;
+	for (let index = 0; index < units.length; index++) {
+		const unit = units[index];
+		if (value < 1024 || index === units.length - 1) return `${value.toFixed(value >= 10 ? 0 : 1)} ${unit}`;
+		value /= 1024;
+	}
+	return `${bytes} B`;
+}
+function deploymentFileSize(files) {
+	return files.reduce((total, file) => total + file.size, 0);
+}
+function formatSeedSummary(seed) {
+	if (!seed) return "no seed";
+	return [
+		`collections ${seed.collections.created}/${seed.collections.skipped}/${seed.collections.updated}`,
+		`content ${seed.content.created}/${seed.content.skipped}/${seed.content.updated}`,
+		`media ${seed.media.created}/${seed.media.skipped}`
+	].join(", ");
+}
 async function readJsonResponse(response) {
 	return await response.json().catch(() => null);
 }
@@ -1792,7 +1843,7 @@ async function refreshFormalAccessToken(context, deps) {
 	return payload.accessToken;
 }
 async function refreshShadowAccessToken(context, deps) {
-	if (!context.refreshToken || !context.placeId) throw new Error("Dineway shadow deploy grant is missing its refresh token.");
+	if (!context.refreshToken) throw new Error("Dineway shadow deploy grant is missing its refresh token.");
 	const response = await forgewayRequest(`${context.platformApiUrl}/api/auth/refresh?client_type=server`, {
 		method: "POST",
 		headers: { "Content-Type": "application/json" },
@@ -1849,7 +1900,6 @@ function isStoredFormalCredentialForGrant(stored, grant, email) {
 	if (normalizeEmail(stored.user.email) !== email) return false;
 	if (stored.user.emailVerified !== true) return false;
 	if (isShadowEmail(stored.user.email)) return false;
-	if (grant.user?.id && stored.user.id !== grant.user.id) return false;
 	return true;
 }
 function assertVerifiedFormalAccountUser(user, expectedEmail) {
@@ -1917,7 +1967,7 @@ async function resolveShadowProjectContext(cwd, options, deps) {
 	const pkg = await readDeployPackageJson(cwd).catch(() => null);
 	const saved = pkg ? getSavedForgewayMetadata(pkg) : {};
 	const platformApiUrl = normalizePlatformApiUrl(getEnv("DINEWAY_API_BASE_URL") ?? getEnv("FORGEWAY_API_URL") ?? (typeof saved.platformApiUrl === "string" ? saved.platformApiUrl : void 0));
-	const savedPlaceId = getEnv("DINEWAY_PLACE_ID") ?? (typeof saved.placeId === "string" ? saved.placeId : void 0);
+	const savedPlaceId = options.placeId ?? getEnv("DINEWAY_PLACE_ID") ?? (typeof saved.placeId === "string" ? saved.placeId : void 0);
 	let grant = await (deps.readShadowGrant ?? readForgewayShadowGrant)(platformApiUrl, savedPlaceId, cwd);
 	let restaurant;
 	if (!grant) {
@@ -1936,6 +1986,28 @@ async function resolveShadowProjectContext(cwd, options, deps) {
 		name: options.restaurantName ?? grant.restaurantName,
 		city: options.city ?? grant.city
 	};
+	if (!grant.placeId) {
+		const shadowRestaurant = restaurant?.name && restaurant.city ? {
+			name: restaurant.name,
+			city: restaurant.city
+		} : await resolveShadowRestaurantInfo(options, deps);
+		restaurant = shadowRestaurant;
+		grant = savedPlaceId ? await bindShadowGrantPlace({
+			platformApiUrl,
+			grant,
+			placeId: savedPlaceId,
+			restaurant: shadowRestaurant,
+			cwd,
+			deps
+		}) : await resolvePlaceIdWithShadowSearch({
+			platformApiUrl,
+			grant,
+			restaurant: shadowRestaurant,
+			cwd,
+			deps
+		});
+	}
+	if (!grant.placeId) throw new Error("Could not resolve a Dineway place id for Forgeway deploy.");
 	const shadowContext = {
 		projectDir: cwd,
 		platformApiUrl,
@@ -1965,107 +2037,280 @@ async function resolveShadowProjectContext(cwd, options, deps) {
 async function resolveProjectContext(cwd, options, deps) {
 	return await resolveShadowProjectContext(cwd, options, deps);
 }
+async function createShadowUser(platformApiUrl, placeId, deps) {
+	const response = await forgewayRequest(`${platformApiUrl}/api/auth/users/shadow`, {
+		method: "POST",
+		headers: { "Content-Type": "application/json" },
+		body: JSON.stringify({
+			...placeId ? { placeId } : {},
+			language: "en"
+		})
+	}, deps);
+	if (!response.ok) throw new Error(await parseErrorResponse(response));
+	const payload = await response.json();
+	if (!payload.accessToken || !payload.refreshToken) throw new Error("Dineway shadow user response was missing tokens.");
+	return payload;
+}
 function isRecord(value) {
-	return typeof value === "object" && value !== null;
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function uniqueStrings(values) {
+	return [...new Set(values.map((value) => String(value || "").trim()).filter(Boolean))];
 }
-function getText(value) {
+function displayText(value) {
 	if (typeof value === "string" || typeof value === "number") return String(value);
-	if (Array.isArray(value)) return value.map(getText).filter(Boolean).join(" ");
-	if (isRecord(value)) return getText(value.text) || getText(value.name) || getText(value.displayName) || getText(value.longText) || getText(value.shortText) || getText(value.value);
+	if (Array.isArray(value)) return value.map(displayText).filter(Boolean).join(" ");
+	if (isRecord(value)) return displayText(value.text) || displayText(value.name) || displayText(value.displayName) || displayText(value.longText) || displayText(value.shortText) || displayText(value.long_name) || displayText(value.short_name) || displayText(value.value);
 	return "";
 }
-function compareText(value) {
-	return value.toLowerCase().normalize("NFKD").replace(DIACRITICS_PATTERN, "").replace(NON_COMPARE_PATTERN, "");
+function normalizeCompare(value) {
+	return String(value || "").toLowerCase().normalize("NFKD").replace(DIACRITICS_PATTERN, "").replace(NON_COMPARE_PATTERN, "");
 }
 function candidatePlaceId(candidate) {
 	return String(candidate.placeId || candidate.id || "").trim();
 }
-function candidateNames(candidate) {
-	return [
-		getText(candidate.displayName),
-		getText(candidate.name),
-		getText(candidate.businessName),
-		getText(candidate.title)
-	].filter(Boolean);
+function candidateNameTexts(candidate) {
+	return uniqueStrings([
+		displayText(candidate.displayName),
+		displayText(candidate.name),
+		displayText(candidate.businessName),
+		displayText(candidate.title)
+	]);
+}
+function candidateAddressTexts(candidate) {
+	const addressComponents = Array.isArray(candidate.addressComponents) ? candidate.addressComponents.flatMap((component) => isRecord(component) ? [
+		displayText(component.longText),
+		displayText(component.shortText),
+		displayText(component.long_name),
+		displayText(component.short_name),
+		displayText(component.name)
+	] : []) : [];
+	return uniqueStrings([
+		displayText(candidate.formattedAddress),
+		displayText(candidate.shortFormattedAddress),
+		displayText(candidate.address),
+		displayText(candidate.vicinity),
+		displayText(candidate.plusCode?.compoundCode),
+		displayText(candidate.plus_code?.compound_code),
+		...addressComponents
+	]);
+}
+function candidateTypes(candidate) {
+	return uniqueStrings([
+		...Array.isArray(candidate.types) ? candidate.types : [],
+		candidate.primaryType,
+		candidate.primary_type
+	]).map((type) => type.toLowerCase());
+}
+function locationParts(value) {
+	return uniqueStrings(value.split(LOCATION_PARTS_PATTERN).map((part) => normalizeCompare(part)).filter(Boolean));
+}
+function scoreNameMatch(queryName, candidateNames) {
+	let bestScore = 0;
+	let bestReason = "";
+	for (const name of candidateNames) {
+		const currentName = normalizeCompare(name);
+		if (!queryName || !currentName) continue;
+		let score = 0;
+		let reason = "";
+		if (currentName === queryName) {
+			score = 120;
+			reason = "exact_name";
+		} else if (currentName.includes(queryName)) {
+			score = 80;
+			reason = "candidate_contains_name";
+		} else if (queryName.includes(currentName) && currentName.length >= Math.min(4, queryName.length)) {
+			score = 45;
+			reason = "query_contains_candidate_name";
+		}
+		if (score > bestScore) {
+			bestScore = score;
+			bestReason = reason;
+		}
+	}
+	return {
+		score: bestScore,
+		reason: bestReason
+	};
 }
-function candidateLocationText(candidate) {
-	return [
-		getText(candidate.formattedAddress),
-		getText(candidate.shortFormattedAddress),
-		getText(candidate.address),
-		getText(candidate.vicinity),
-		getText(candidate.plusCode),
-		getText(candidate.addressComponents)
-	].filter(Boolean).join(" ");
-}
-function selectPlaceCandidate(candidates, restaurantName, city) {
-	const targetName = compareText(restaurantName);
-	const cityParts = city.split(LOCATION_PARTS_PATTERN).map((part) => compareText(part)).filter(Boolean);
+function scoreLocationMatch(city, candidate) {
+	const queryLocation = normalizeCompare(city);
+	const parts = locationParts(city);
+	const candidateLocation = normalizeCompare(candidateAddressTexts(candidate).join(" "));
+	let score = 0;
+	const reasons = [];
+	if (!candidateLocation) return {
+		score,
+		reasons
+	};
+	if (queryLocation && candidateLocation.includes(queryLocation)) return {
+		score: 55,
+		reasons: ["location_full_match"]
+	};
+	const [primaryPart, ...secondaryParts] = parts;
+	if (primaryPart && candidateLocation.includes(primaryPart)) {
+		score += 38;
+		reasons.push("location_primary_match");
+	}
+	for (const part of secondaryParts) if (part.length >= 3 && candidateLocation.includes(part)) {
+		score += 10;
+		reasons.push("location_secondary_match");
+	}
+	return {
+		score,
+		reasons
+	};
+}
+function scorePlaceCandidate(candidate, context) {
+	const queryName = normalizeCompare(context.name);
+	const currentPlaceId = candidatePlaceId(candidate);
+	let score = 0;
+	const reasons = [];
+	if (context.providedPlaceId && currentPlaceId === context.providedPlaceId) {
+		score += 1e4;
+		reasons.push("provided_place_id");
+	}
+	const nameMatch = scoreNameMatch(queryName, candidateNameTexts(candidate));
+	if (nameMatch.score) {
+		score += nameMatch.score;
+		reasons.push(nameMatch.reason);
+	}
+	const locationMatch = scoreLocationMatch(context.city, candidate);
+	if (locationMatch.score) {
+		score += locationMatch.score;
+		reasons.push(...locationMatch.reasons);
+	}
+	if (candidateTypes(candidate).some((type) => FOOD_TYPES.has(type))) {
+		score += 10;
+		reasons.push("food_type");
+	}
+	const businessStatus = String(candidate.businessStatus ?? candidate.business_status ?? "").toUpperCase();
+	if (businessStatus === "OPERATIONAL") {
+		score += 4;
+		reasons.push("operational");
+	} else if (businessStatus === "CLOSED_PERMANENTLY") {
+		score -= 60;
+		reasons.push("closed_permanently");
+	}
+	const rating = Number(candidate.rating);
+	if (Number.isFinite(rating)) score += Math.min(Math.max(rating, 0), 5);
+	const reviewCount = Number(candidate.userRatingCount ?? candidate.user_ratings_total);
+	if (Number.isFinite(reviewCount)) score += Math.min(Math.max(reviewCount, 0), 500) / 100;
+	return {
+		score,
+		reason: reasons.join("+") || "fallback"
+	};
+}
+function selectPlaceCandidate(candidates, context) {
 	let best = null;
+	let bestScore = Number.NEGATIVE_INFINITY;
+	let bestReason = "fallback";
 	for (const candidate of candidates) {
-		if (!candidatePlaceId(candidate)) continue;
-		const names = candidateNames(candidate).map(compareText);
-		const location = compareText(candidateLocationText(candidate));
-		let score = 0;
-		if (names.some((name) => name === targetName)) score += 80;
-		else if (names.some((name) => name.includes(targetName) || targetName.includes(name))) score += 55;
-		score += cityParts.filter((part) => location.includes(part)).length * 20;
-		const rating = typeof candidate.rating === "number" ? candidate.rating : Number(candidate.rating ?? 0);
-		if (rating > 0) score += Math.min(rating, 5);
-		const reviewCount = typeof candidate.userRatingCount === "number" ? candidate.userRatingCount : Number(candidate.userRatingCount ?? 0);
-		if (reviewCount > 0) score += Math.min(Math.log10(reviewCount + 1), 4);
-		if (!best || score > best.score) best = {
-			candidate,
-			score
-		};
-	}
-	if (!best) throw new Error(`Could not find a deployable place for "${restaurantName}" in "${city}".`);
-	return best.candidate;
+		const { score, reason } = scorePlaceCandidate(candidate, context);
+		if (score > bestScore) {
+			best = candidate;
+			bestScore = score;
+			bestReason = reason;
+		}
+	}
+	return best ? {
+		candidate: best,
+		score: bestScore,
+		reason: bestReason
+	} : null;
+}
+function extractPlaceCandidates(payload) {
+	const root = isRecord(payload) ? payload : {};
+	const nestedData = isRecord(root.data) ? root.data : {};
+	const places = root.places ?? root.results ?? nestedData.places ?? nestedData.results;
+	if (!Array.isArray(places)) throw new Error("Dineway place search response did not include places/results.");
+	return places.filter(isRecord);
+}
+function shadowContextFromGrant(cwd, platformApiUrl, grant, restaurant) {
+	return {
+		projectDir: cwd,
+		platformApiUrl,
+		authKind: "shadow-grant",
+		accessToken: grant.accessToken,
+		refreshToken: grant.refreshToken,
+		user: grant.user,
+		ossHost: platformApiUrl,
+		placeId: grant.placeId,
+		restaurantName: restaurant?.name ?? grant.restaurantName,
+		city: restaurant?.city ?? grant.city
+	};
 }
-function extractPlaces(payload) {
-	return (isRecord(payload) ? Array.isArray(payload.places) ? payload.places : Array.isArray(payload.results) ? payload.results : isRecord(payload.data) && Array.isArray(payload.data.places) ? payload.data.places : isRecord(payload.data) && Array.isArray(payload.data.results) ? payload.data.results : [] : []).filter(isRecord);
+function grantFromShadowContext(context, grant, overrides = {}) {
+	return {
+		...grant,
+		platformApiUrl: context.platformApiUrl,
+		accessToken: context.accessToken ?? grant.accessToken,
+		refreshToken: context.refreshToken ?? grant.refreshToken,
+		placeId: context.placeId ?? grant.placeId,
+		restaurantName: context.restaurantName ?? grant.restaurantName,
+		city: context.city ?? grant.city,
+		user: context.user ?? grant.user,
+		updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+		...overrides
+	};
 }
-async function createShadowUser(platformApiUrl, placeId, deps) {
-	const response = await forgewayRequest(`${platformApiUrl}/api/auth/users/shadow`, {
+async function searchPlacesWithShadowGrant(options) {
+	const context = shadowContextFromGrant(options.cwd, options.platformApiUrl, options.grant, options.restaurant);
+	const payload = await shadowUpgradeFetch(context, "/api/places/search", options.deps, {
+		method: "POST",
+		body: JSON.stringify({ textQuery: `${options.restaurant.name} in ${options.restaurant.city}` })
+	});
+	return {
+		grant: grantFromShadowContext(context, options.grant),
+		candidates: extractPlaceCandidates(payload)
+	};
+}
+async function bindShadowGrantPlace(options) {
+	const context = shadowContextFromGrant(options.cwd, options.platformApiUrl, options.grant, options.restaurant);
+	const payload = await shadowUpgradeFetch(context, "/api/auth/users/shadow/place", options.deps, {
 		method: "POST",
-		headers: { "Content-Type": "application/json" },
 		body: JSON.stringify({
-			placeId,
+			placeId: options.placeId,
 			language: "en"
 		})
-	}, deps);
-	if (!response.ok) throw new Error(await parseErrorResponse(response));
-	const payload = await response.json();
-	if (!payload.accessToken || !payload.refreshToken) throw new Error("Dineway shadow user response was missing tokens.");
-	return payload;
+	});
+	const grant = grantFromShadowContext(context, options.grant, {
+		placeId: options.placeId,
+		accessToken: payload.accessToken ?? context.accessToken ?? options.grant.accessToken,
+		refreshToken: payload.refreshToken ?? context.refreshToken ?? options.grant.refreshToken,
+		restaurantName: options.restaurant.name,
+		city: options.restaurant.city,
+		user: payload.user ? normalizeForgewayUser(payload.user) : context.user ?? options.grant.user
+	});
+	await (options.deps.writeShadowGrant ?? writeForgewayShadowGrant)(grant, options.cwd);
+	return grant;
 }
-async function searchPlaces(platformApiUrl, accessToken, restaurantName, city, deps) {
-	const response = await forgewayRequest(`${platformApiUrl}/api/places/search`, {
-		method: "POST",
-		headers: {
-			"Content-Type": "application/json",
-			Authorization: `Bearer ${accessToken}`
-		},
-		body: JSON.stringify({ textQuery: `${restaurantName} in ${city}` })
-	}, deps);
-	if (!response.ok) throw new Error(await parseErrorResponse(response));
-	return extractPlaces(await response.json());
+async function resolvePlaceIdWithShadowSearch(options) {
+	const { grant, candidates } = await searchPlacesWithShadowGrant(options);
+	if (candidates.length === 0) throw new Error(`Dineway place search returned no candidates for "${options.restaurant.name} in ${options.restaurant.city}".`);
+	const selected = selectPlaceCandidate(candidates, {
+		name: options.restaurant.name,
+		city: options.restaurant.city
+	});
+	const finalPlaceId = selected ? candidatePlaceId(selected.candidate) : "";
+	if (!PLACE_ID_PATTERN.test(finalPlaceId)) throw new Error("Could not resolve a valid Dineway place id for Forgeway deploy.");
+	return await bindShadowGrantPlace({
+		...options,
+		grant,
+		placeId: finalPlaceId
+	});
 }
 async function createShadowGrant(options) {
-	const initialPlaceId = options.placeId || DEFAULT_BOOTSTRAP_PLACE_ID;
-	const initialAuth = await createShadowUser(options.platformApiUrl, initialPlaceId, options.deps);
-	let finalPlaceId = options.placeId;
-	if (!finalPlaceId) finalPlaceId = candidatePlaceId(selectPlaceCandidate(await searchPlaces(options.platformApiUrl, initialAuth.accessToken, options.restaurantName, options.city, options.deps), options.restaurantName, options.city));
-	if (!PLACE_ID_PATTERN.test(finalPlaceId)) throw new Error("Could not resolve a valid Dineway place id for Forgeway deploy.");
-	const finalAuth = finalPlaceId === initialPlaceId ? initialAuth : await createShadowUser(options.platformApiUrl, finalPlaceId, options.deps);
+	if (options.placeId && !PLACE_ID_PATTERN.test(options.placeId)) throw new Error("Could not resolve a valid Dineway place id for Forgeway deploy.");
+	const auth = await createShadowUser(options.platformApiUrl, options.placeId, options.deps);
 	const grant = {
 		platformApiUrl: options.platformApiUrl,
-		placeId: finalPlaceId,
-		accessToken: finalAuth.accessToken,
-		refreshToken: finalAuth.refreshToken,
+		...options.placeId ? { placeId: options.placeId } : {},
+		accessToken: auth.accessToken,
+		refreshToken: auth.refreshToken,
 		restaurantName: options.restaurantName,
 		city: options.city,
-		user: finalAuth.user ? normalizeForgewayUser(finalAuth.user) : void 0,
+		user: auth.user ? normalizeForgewayUser(auth.user) : void 0,
 		updatedAt: (/* @__PURE__ */ new Date()).toISOString()
 	};
 	await (options.deps.writeShadowGrant ?? writeForgewayShadowGrant)(grant, options.cwd);
@@ -2158,6 +2403,25 @@ async function getDeploymentSite(context, site, deps) {
 		throw error;
 	}
 }
+async function getDeploymentSiteByPlaceId(context, placeId, deps) {
+	try {
+		return normalizeSiteDetail(await ossFetch(context, `/api/deployments/sites/by-place/${encodeURIComponent(placeId)}`, deps));
+	} catch (error) {
+		if (error instanceof ForgewayApiError && error.status === 404) return null;
+		throw error;
+	}
+}
+async function ensureRestaurantClaim(context, restaurant, deps) {
+	if (!context.placeId) throw new Error("Forgeway restaurant deploy is missing a place ID for claim ownership.");
+	await ossFetch(context, "/api/restaurant-claims/ensure", deps, {
+		method: "POST",
+		body: JSON.stringify({
+			placeId: context.placeId,
+			...restaurant?.name ? { placeName: restaurant.name } : {},
+			...restaurant?.city ? { city: restaurant.city } : {}
+		})
+	});
+}
 async function createDeploymentSite(context, input, deps) {
 	return await ossFetch(context, "/api/deployments/sites", deps, {
 		method: "POST",
@@ -2175,10 +2439,12 @@ async function resolveDeploymentSite(cwd, context, options, seedPath, deps, preR
 	const saved = pkg ? getSavedForgewayMetadata(pkg) : {};
 	const explicitSite = options.site;
 	const savedSite = typeof saved.siteId === "string" ? saved.siteId : saved.siteSlug;
-	const siteRef = explicitSite ?? savedSite;
-	const restaurant = preResolvedRestaurant?.name && preResolvedRestaurant.city ? preResolvedRestaurant : await resolveRestaurantInfo(options, seedPath, deps, !siteRef);
+	const siteRef = context.placeId ? explicitSite : explicitSite ?? savedSite;
+	const existingByPlace = context.placeId ? await getDeploymentSiteByPlaceId(context, context.placeId, deps) : null;
+	const restaurant = preResolvedRestaurant?.name && preResolvedRestaurant.city ? preResolvedRestaurant : await resolveRestaurantInfo(options, seedPath, deps, !existingByPlace && !siteRef);
 	const targetSlug = siteRef ?? deriveForgewaySiteSlug(restaurant.name || "", restaurant.city || "");
-	let site = await getDeploymentSite(context, targetSlug, deps);
+	let site = existingByPlace;
+	if (!site && siteRef) site = await getDeploymentSite(context, targetSlug, deps);
 	if (!site) site = await createDeploymentSite(context, {
 		slug: targetSlug,
 		restaurant,
@@ -2200,20 +2466,52 @@ function redactDatabaseOutput(value, secrets) {
 	for (const secret of secrets) if (secret.length > 0) redacted = redacted.split(secret).join("[redacted]");
 	return redacted.replace(JWT_PATTERN, "[redacted-token]").replace(TOKEN_ASSIGNMENT_PATTERN, "$1=[redacted]");
 }
+async function hashFileSha256(filePath) {
+	const hash = createHash("sha256");
+	for await (const chunk of createReadStream(filePath)) hash.update(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+	return `sha256:${hash.digest("hex")}`;
+}
+async function buildDinewayInitializationFingerprint(seedPath) {
+	const migration = getMigrationFingerprint();
+	return {
+		version: 1,
+		migrationHash: migration.migrationHash,
+		migrationCount: migration.migrationCount,
+		seedHash: seedPath ? await hashFileSha256(seedPath) : null
+	};
+}
+function initializationFingerprintsMatch(left, right) {
+	return left?.version === right.version && left.migrationHash === right.migrationHash && left.migrationCount === right.migrationCount && left.seedHash === right.seedHash;
+}
+function localDatabaseInitializationMatches(metadata, siteId, databaseId, fingerprint) {
+	return metadata?.status === "succeeded" && metadata.siteId === siteId && metadata.databaseId === databaseId && initializationFingerprintsMatch(metadata.fingerprint, fingerprint);
+}
+async function readLocalDatabaseInitializationMetadata(cwd) {
+	const pkg = await readDeployPackageJson(cwd).catch(() => null);
+	if (!pkg) return void 0;
+	return getSavedForgewayMetadata(pkg).databaseInitialization;
+}
+async function writeLocalDatabaseInitializationMetadata(cwd, metadata) {
+	await writeForgewayDeployMetadata(cwd, { databaseInitialization: {
+		...metadata,
+		updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+	} });
+}
 async function runDinewayInitialization(options) {
 	const db = createDatabase({
 		url: options.credentials.databaseUrl,
 		authToken: options.credentials.authToken
 	});
 	try {
-		await runMigrations(db);
+		const migrations = await runMigrations(db);
+		let seedResult = null;
 		if (options.seedPath) {
 			const seed = JSON.parse(await readFile(options.seedPath, "utf-8"));
 			const validation = validateSeed(seed);
 			if (!validation.valid) throw new Error(`Seed validation failed: ${validation.errors.join("; ")}`);
 			const uploadsDir = resolve(options.cwd, "uploads");
 			await mkdir(uploadsDir, { recursive: true });
-			await applySeed(db, seed, {
+			seedResult = await applySeed(db, seed, {
 				includeContent: true,
 				onConflict: "skip",
 				storage: new LocalStorage({
@@ -2222,6 +2520,10 @@ async function runDinewayInitialization(options) {
 				})
 			});
 		}
+		return {
+			migrations,
+			seed: seedResult
+		};
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
 		throw new Error(redactDatabaseOutput(message, [options.credentials.authToken, options.credentials.databaseUrl]), { cause: error });
@@ -2252,25 +2554,75 @@ async function recordSiteDatabaseInitialization(context, siteId, databaseId, sta
 	});
 }
 async function initializeSiteDatabaseBeforeDeploy(options) {
+	const fingerprint = await buildDinewayInitializationFingerprint(options.seedPath);
+	const bindStart = Date.now();
 	const databaseId = (await bindSiteDatabase(options.context, options.siteId, options.database, options.deps)).binding.database.id;
+	if (options.verbose) consola.info(`Database bound in ${formatDuration(Date.now() - bindStart)}`);
+	const localInitialization = await readLocalDatabaseInitializationMetadata(options.cwd);
+	if (!options.force && localDatabaseInitializationMatches(localInitialization, options.siteId, databaseId, fingerprint)) return {
+		status: "skipped",
+		databaseId,
+		fingerprint
+	};
+	const revealStart = Date.now();
 	const credentials = await revealDatabaseRuntimeCredentials(options.context, databaseId, options.deps);
+	if (options.verbose) consola.info(`Database credentials revealed in ${formatDuration(Date.now() - revealStart)}`);
 	try {
-		await (options.deps.runDinewayInitialization ?? runDinewayInitialization)({
+		const result = await (options.deps.runDinewayInitialization ?? runDinewayInitialization)({
 			cwd: options.cwd,
 			credentials,
 			seedPath: options.seedPath
 		});
 		await recordSiteDatabaseInitialization(options.context, options.siteId, credentials.databaseId || databaseId, "succeeded", void 0, options.deps);
+		await writeLocalDatabaseInitializationMetadata(options.cwd, {
+			siteId: options.siteId,
+			databaseId: credentials.databaseId || databaseId,
+			status: "succeeded",
+			fingerprint
+		});
+		return {
+			status: "initialized",
+			databaseId: credentials.databaseId || databaseId,
+			fingerprint,
+			result
+		};
 	} catch (error) {
 		const message = redactDatabaseOutput(error instanceof Error ? error.message : String(error), [credentials.authToken, credentials.databaseUrl]);
 		await recordSiteDatabaseInitialization(options.context, options.siteId, credentials.databaseId || databaseId, "failed", message, options.deps).catch(() => void 0);
+		await writeLocalDatabaseInitializationMetadata(options.cwd, {
+			siteId: options.siteId,
+			databaseId: credentials.databaseId || databaseId,
+			status: "failed",
+			fingerprint,
+			error: message.slice(0, 2e3)
+		}).catch(() => void 0);
 		throw new Error(message, { cause: error });
 	}
 }
-function shouldExclude(name) {
+function normalizeIgnorePattern(pattern) {
+	return pattern.trim().replace(BACKSLASH_PATTERN, "/").replace(LEADING_SLASHES_PATTERN, "").replace(TRAILING_SLASHES_PATTERN, "");
+}
+function wildcardPatternToRegExp(pattern) {
+	const source = pattern.split("**").map((part) => part.split("*").map((segment) => segment.replace(REGEXP_ESCAPE_PATTERN, "\\$&")).join("[^/]*")).join(".*");
+	return new RegExp(`^${source}$`);
+}
+function matchesIgnorePattern(path, rawPattern) {
+	const pattern = normalizeIgnorePattern(rawPattern);
+	if (!pattern || pattern.startsWith("#")) return false;
+	if (pattern.includes("*")) return wildcardPatternToRegExp(pattern).test(path);
+	if (!pattern.includes("/")) return path === pattern || path.startsWith(`${pattern}/`) || basename(path) === pattern;
+	return path === pattern || path.startsWith(`${pattern}/`);
+}
+async function readDeploymentIgnorePatterns(sourceDir) {
+	const ignorePath = join(sourceDir, ".dinewayignore");
+	if (!await fileExists$8(ignorePath)) return [];
+	return (await readFile(ignorePath, "utf-8")).split(LINE_SPLIT_PATTERN).map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
+}
+function shouldExclude(name, customPatterns = []) {
 	const normalized = name.replace(BACKSLASH_PATTERN, "/");
 	for (const pattern of EXCLUDE_PATTERNS) if (normalized === pattern || normalized.startsWith(`${pattern}/`) || normalized.endsWith(`/${pattern}`) || normalized.includes(`/${pattern}/`)) return true;
-	return normalized.endsWith(".log");
+	if (normalized.endsWith(".log")) return true;
+	return customPatterns.some((pattern) => matchesIgnorePattern(normalized, pattern));
 }
 function normalizeRelativePath(sourceDir, absolutePath) {
 	return relative(sourceDir, absolutePath).replace(BACKSLASH_PATTERN, "/");
@@ -2289,6 +2641,8 @@ async function hashFile(filePath) {
 	};
 }
 async function collectDeploymentFiles(sourceDir) {
+	const customIgnorePatterns = await readDeploymentIgnorePatterns(sourceDir);
+	const candidates = [];
 	const files = [];
 	async function walk(currentDir) {
 		const entries = await readdir(currentDir, { withFileTypes: true });
@@ -2296,22 +2650,29 @@ async function collectDeploymentFiles(sourceDir) {
 		for (const entry of entries) {
 			const absolutePath = join(currentDir, entry.name);
 			const normalizedPath = normalizeRelativePath(sourceDir, absolutePath);
-			if (!normalizedPath || shouldExclude(normalizedPath)) continue;
+			if (!normalizedPath || shouldExclude(normalizedPath, customIgnorePatterns)) continue;
 			if (entry.isDirectory()) {
 				await walk(absolutePath);
 				continue;
 			}
 			if (!entry.isFile()) continue;
-			const { sha, size } = await hashFile(absolutePath);
-			files.push({
+			candidates.push({
 				absolutePath,
-				path: normalizedPath,
-				sha,
-				size
+				path: normalizedPath
 			});
 		}
 	}
 	await walk(sourceDir);
+	await runWithConcurrency(candidates, FILE_HASH_CONCURRENCY, async ({ absolutePath, path }) => {
+		const { sha, size } = await hashFile(absolutePath);
+		files.push({
+			absolutePath,
+			path,
+			sha,
+			size
+		});
+	});
+	files.sort((a, b) => a.path.localeCompare(b.path));
 	return files;
 }
 async function runWithConcurrency(items, concurrency, worker) {
@@ -2349,16 +2710,23 @@ function getDeploymentError(metadata) {
 	if (!metadata || typeof metadata.error !== "object" || metadata.error === null) return null;
 	return metadata.error.errorMessage ?? null;
 }
-async function pollDeployment(context, deploymentId, deps) {
+async function pollDeployment(context, deploymentId, deps, verbose) {
 	const pollIntervalMs = deps.pollIntervalMs ?? POLL_INTERVAL_MS$1;
 	const pollTimeoutMs = deps.pollTimeoutMs ?? POLL_TIMEOUT_MS$1;
 	const startTime = Date.now();
 	let deployment = null;
+	let firstPoll = true;
+	let lastStatus = null;
 	while (Date.now() - startTime < pollTimeoutMs) {
-		if (pollIntervalMs > 0) await new Promise((done) => setTimeout(done, pollIntervalMs));
+		if (!firstPoll && pollIntervalMs > 0) await new Promise((done) => setTimeout(done, pollIntervalMs));
+		firstPoll = false;
 		await ossFetch(context, `/api/deployments/${encodeURIComponent(deploymentId)}/sync`, deps, { method: "POST" }).catch(() => void 0);
 		deployment = await ossFetch(context, `/api/deployments/${encodeURIComponent(deploymentId)}`, deps);
 		const status = deployment.status.toUpperCase();
+		if (verbose || status !== lastStatus) {
+			consola.info(`Deployment status: ${status} (${formatDuration(Date.now() - startTime)} elapsed)`);
+			lastStatus = status;
+		}
 		if (status === "READY") break;
 		if (status === "ERROR" || status === "CANCELED") throw new Error(getDeploymentError(deployment.metadata) ?? `Deployment failed with status: ${deployment.status}`);
 		if (pollIntervalMs === 0) break;
@@ -2372,8 +2740,13 @@ async function pollDeployment(context, deploymentId, deps) {
 }
 async function deploySiteProject(options) {
 	options.deps.onEvent?.("scan");
+	const scanStart = Date.now();
+	consola.start("Scanning deploy files");
 	const localFiles = await (options.deps.collectDeploymentFiles ?? collectDeploymentFiles)(options.sourceDir);
 	if (localFiles.length === 0) throw new Error("No deployable files found in the source directory.");
+	consola.success(`Scanned ${localFiles.length} files (${formatBytes$1(deploymentFileSize(localFiles))}) in ${formatDuration(Date.now() - scanStart)}`);
+	const createStart = Date.now();
+	consola.start("Creating Forgeway deployment");
 	const createResult = await ossFetch(options.context, `/api/deployments/sites/${encodeURIComponent(options.siteId)}/deploy`, options.deps, {
 		method: "POST",
 		body: JSON.stringify({
@@ -2385,15 +2758,25 @@ async function deploySiteProject(options) {
 			}))
 		})
 	});
+	if (options.verbose) consola.info(`Deployment manifest accepted in ${formatDuration(Date.now() - createStart)}`);
 	const localFileByPath = new Map(localFiles.map((file) => [file.path, file]));
-	await runWithConcurrency(createResult.files.filter((file) => !file.uploadedAt), DIRECT_UPLOAD_CONCURRENCY, async (manifestFile) => {
+	const pendingFiles = createResult.files.filter((file) => !file.uploadedAt);
+	const pendingSize = pendingFiles.reduce((total, file) => total + file.size, 0);
+	if (pendingFiles.length === 0) consola.success("No file uploads needed");
+	else consola.start(`Uploading ${pendingFiles.length} changed files (${formatBytes$1(pendingSize)})`);
+	let uploadedCount = 0;
+	await runWithConcurrency(pendingFiles, DIRECT_UPLOAD_CONCURRENCY, async (manifestFile) => {
 		const localFile = localFileByPath.get(manifestFile.path);
 		if (!localFile) throw new Error(`Forgeway returned an unknown file path: ${manifestFile.path}`);
 		if (localFile.sha !== manifestFile.sha || localFile.size !== manifestFile.size) throw new Error(`Forgeway file metadata mismatch for: ${manifestFile.path}`);
 		await uploadDirectDeploymentFile(options.context, createResult.id, manifestFile, localFile, options.deps);
+		uploadedCount += 1;
+		if (options.verbose || uploadedCount === pendingFiles.length || uploadedCount % 10 === 0) consola.info(`Uploaded ${uploadedCount}/${pendingFiles.length} files`);
 	});
+	consola.start("Starting Forgeway deployment");
 	await startDirectDeployment(options.context, createResult.id, options.startBody, options.deps);
-	const result = await pollDeployment(options.context, createResult.id, options.deps);
+	consola.start("Waiting for Forgeway deployment");
+	const result = await pollDeployment(options.context, createResult.id, options.deps, options.verbose);
 	return {
 		deploymentId: createResult.id,
 		...result,
@@ -2423,23 +2806,33 @@ async function deployForgeway(cwd, options, deps = {}) {
 	const sourceDir = resolve(cwd);
 	if (!(await stat(sourceDir).catch(() => null))?.isDirectory()) throw new Error(`"${sourceDir}" is not a valid directory.`);
 	if (EXCLUDE_PATTERNS.includes(basename(sourceDir))) throw new Error(`"${basename(sourceDir)}" is an excluded directory and cannot be deployed.`);
-	const seedPath = await resolveSeedPath$1(cwd, options.seed);
+	const verbose = isVerboseDeploy(options);
+	const seedPath = options.skipSeed ? null : await resolveSeedPath$1(cwd, options.seed);
+	if (options.skipSeed) consola.info("Skipping seed initialization by request");
 	const { context, restaurant } = await resolveProjectContext(cwd, options, deps);
+	await ensureRestaurantClaim(context, restaurant, deps);
 	const { site } = await resolveDeploymentSite(cwd, context, options, seedPath, deps, restaurant);
 	const database = parseDatabaseMode(options.database);
 	if (database !== "none") {
 		consola.start("Initializing Forgeway managed database");
 		try {
 			deps.onEvent?.("initialize");
-			await initializeSiteDatabaseBeforeDeploy({
+			const initialization = await initializeSiteDatabaseBeforeDeploy({
 				context,
 				siteId: site.id,
 				database,
 				cwd,
 				seedPath,
+				force: options.forceDbInit === true,
+				verbose,
 				deps
 			});
-			consola.success("Database initialized");
+			if (initialization.status === "skipped") consola.success("Database already initialized for current schema and seed (local metadata)");
+			else {
+				const applied = initialization.result?.migrations.applied.length ?? 0;
+				const seedSummary = formatSeedSummary(initialization.result?.seed);
+				consola.success(`Database initialized: ${applied} migrations applied, ${seedSummary}`);
+			}
 		} catch (error) {
 			consola.error("Database initialization failed");
 			throw error;
@@ -2451,7 +2844,8 @@ async function deployForgeway(cwd, options, deps = {}) {
 		siteId: site.id,
 		sourceDir,
 		startBody: {},
-		deps
+		deps,
+		verbose
 	});
 	const url = deployment.liveUrl ?? `https://${site.domain}`;
 	await (deps.writeProjectEnv ?? persistForgewayCliEnv)(cwd, {
@@ -2994,6 +3388,11 @@ const deployCommand = defineCommand({
 			description: "Forgeway deployment site ID or slug",
 			required: false
 		},
+		"place-id": {
+			type: "string",
+			description: "Restaurant Google place ID for Forgeway claim and site recovery",
+			required: false
+		},
 		email: {
 			type: "string",
 			description: "Dineway account email for deploy authorization",
@@ -3018,6 +3417,21 @@ const deployCommand = defineCommand({
 			type: "string",
 			description: "Seed file path for Forgeway Dineway initialization",
 			required: false
+		},
+		"skip-seed": {
+			type: "boolean",
+			description: "Skip applying seed data during Forgeway database initialization",
+			default: false
+		},
+		"force-db-init": {
+			type: "boolean",
+			description: "Force Forgeway database migrations and seed even when initialization fingerprints match",
+			default: false
+		},
+		verbose: {
+			type: "boolean",
+			description: "Show detailed Forgeway deploy progress and timing logs",
+			default: false
 		}
 	},
 	async run({ args }) {
@@ -3029,11 +3443,15 @@ const deployCommand = defineCommand({
 			yes: args.yes,
 			dryRun: args["dry-run"],
 			site: args.site,
+			placeId: args["place-id"],
 			email: args.email,
 			restaurantName: args["restaurant-name"],
 			city: args.city,
 			database: args.database,
-			seed: args.seed
+			seed: args.seed,
+			skipSeed: args["skip-seed"],
+			forceDbInit: args["force-db-init"],
+			verbose: args.verbose
 		};
 		consola.start(`Preparing ${target.label} deploy`);
 		await ensureTargetCli(target, cwd, {