@hyav/pi-provider 0.1.7 → 0.2.0

package/providers/charm-hyper.ts

@@ -1,5 +1,5 @@
 import type {
-	ModelCatalogStatus,
+	ModelCatalogDiscoveryResult,
 	ProviderAdapter,
 	ProviderModel,
 	ProviderModelDraft,
@@ -7,11 +7,13 @@ import type {
 	ThinkingLevel,
 } from "@hyav/pi-provider";
 import {
+	createModelCatalogLifecycle,
 	defineProviderExtension,
+	isLegacyNormalizedSnapshot,
 	isProviderDataError,
 	MAX_PROVIDER_MODEL_COUNT,
-	normalizeProviderModels,
 	ProviderDataError,
+	validateProviderModelDrafts,
 	withDeadline,
 } from "@hyav/pi-provider";
 import { HYPER_BASE_URL, HYPER_USER_AGENT, hyperJsonHeaders } from "./charm-hyper/constants.ts";
@@ -21,17 +23,6 @@ export { HYPER_BASE_URL, HYPER_USER_AGENT } from "./charm-hyper/constants.ts";
 export const HYPER_PROVIDER_URL = "https://hyper.charm.land/v1/provider";
 export const HYPER_MODELS_URL = "https://hyper.charm.land/v1/models";
 export const HYPER_MODEL_CATALOG_TTL_MS = 4 * 60 * 60 * 1_000;
-const zeroCost = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
-
-const officialCostFallbacks: Partial<Record<string, ProviderModel["cost"]>> = {
-	"deepseek-v4-flash": { input: 0.14, output: 0.28, cacheRead: 0.0028, cacheWrite: 0 },
-	"deepseek-v4-pro": { input: 0.435, output: 0.87, cacheRead: 0.003625, cacheWrite: 0 },
-	"glm-5": { input: 1, output: 3.2, cacheRead: 0, cacheWrite: 0 },
-	"glm-5.1": { input: 1.4, output: 4.4, cacheRead: 0.26, cacheWrite: 0 },
-	"kimi-k2.5": { input: 0.6, output: 3, cacheRead: 0.1, cacheWrite: 0 },
-	"kimi-k2.6": { input: 0.95, output: 4, cacheRead: 0.16, cacheWrite: 0 },
-	"mistral-large-instruct-2411": { input: 2, output: 6, cacheRead: 0.2, cacheWrite: 0 },
-};
 
 const thinkingLevels = new Set<ThinkingLevel>(["off", "minimal", "low", "medium", "high", "xhigh", "max"]);
 const baseHyperCompat: NonNullable<ProviderModel["compat"]> = {
@@ -50,21 +41,6 @@ const onOffThinkingLevelMap: NonNullable<ProviderModel["thinkingLevelMap"]> = {
 	max: "max",
 };
 
-const modelOverrides: Record<string, Partial<ProviderModelDraft>> = {
-	"qwen3-coder-480b-a35b-instruct-int4-mixed-ar": { reasoning: false },
-	"qwen3-next-80b-a3b-instruct": { reasoning: false },
-	"gpt-oss-120b": {
-		thinkingLevelMap: {
-			minimal: null,
-			low: "low",
-			medium: "medium",
-			high: "high",
-			xhigh: "high",
-		},
-		compat: { supportsReasoningEffort: true },
-	},
-};
-
 function isRecord(value: unknown): value is Record<string, unknown> {
 	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -77,63 +53,6 @@ function isFiniteNonNegative(value: unknown): value is number {
 	return typeof value === "number" && Number.isFinite(value) && value >= 0;
 }
 
-function costFallbackFor(id: string): ProviderModel["cost"] {
-	return { ...(officialCostFallbacks[id] ?? zeroCost) };
-}
-
-function fallbackModel(
-	id: string,
-	name: string,
-	contextWindow: number,
-	overrides: Partial<ProviderModelDraft> = {},
-): ProviderModelDraft {
-	const { compat: overrideCompat, ...rest } = overrides;
-	return {
-		id,
-		name,
-		reasoning: true,
-		input: ["text", "image"],
-		contextWindow,
-		maxTokens: Math.floor(contextWindow / 10),
-		cost: costFallbackFor(id),
-		pricingSource: "fallback",
-		headers: { ...hyperModelHeaders },
-		compat: { ...baseHyperCompat, ...overrideCompat },
-		...rest,
-	};
-}
-
-export function getHyperFallbackModels(): ProviderModelDraft[] {
-	return [
-		fallbackModel("deepseek-v4-flash", "DeepSeek V4 Flash", 1_048_576),
-		fallbackModel("deepseek-v4-pro", "DeepSeek V4 Pro", 1_048_576),
-		fallbackModel("gemma-4-26b-a4b-it", "Gemma 4 26B A4B", 32_768, { input: ["text"] }),
-		fallbackModel("glm-5", "GLM-5", 202_752),
-		fallbackModel("glm-5.1", "GLM-5.1", 202_752),
-		fallbackModel("gpt-oss-120b", "GPT-OSS-120B", 131_072, {
-			input: ["text"],
-			thinkingLevelMap: { minimal: null, low: "low", medium: "medium", high: "high", xhigh: "high" },
-			compat: { supportsReasoningEffort: true },
-		}),
-		fallbackModel("kimi-k2.5", "Kimi K2.5", 262_144),
-		fallbackModel("kimi-k2.6", "Kimi K2.6", 32_768),
-		fallbackModel("llama-3.3-70b-instruct", "Llama 3.3 70B Instruct", 128_000, { input: ["text"] }),
-		fallbackModel("llama-4-maverick-17b-128e-instruct-fp8", "Llama 4 Maverick 17B 128E", 430_000),
-		fallbackModel("mistral-large-instruct-2411", "Mistral Large Instruct 2411", 128_000, {
-			reasoning: false,
-			input: ["text"],
-		}),
-		fallbackModel("qwen3-coder-480b-a35b-instruct-int4-mixed-ar", "Qwen3 Coder 480B INT4", 106_000, {
-			reasoning: false,
-			input: ["text"],
-		}),
-		fallbackModel("qwen3-next-80b-a3b-instruct", "Qwen3 Next 80B A3B", 262_144, {
-			reasoning: false,
-			input: ["text"],
-		}),
-	];
-}
-
 function mapHyperPricing(value: unknown): ProviderModel["cost"] | undefined {
 	if (!isRecord(value)) return undefined;
 	if (!isFiniteNonNegative(value.input) || !isFiniteNonNegative(value.output)) return undefined;
@@ -163,16 +82,6 @@ function buildThinkingLevelMap(levels: readonly string[]): NonNullable<ProviderM
 	};
 }
 
-function applyModelOverride(model: ProviderModelDraft): ProviderModelDraft {
-	const override = modelOverrides[model.id];
-	if (override === undefined) return model;
-	return {
-		...model,
-		...override,
-		...(override.compat ? { compat: { ...(model.compat ?? {}), ...override.compat } } : {}),
-	};
-}
-
 function readEffortLevels(model: Record<string, unknown>): ThinkingLevel[] {
 	const reasoning = isRecord(model.reasoning) ? model.reasoning : undefined;
 	const currentLevels = Array.isArray(reasoning?.effort_levels)
@@ -190,7 +99,8 @@ function parseCurrentHyperModel(value: unknown): ProviderModelDraft | undefined
 	if (typeof value.name !== "string" || value.name.trim() === "") return undefined;
 	if (!isFiniteNonNegative(value.cost_per_1m_in)) return undefined;
 	if (!isFiniteNonNegative(value.cost_per_1m_out)) return undefined;
-	if (!isFiniteNonNegative(value.cost_per_1m_in_cached)) return undefined;
+	// Cached prices are optional; the manifest documents 0/missing as no discount.
+	if (value.cost_per_1m_in_cached !== undefined && !isFiniteNonNegative(value.cost_per_1m_in_cached)) return undefined;
 	if (value.cost_per_1m_out_cached !== undefined && !isFiniteNonNegative(value.cost_per_1m_out_cached))
 		return undefined;
 	if (!isPositiveInteger(value.context_window) || !isPositiveInteger(value.default_max_tokens)) return undefined;
@@ -229,8 +139,10 @@ function parseCurrentHyperModel(value: unknown): ProviderModelDraft | undefined
 		cost: {
 			input: value.cost_per_1m_in,
 			output: value.cost_per_1m_out,
-			cacheRead: value.cost_per_1m_in_cached,
-			cacheWrite: 0,
+			// Official Charm mapping: the cached-output price is the cache-read
+			// price and the cached-input price is the cache-write price.
+			cacheRead: value.cost_per_1m_out_cached ?? 0,
+			cacheWrite: value.cost_per_1m_in_cached ?? 0,
 		},
 		contextWindow: value.context_window,
 		maxTokens: value.default_max_tokens,
@@ -238,41 +150,81 @@ function parseCurrentHyperModel(value: unknown): ProviderModelDraft | undefined
 		compat: { ...baseHyperCompat, supportsReasoningEffort: reportedReasoningLevels.length > 0 },
 		...(thinkingLevelMap ? { thinkingLevelMap } : {}),
 	};
-	return applyModelOverride(mapped);
+	return mapped;
+}
+
+interface ParsedHyperCatalog {
+	models: ProviderModelDraft[];
+	diagnostics: {
+		rejectedCount: number;
+		duplicateCount: number;
+	};
 }
 
-function parseCurrentHyperModels(payload: Record<string, unknown>): ProviderModelDraft[] | undefined {
+function parseCurrentHyperModels(payload: Record<string, unknown>): ParsedHyperCatalog | undefined {
 	if (!Array.isArray(payload.models)) return undefined;
-	if (payload.models.length > MAX_PROVIDER_MODEL_COUNT) return [];
+	if (payload.models.length > MAX_PROVIDER_MODEL_COUNT) {
+		return { models: [], diagnostics: { rejectedCount: payload.models.length, duplicateCount: 0 } };
+	}
 	const models: ProviderModelDraft[] = [];
 	const seenIds = new Set<string>();
+	let rejectedCount = 0;
+	let duplicateCount = 0;
 	for (const value of payload.models) {
 		const model = parseCurrentHyperModel(value);
-		if (model === undefined) return [];
+		if (model === undefined) {
+			rejectedCount++;
+			continue;
+		}
 		const normalizedId = model.id.toLowerCase();
-		if (seenIds.has(normalizedId)) continue;
+		if (seenIds.has(normalizedId)) {
+			duplicateCount++;
+			continue;
+		}
 		seenIds.add(normalizedId);
 		models.push(model);
 	}
-	return models;
+	return { models, diagnostics: { rejectedCount, duplicateCount } };
 }
 
-function parseLegacyHyperModels(payload: Record<string, unknown>): ProviderModelDraft[] {
-	if (!Array.isArray(payload.data) || payload.data.length > MAX_PROVIDER_MODEL_COUNT) return [];
+function parseLegacyHyperModels(payload: Record<string, unknown>): ParsedHyperCatalog {
+	if (!Array.isArray(payload.data)) {
+		return { models: [], diagnostics: { rejectedCount: 0, duplicateCount: 0 } };
+	}
+	if (payload.data.length > MAX_PROVIDER_MODEL_COUNT) {
+		return { models: [], diagnostics: { rejectedCount: payload.data.length, duplicateCount: 0 } };
+	}
 	const models: ProviderModelDraft[] = [];
 	const seenIds = new Set<string>();
+	let rejectedCount = 0;
+	let duplicateCount = 0;
 
 	for (const value of payload.data) {
-		if (!isRecord(value) || typeof value.id !== "string" || value.id.trim() === "") continue;
+		if (!isRecord(value) || typeof value.id !== "string" || value.id.trim() === "") {
+			rejectedCount++;
+			continue;
+		}
 		const id = value.id.trim();
 		const normalizedId = id.toLowerCase();
-		if (seenIds.has(normalizedId)) continue;
-		if (value.context_window !== undefined && !isPositiveInteger(value.context_window)) continue;
-		if (value.max_output_tokens !== undefined && !isPositiveInteger(value.max_output_tokens)) continue;
+		if (value.context_window !== undefined && !isPositiveInteger(value.context_window)) {
+			rejectedCount++;
+			continue;
+		}
+		if (value.max_output_tokens !== undefined && !isPositiveInteger(value.max_output_tokens)) {
+			rejectedCount++;
+			continue;
+		}
 
 		const contextWindow = isPositiveInteger(value.context_window) ? value.context_window : undefined;
 		const maxTokens = isPositiveInteger(value.max_output_tokens) ? value.max_output_tokens : undefined;
-		if (contextWindow !== undefined && maxTokens !== undefined && maxTokens > contextWindow) continue;
+		if (contextWindow !== undefined && maxTokens !== undefined && maxTokens > contextWindow) {
+			rejectedCount++;
+			continue;
+		}
+		if (seenIds.has(normalizedId)) {
+			duplicateCount++;
+			continue;
+		}
 		const reasoning = isRecord(value.reasoning) ? value.reasoning : undefined;
 		const capabilities = isRecord(value.capabilities) ? value.capabilities : undefined;
 		const reasoningEffortLevels = readEffortLevels(value);
@@ -310,27 +262,29 @@ function parseLegacyHyperModels(payload: Record<string, unknown>): ProviderModel
 			headers: { ...hyperModelHeaders },
 			...(contextWindow !== undefined ? { contextWindow } : {}),
 			...(maxTokens !== undefined ? { maxTokens } : {}),
-			cost: cost ?? costFallbackFor(id),
-			pricingSource: cost ? "provider" : "fallback",
+			...(cost ? { cost, pricingSource: "provider" as const } : {}),
 			compat: { ...baseHyperCompat, supportsReasoningEffort },
 		};
-		models.push(applyModelOverride(mapped));
+		models.push(mapped);
 		seenIds.add(normalizedId);
 	}
-	return models;
+	return { models, diagnostics: { rejectedCount, duplicateCount } };
+}
+
+function parseHyperCatalog(payload: unknown): ParsedHyperCatalog {
+	if (!isRecord(payload)) return { models: [], diagnostics: { rejectedCount: 0, duplicateCount: 0 } };
+	return parseCurrentHyperModels(payload) ?? parseLegacyHyperModels(payload);
 }
 
 export function parseHyperModels(payload: unknown): ProviderModelDraft[] {
-	if (!isRecord(payload)) return [];
-	const currentModels = parseCurrentHyperModels(payload);
-	return currentModels ?? parseLegacyHyperModels(payload);
+	return parseHyperCatalog(payload).models;
 }
 
 async function discoverHyperModels(
 	fetchFn: typeof globalThis.fetch,
 	timeoutMs: number,
 	externalSignal?: AbortSignal,
-): Promise<ProviderModelDraft[]> {
+): Promise<ModelCatalogDiscoveryResult> {
 	return withDeadline(
 		async (signal) => {
 			let endpoint = HYPER_PROVIDER_URL;
@@ -354,12 +308,12 @@ async function discoverHyperModels(
 					"badjson",
 				);
 			}
-			const models = parseHyperModels(payload);
-			if (models.length === 0) {
+			const parsed = parseHyperCatalog(payload);
+			if (parsed.models.length === 0) {
 				throw new ProviderDataError("Charm Hyper model discovery returned no valid models", "badjson");
 			}
-			normalizeProviderModels(models);
-			return models;
+			validateProviderModelDrafts(parsed.models);
+			return parsed;
 		},
 		timeoutMs,
 		externalSignal,
@@ -380,19 +334,18 @@ function catalogErrorCode(error: unknown): string {
 }
 
 type HyperModelsStoreEntry = ProviderRefreshContext["stored"];
-type HyperStoredModel = NonNullable<HyperModelsStoreEntry>["models"][number] & {
-	pricingSource?: ProviderModelDraft["pricingSource"];
+type HyperStoredModel = ProviderModelDraft & {
+	provider: string;
+	baseUrl: string;
+	api: ProviderModelDraft["api"];
 };
 
-function isValidTimestamp(value: unknown): value is number {
-	return typeof value === "number" && Number.isFinite(value) && value >= 0;
-}
-
 function draftsFromStoredModels(entry: HyperModelsStoreEntry): ProviderModelDraft[] | undefined {
 	if (!entry || !Array.isArray(entry.models) || entry.models.length === 0) return undefined;
+	if (isLegacyNormalizedSnapshot(entry.models)) return undefined;
 	try {
 		const drafts: ProviderModelDraft[] = entry.models.map(({ provider: _provider, ...model }) => model);
-		normalizeProviderModels(drafts);
+		validateProviderModelDrafts(drafts);
 		return drafts;
 	} catch {
 		return undefined;
@@ -400,10 +353,12 @@ function draftsFromStoredModels(entry: HyperModelsStoreEntry): ProviderModelDraf
 }
 
 function storedModelsFromDrafts(models: ProviderModelDraft[]): HyperStoredModel[] {
-	return normalizeProviderModels(models).map((model) => {
-		const source = models.find(({ id }) => id === model.id)?.pricingSource;
+	validateProviderModelDrafts(models);
+	return models.map((model) => {
+		const source = model.pricingSource;
 		return {
 			...model,
+			name: typeof model.name === "string" && model.name.trim() !== "" ? model.name.trim() : model.id,
 			...(source ? { pricingSource: source } : {}),
 			api: model.api ?? "openai-completions",
 			provider: "charm-hyper",
@@ -412,113 +367,28 @@ function storedModelsFromDrafts(models: ProviderModelDraft[]): HyperStoredModel[
 	});
 }
 
-async function publishCatalog(
-	context: ProviderRefreshContext,
-	models: ProviderModelDraft[],
-	checkedAt: number,
-	update: () => void,
-): Promise<boolean> {
-	try {
-		return await context.publish({ persist: { models: storedModelsFromDrafts(models), checkedAt }, update });
-	} catch {
-		// Persistence is an optimization. Retry the generation-checked in-memory update without it.
-		try {
-			return await context.publish({ update });
-		} catch {
-			return false;
-		}
-	}
-}
-
 export function createCharmHyperAdapter(
 	fetchFn: typeof globalThis.fetch,
 	discoveryTimeoutMs: number,
 	now: () => number = Date.now,
+	initialModels?: ProviderModelDraft[],
 ): ProviderAdapter {
-	let models = getHyperFallbackModels();
-	let lastRefreshAt: number | undefined;
-	let lastCatalogUpdatedAt: number | undefined;
-	let inFlightRefresh: { signal: AbortSignal; request: Promise<ProviderModelDraft[]> } | undefined;
-	const catalog: ModelCatalogStatus = { source: "fallback", modelCount: models.length };
 	let provider: ProviderAdapter["provider"];
-
-	const publishModels = (
-		nextModels: ProviderModelDraft[],
-		source: ModelCatalogStatus["source"],
-		updatedAt?: number,
-	) => {
-		models = nextModels;
-		provider.models = models;
-		catalog.source = source;
-		catalog.modelCount = models.length;
-		catalog.lastError = undefined;
-		if (updatedAt !== undefined) {
-			catalog.updatedAt = updatedAt;
-			lastCatalogUpdatedAt = updatedAt;
-		}
-	};
-
-	const restoreStoredModels = async (context: ProviderRefreshContext, entry: HyperModelsStoreEntry): Promise<void> => {
-		const restoredModels = draftsFromStoredModels(entry);
-		if (!restoredModels) return;
-		const checkedAt = isValidTimestamp(entry?.checkedAt) ? entry.checkedAt : undefined;
-		if (lastCatalogUpdatedAt !== undefined && checkedAt !== undefined && checkedAt <= lastCatalogUpdatedAt) return;
-		if (lastCatalogUpdatedAt !== undefined && checkedAt === undefined) return;
-		try {
-			await context.publish({
-				update: () => {
-					publishModels(restoredModels, "live", checkedAt);
-					if (checkedAt !== undefined) lastRefreshAt = checkedAt;
-				},
-			});
-		} catch {
-			// A stale or cancelled refresh must not replace the current in-memory catalog.
-		}
-	};
-
-	const isFresh = (timestamp: number | undefined, currentTime: number): boolean =>
-		timestamp !== undefined && Math.max(0, currentTime - timestamp) <= HYPER_MODEL_CATALOG_TTL_MS;
-
-	const refreshModels = async (context: ProviderRefreshContext): Promise<ProviderModelDraft[]> => {
-		await restoreStoredModels(context, context.stored);
-		if (context?.allowNetwork !== true || context.signal?.aborted) return [...models];
-
-		const currentTime = now();
-		if (!context.force && isFresh(lastRefreshAt, currentTime)) return [...models];
-		if (inFlightRefresh?.signal === context.signal) return inFlightRefresh.request;
-
-		const request = (async (): Promise<ProviderModelDraft[]> => {
-			try {
-				const refreshedModels = await discoverHyperModels(fetchFn, discoveryTimeoutMs, context.signal);
-				if (context.signal?.aborted) {
-					throw context.signal.reason ?? new DOMException("The operation was aborted", "AbortError");
-				}
-				const updatedAt = now();
-				await publishCatalog(context, refreshedModels, updatedAt, () => {
-					publishModels(refreshedModels, "live", updatedAt);
-					lastRefreshAt = updatedAt;
-				});
-				return [...models];
-			} catch (error) {
-				if (!context.signal.aborted && !isAbortError(error)) {
-					lastRefreshAt = now();
-					catalog.lastError = catalogErrorCode(error);
-				}
-				throw error;
-			}
-		})();
-		const activeRefresh = { signal: context.signal, request };
-		inFlightRefresh = activeRefresh;
-		void request.then(
-			() => {
-				if (inFlightRefresh === activeRefresh) inFlightRefresh = undefined;
-			},
-			() => {
-				if (inFlightRefresh === activeRefresh) inFlightRefresh = undefined;
-			},
-		);
-		return request;
-	};
+	const lifecycle = createModelCatalogLifecycle({
+		initialModels,
+		ttlMs: HYPER_MODEL_CATALOG_TTL_MS,
+		now,
+		discover: (context) => discoverHyperModels(fetchFn, discoveryTimeoutMs, context.signal),
+		restore: draftsFromStoredModels,
+		persist: (models, checkedAt) => ({
+			models: storedModelsFromDrafts(models) as unknown as NonNullable<HyperModelsStoreEntry>["models"],
+			checkedAt,
+		}),
+		onUpdate: (models) => {
+			if (provider) provider.models = models;
+		},
+		errorCode: catalogErrorCode,
+	});
 
 	provider = {
 		name: "Charm Hyper",
@@ -526,12 +396,12 @@ export function createCharmHyperAdapter(
 		apiKey: "$HYPER_API_KEY",
 		authHeader: true,
 		api: "openai-completions",
-		models,
-		refreshModels,
+		models: lifecycle.getModels(),
+		refreshModels: lifecycle.refreshModels,
 		oauth: createCharmHyperOAuth(fetchFn, now),
 	};
 
-	return { id: "charm-hyper", catalog, provider };
+	return { id: "charm-hyper", catalog: lifecycle.catalog, lifecycle, provider };
 }
 
 const charmHyperProviderExtension = defineProviderExtension({

package/status/huggingface.ts

@@ -31,10 +31,11 @@ export function parseHuggingFaceAccount(payload: unknown): HuggingFaceAccount {
 	}
 	// Response envelope: { type, id, name, emailVerified, canPay, isPro, plan, periodEnd, credits, ... }
 	const plan = safeText(payload.plan);
+	const credits = finiteNumber(payload.credits);
 	// Older token generations omit the envelope fields entirely.
 	return {
 		...(plan !== undefined ? { plan } : {}),
-		...(finiteNumber(payload.credits) !== undefined ? { credits: finiteNumber(payload.credits) } : {}),
+		...(credits !== undefined ? { credits } : {}),
 	};
 }
 

package/status/openrouter.ts

@@ -149,8 +149,14 @@ export const openRouterStatusAdapter: StatusAdapter = {
 				unit: "USD",
 			};
 		} catch (error) {
-			// Safe fallback: key credits, free-tier, and key-level limit still display.
-			if (!(error instanceof ProviderDataError)) throw error;
+			// /credits requires a management key, so permission-shaped failures
+			// degrade to the key payload; real failures must still surface.
+			if (
+				!(error instanceof ProviderDataError) ||
+				(error.httpStatus !== 401 && error.httpStatus !== 403 && error.httpStatus !== 404)
+			) {
+				throw error;
+			}
 		}
 
 		return {

package/status/vercel-ai-gateway.ts

@@ -59,7 +59,7 @@ export function createVercelAIGatewayStatusAdapter(requestTimeoutMs: number): St
 			if (!response.ok) {
 				throw new ProviderDataError(
 					`Vercel AI Gateway status failed: HTTP ${response.status}`,
-					response.status === 401 ? "auth" : `http${response.status}`,
+					response.status === 401 || response.status === 403 ? "auth" : `http${response.status}`,
 					parseRetryAfter(response.headers.get("retry-after"), context.now()),
 					response.status,
 				);