@character-foundry/character-foundry 0.4.3-dev.1766103111 → 0.4.3

package/dist/loader.d.cts

@@ -13,8 +13,8 @@ export type BinaryData = Uint8Array;
 declare const CCv3CharacterBookSchema: z.ZodObject<{
 	name: z.ZodOptional<z.ZodString>;
 	description: z.ZodOptional<z.ZodString>;
-	scan_depth: z.ZodEffects<z.ZodOptional<z.ZodNumber>, number | undefined, unknown>;
-	token_budget: z.ZodEffects<z.ZodOptional<z.ZodNumber>, number | undefined, unknown>;
+	scan_depth: z.ZodOptional<z.ZodNumber>;
+	token_budget: z.ZodOptional<z.ZodNumber>;
 	recursive_scanning: z.ZodOptional<z.ZodBoolean>;
 	extensions: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
 	entries: z.ZodArray<z.ZodObject<{
@@ -250,8 +250,8 @@ declare const CCv3CharacterBookSchema: z.ZodObject<{
 	}, z.ZodTypeAny, "passthrough">[];
 	name?: string | undefined;
 	description?: string | undefined;
-	scan_depth?: unknown;
-	token_budget?: unknown;
+	scan_depth?: number | undefined;
+	token_budget?: number | undefined;
 	recursive_scanning?: boolean | undefined;
 	extensions?: Record<string, unknown> | undefined;
 }>;
@@ -276,8 +276,8 @@ declare const CCv3DataSchema: z.ZodObject<{
 		character_book: z.ZodNullable<z.ZodOptional<z.ZodObject<{
 			name: z.ZodOptional<z.ZodString>;
 			description: z.ZodOptional<z.ZodString>;
-			scan_depth: z.ZodEffects<z.ZodOptional<z.ZodNumber>, number | undefined, unknown>;
-			token_budget: z.ZodEffects<z.ZodOptional<z.ZodNumber>, number | undefined, unknown>;
+			scan_depth: z.ZodOptional<z.ZodNumber>;
+			token_budget: z.ZodOptional<z.ZodNumber>;
 			recursive_scanning: z.ZodOptional<z.ZodBoolean>;
 			extensions: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
 			entries: z.ZodArray<z.ZodObject<{
@@ -513,14 +513,14 @@ declare const CCv3DataSchema: z.ZodObject<{
 			}, z.ZodTypeAny, "passthrough">[];
 			name?: string | undefined;
 			description?: string | undefined;
-			scan_depth?: unknown;
-			token_budget?: unknown;
+			scan_depth?: number | undefined;
+			token_budget?: number | undefined;
 			recursive_scanning?: boolean | undefined;
 			extensions?: Record<string, unknown> | undefined;
 		}>>>;
 		extensions: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
 		assets: z.ZodOptional<z.ZodArray<z.ZodObject<{
-			type: z.ZodEffects<z.ZodEnum<[
+			type: z.ZodEnum<[
 				"icon",
 				"background",
 				"emotion",
@@ -529,7 +529,7 @@ declare const CCv3DataSchema: z.ZodObject<{
 				"video",
 				"custom",
 				"x-risu-asset"
-			]>, "custom" | "icon" | "background" | "emotion" | "user_icon" | "sound" | "video" | "x-risu-asset", unknown>;
+			]>;
 			uri: z.ZodString;
 			name: z.ZodString;
 			ext: z.ZodString;
@@ -540,15 +540,15 @@ declare const CCv3DataSchema: z.ZodObject<{
 			ext: string;
 		}, {
 			name: string;
+			type: "custom" | "icon" | "background" | "emotion" | "user_icon" | "sound" | "video" | "x-risu-asset";
 			uri: string;
 			ext: string;
-			type?: unknown;
 		}>, "many">>;
 		nickname: z.ZodOptional<z.ZodString>;
 		creator_notes_multilingual: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
 		source: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-		creation_date: z.ZodEffects<z.ZodOptional<z.ZodNumber>, number | undefined, unknown>;
-		modification_date: z.ZodEffects<z.ZodOptional<z.ZodNumber>, number | undefined, unknown>;
+		creation_date: z.ZodOptional<z.ZodNumber>;
+		modification_date: z.ZodOptional<z.ZodNumber>;
 	}, "strip", z.ZodTypeAny, {
 		name: string;
 		description: string;
@@ -689,8 +689,8 @@ declare const CCv3DataSchema: z.ZodObject<{
 			}, z.ZodTypeAny, "passthrough">[];
 			name?: string | undefined;
 			description?: string | undefined;
-			scan_depth?: unknown;
-			token_budget?: unknown;
+			scan_depth?: number | undefined;
+			token_budget?: number | undefined;
 			recursive_scanning?: boolean | undefined;
 			extensions?: Record<string, unknown> | undefined;
 		} | null | undefined;
@@ -700,15 +700,15 @@ declare const CCv3DataSchema: z.ZodObject<{
 		group_only_greetings?: string[] | undefined;
 		assets?: {
 			name: string;
+			type: "custom" | "icon" | "background" | "emotion" | "user_icon" | "sound" | "video" | "x-risu-asset";
 			uri: string;
 			ext: string;
-			type?: unknown;
 		}[] | undefined;
 		nickname?: string | undefined;
 		creator_notes_multilingual?: Record<string, string> | undefined;
 		source?: string[] | undefined;
-		creation_date?: unknown;
-		modification_date?: unknown;
+		creation_date?: number | undefined;
+		modification_date?: number | undefined;
 	}>;
 }, "strip", z.ZodTypeAny, {
 	data: {
@@ -855,8 +855,8 @@ declare const CCv3DataSchema: z.ZodObject<{
 			}, z.ZodTypeAny, "passthrough">[];
 			name?: string | undefined;
 			description?: string | undefined;
-			scan_depth?: unknown;
-			token_budget?: unknown;
+			scan_depth?: number | undefined;
+			token_budget?: number | undefined;
 			recursive_scanning?: boolean | undefined;
 			extensions?: Record<string, unknown> | undefined;
 		} | null | undefined;
@@ -866,15 +866,15 @@ declare const CCv3DataSchema: z.ZodObject<{
 		group_only_greetings?: string[] | undefined;
 		assets?: {
 			name: string;
+			type: "custom" | "icon" | "background" | "emotion" | "user_icon" | "sound" | "video" | "x-risu-asset";
 			uri: string;
 			ext: string;
-			type?: unknown;
 		}[] | undefined;
 		nickname?: string | undefined;
 		creator_notes_multilingual?: Record<string, string> | undefined;
 		source?: string[] | undefined;
-		creation_date?: unknown;
-		modification_date?: unknown;
+		creation_date?: number | undefined;
+		modification_date?: number | undefined;
 	};
 	spec: "chara_card_v3";
 	spec_version: "3.0";
@@ -1194,13 +1194,6 @@ export interface AuthoritativeMetadata {
 	tokens: TokenCounts;
 	/** Content hash computed server-side */
 	contentHash: string;
-	/**
-	 * Content hash v2 computed server-side.
-	 *
-	 * @remarks
-	 * v1 is preserved for backwards compatibility. Prefer v2 for new storage/deduplication.
-	 */
-	contentHashV2?: string;
 	/** Whether the card has a lorebook */
 	hasLorebook: boolean;
 	/** Number of lorebook entries */
@@ -1300,13 +1293,6 @@ export declare function validateClientMetadata(clientMetadata: ClientMetadata, p
  * @returns SHA-256 hash of canonical content
  */
 export declare function computeContentHash(card: CCv3Data): Promise<string>;
-/**
- * Compute content hash v2 for a card (standalone utility)
- *
- * @param card - CCv3 card data
- * @returns SHA-256 hash of canonical content v2
- */
-export declare function computeContentHashV2(card: CCv3Data): Promise<string>;
 /**
  * Options for synchronous metadata validation
  */

package/dist/loader.d.ts

@@ -13,8 +13,8 @@ export type BinaryData = Uint8Array;
 declare const CCv3CharacterBookSchema: z.ZodObject<{
 	name: z.ZodOptional<z.ZodString>;
 	description: z.ZodOptional<z.ZodString>;
-	scan_depth: z.ZodEffects<z.ZodOptional<z.ZodNumber>, number | undefined, unknown>;
-	token_budget: z.ZodEffects<z.ZodOptional<z.ZodNumber>, number | undefined, unknown>;
+	scan_depth: z.ZodOptional<z.ZodNumber>;
+	token_budget: z.ZodOptional<z.ZodNumber>;
 	recursive_scanning: z.ZodOptional<z.ZodBoolean>;
 	extensions: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
 	entries: z.ZodArray<z.ZodObject<{
@@ -250,8 +250,8 @@ declare const CCv3CharacterBookSchema: z.ZodObject<{
 	}, z.ZodTypeAny, "passthrough">[];
 	name?: string | undefined;
 	description?: string | undefined;
-	scan_depth?: unknown;
-	token_budget?: unknown;
+	scan_depth?: number | undefined;
+	token_budget?: number | undefined;
 	recursive_scanning?: boolean | undefined;
 	extensions?: Record<string, unknown> | undefined;
 }>;
@@ -276,8 +276,8 @@ declare const CCv3DataSchema: z.ZodObject<{
 		character_book: z.ZodNullable<z.ZodOptional<z.ZodObject<{
 			name: z.ZodOptional<z.ZodString>;
 			description: z.ZodOptional<z.ZodString>;
-			scan_depth: z.ZodEffects<z.ZodOptional<z.ZodNumber>, number | undefined, unknown>;
-			token_budget: z.ZodEffects<z.ZodOptional<z.ZodNumber>, number | undefined, unknown>;
+			scan_depth: z.ZodOptional<z.ZodNumber>;
+			token_budget: z.ZodOptional<z.ZodNumber>;
 			recursive_scanning: z.ZodOptional<z.ZodBoolean>;
 			extensions: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
 			entries: z.ZodArray<z.ZodObject<{
@@ -513,14 +513,14 @@ declare const CCv3DataSchema: z.ZodObject<{
 			}, z.ZodTypeAny, "passthrough">[];
 			name?: string | undefined;
 			description?: string | undefined;
-			scan_depth?: unknown;
-			token_budget?: unknown;
+			scan_depth?: number | undefined;
+			token_budget?: number | undefined;
 			recursive_scanning?: boolean | undefined;
 			extensions?: Record<string, unknown> | undefined;
 		}>>>;
 		extensions: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
 		assets: z.ZodOptional<z.ZodArray<z.ZodObject<{
-			type: z.ZodEffects<z.ZodEnum<[
+			type: z.ZodEnum<[
 				"icon",
 				"background",
 				"emotion",
@@ -529,7 +529,7 @@ declare const CCv3DataSchema: z.ZodObject<{
 				"video",
 				"custom",
 				"x-risu-asset"
-			]>, "custom" | "icon" | "background" | "emotion" | "user_icon" | "sound" | "video" | "x-risu-asset", unknown>;
+			]>;
 			uri: z.ZodString;
 			name: z.ZodString;
 			ext: z.ZodString;
@@ -540,15 +540,15 @@ declare const CCv3DataSchema: z.ZodObject<{
 			ext: string;
 		}, {
 			name: string;
+			type: "custom" | "icon" | "background" | "emotion" | "user_icon" | "sound" | "video" | "x-risu-asset";
 			uri: string;
 			ext: string;
-			type?: unknown;
 		}>, "many">>;
 		nickname: z.ZodOptional<z.ZodString>;
 		creator_notes_multilingual: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
 		source: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-		creation_date: z.ZodEffects<z.ZodOptional<z.ZodNumber>, number | undefined, unknown>;
-		modification_date: z.ZodEffects<z.ZodOptional<z.ZodNumber>, number | undefined, unknown>;
+		creation_date: z.ZodOptional<z.ZodNumber>;
+		modification_date: z.ZodOptional<z.ZodNumber>;
 	}, "strip", z.ZodTypeAny, {
 		name: string;
 		description: string;
@@ -689,8 +689,8 @@ declare const CCv3DataSchema: z.ZodObject<{
 			}, z.ZodTypeAny, "passthrough">[];
 			name?: string | undefined;
 			description?: string | undefined;
-			scan_depth?: unknown;
-			token_budget?: unknown;
+			scan_depth?: number | undefined;
+			token_budget?: number | undefined;
 			recursive_scanning?: boolean | undefined;
 			extensions?: Record<string, unknown> | undefined;
 		} | null | undefined;
@@ -700,15 +700,15 @@ declare const CCv3DataSchema: z.ZodObject<{
 		group_only_greetings?: string[] | undefined;
 		assets?: {
 			name: string;
+			type: "custom" | "icon" | "background" | "emotion" | "user_icon" | "sound" | "video" | "x-risu-asset";
 			uri: string;
 			ext: string;
-			type?: unknown;
 		}[] | undefined;
 		nickname?: string | undefined;
 		creator_notes_multilingual?: Record<string, string> | undefined;
 		source?: string[] | undefined;
-		creation_date?: unknown;
-		modification_date?: unknown;
+		creation_date?: number | undefined;
+		modification_date?: number | undefined;
 	}>;
 }, "strip", z.ZodTypeAny, {
 	data: {
@@ -855,8 +855,8 @@ declare const CCv3DataSchema: z.ZodObject<{
 			}, z.ZodTypeAny, "passthrough">[];
 			name?: string | undefined;
 			description?: string | undefined;
-			scan_depth?: unknown;
-			token_budget?: unknown;
+			scan_depth?: number | undefined;
+			token_budget?: number | undefined;
 			recursive_scanning?: boolean | undefined;
 			extensions?: Record<string, unknown> | undefined;
 		} | null | undefined;
@@ -866,15 +866,15 @@ declare const CCv3DataSchema: z.ZodObject<{
 		group_only_greetings?: string[] | undefined;
 		assets?: {
 			name: string;
+			type: "custom" | "icon" | "background" | "emotion" | "user_icon" | "sound" | "video" | "x-risu-asset";
 			uri: string;
 			ext: string;
-			type?: unknown;
 		}[] | undefined;
 		nickname?: string | undefined;
 		creator_notes_multilingual?: Record<string, string> | undefined;
 		source?: string[] | undefined;
-		creation_date?: unknown;
-		modification_date?: unknown;
+		creation_date?: number | undefined;
+		modification_date?: number | undefined;
 	};
 	spec: "chara_card_v3";
 	spec_version: "3.0";
@@ -1194,13 +1194,6 @@ export interface AuthoritativeMetadata {
 	tokens: TokenCounts;
 	/** Content hash computed server-side */
 	contentHash: string;
-	/**
-	 * Content hash v2 computed server-side.
-	 *
-	 * @remarks
-	 * v1 is preserved for backwards compatibility. Prefer v2 for new storage/deduplication.
-	 */
-	contentHashV2?: string;
 	/** Whether the card has a lorebook */
 	hasLorebook: boolean;
 	/** Number of lorebook entries */
@@ -1300,13 +1293,6 @@ export declare function validateClientMetadata(clientMetadata: ClientMetadata, p
  * @returns SHA-256 hash of canonical content
  */
 export declare function computeContentHash(card: CCv3Data): Promise<string>;
-/**
- * Compute content hash v2 for a card (standalone utility)
- *
- * @param card - CCv3 card data
- * @returns SHA-256 hash of canonical content v2
- */
-export declare function computeContentHashV2(card: CCv3Data): Promise<string>;
 /**
  * Options for synchronous metadata validation
  */

package/dist/loader.js

@@ -413,58 +413,6 @@ import { z } from "zod";
 import { z as z2 } from "zod";
 import { z as z3 } from "zod";
 import "zod";
-function preprocessTimestamp(val) {
-  if (val === null || val === void 0) return void 0;
-  let num;
-  if (typeof val === "number") {
-    num = val;
-  } else if (typeof val === "string") {
-    const trimmed = val.trim();
-    if (!trimmed) return void 0;
-    const parsed = Number(trimmed);
-    if (!isNaN(parsed)) {
-      num = parsed;
-    } else {
-      const date = new Date(trimmed);
-      if (isNaN(date.getTime())) return void 0;
-      num = Math.floor(date.getTime() / 1e3);
-    }
-  } else {
-    return void 0;
-  }
-  if (num > 1e10) {
-    num = Math.floor(num / 1e3);
-  }
-  if (num < 0) return void 0;
-  return num;
-}
-function preprocessNumeric(val) {
-  if (val === null || val === void 0) return void 0;
-  if (typeof val === "number") {
-    return isNaN(val) ? void 0 : val;
-  }
-  if (typeof val === "string") {
-    const trimmed = val.trim();
-    if (!trimmed) return void 0;
-    const parsed = Number(trimmed);
-    return isNaN(parsed) ? void 0 : parsed;
-  }
-  return void 0;
-}
-var KNOWN_ASSET_TYPES = /* @__PURE__ */ new Set([
-  "icon",
-  "background",
-  "emotion",
-  "user_icon",
-  "sound",
-  "video",
-  "custom",
-  "x-risu-asset"
-]);
-function preprocessAssetType(val) {
-  if (typeof val !== "string") return "custom";
-  return KNOWN_ASSET_TYPES.has(val) ? val : "custom";
-}
 var ISO8601Schema = z.string().datetime();
 var UUIDSchema = z.string().uuid();
 var SpecSchema = z.enum(["v2", "v3"]);
@@ -487,19 +435,16 @@ var SourceFormatSchema = z.enum([
   // VoxPkg format
 ]);
 var OriginalShapeSchema = z.enum(["wrapped", "unwrapped", "legacy"]);
-var AssetTypeSchema = z.preprocess(
-  preprocessAssetType,
-  z.enum([
-    "icon",
-    "background",
-    "emotion",
-    "user_icon",
-    "sound",
-    "video",
-    "custom",
-    "x-risu-asset"
-  ])
-);
+var AssetTypeSchema = z.enum([
+  "icon",
+  "background",
+  "emotion",
+  "user_icon",
+  "sound",
+  "video",
+  "custom",
+  "x-risu-asset"
+]);
 var AssetDescriptorSchema = z.object({
   type: AssetTypeSchema,
   uri: z.string(),
@@ -533,8 +478,8 @@ var CCv2LorebookEntrySchema = z2.object({
 var CCv2CharacterBookSchema = z2.object({
   name: z2.string().optional(),
   description: z2.string().optional(),
-  scan_depth: z2.preprocess(preprocessNumeric, z2.number().int().nonnegative().optional()),
-  token_budget: z2.preprocess(preprocessNumeric, z2.number().int().nonnegative().optional()),
+  scan_depth: z2.number().int().nonnegative().optional(),
+  token_budget: z2.number().int().nonnegative().optional(),
   recursive_scanning: z2.boolean().optional(),
   extensions: z2.record(z2.unknown()).optional(),
   entries: z2.array(CCv2LorebookEntrySchema)
@@ -608,8 +553,8 @@ var CCv3LorebookEntrySchema = z3.object({
 var CCv3CharacterBookSchema = z3.object({
   name: z3.string().optional(),
   description: z3.string().optional(),
-  scan_depth: z3.preprocess(preprocessNumeric, z3.number().int().nonnegative().optional()),
-  token_budget: z3.preprocess(preprocessNumeric, z3.number().int().nonnegative().optional()),
+  scan_depth: z3.number().int().nonnegative().optional(),
+  token_budget: z3.number().int().nonnegative().optional(),
   recursive_scanning: z3.boolean().optional(),
   extensions: z3.record(z3.unknown()).optional(),
   entries: z3.array(CCv3LorebookEntrySchema)
@@ -641,9 +586,10 @@ var CCv3DataInnerSchema = z3.object({
   nickname: z3.string().optional(),
   creator_notes_multilingual: z3.record(z3.string()).optional(),
   source: z3.array(z3.string()).optional(),
-  // Unix timestamps - preprocess to handle ISO strings, numeric strings, milliseconds
-  creation_date: z3.preprocess(preprocessTimestamp, z3.number().int().nonnegative().optional()),
-  modification_date: z3.preprocess(preprocessTimestamp, z3.number().int().nonnegative().optional())
+  creation_date: z3.number().int().nonnegative().optional(),
+  // Unix timestamp in seconds
+  modification_date: z3.number().int().nonnegative().optional()
+  // Unix timestamp in seconds
 });
 var CCv3DataSchema = z3.object({
   spec: z3.literal("chara_card_v3"),
@@ -8751,7 +8697,7 @@ function defaultTokenCounter(_card) {
     total: 0
   };
 }
-function getCanonicalContentV1(card) {
+function getCanonicalContent(card) {
   const normalized = {
     name: card.data.name,
     description: card.data.description || "",
@@ -8773,69 +8719,6 @@ function getCanonicalContentV1(card) {
   };
   return JSON.stringify(normalized, Object.keys(normalized).sort());
 }
-function stableStringify(value) {
-  if (value === null) return "null";
-  switch (typeof value) {
-    case "string":
-      return JSON.stringify(value);
-    case "number":
-      return Number.isFinite(value) ? String(value) : "null";
-    case "boolean":
-      return value ? "true" : "false";
-    case "bigint":
-      return JSON.stringify(value.toString());
-    case "undefined":
-    case "function":
-    case "symbol":
-      return "null";
-    case "object": {
-      if (Array.isArray(value)) {
-        const parts2 = value.map((item) => {
-          if (item === void 0 || typeof item === "function" || typeof item === "symbol") {
-            return "null";
-          }
-          return stableStringify(item);
-        });
-        return `[${parts2.join(",")}]`;
-      }
-      const obj = value;
-      const keys = Object.keys(obj).sort();
-      const parts = [];
-      for (const key of keys) {
-        const v = obj[key];
-        if (v === void 0 || typeof v === "function" || typeof v === "symbol") {
-          continue;
-        }
-        parts.push(`${JSON.stringify(key)}:${stableStringify(v)}`);
-      }
-      return `{${parts.join(",")}}`;
-    }
-    default:
-      return "null";
-  }
-}
-function getCanonicalContentV2(card) {
-  const normalized = {
-    name: card.data.name,
-    description: card.data.description || "",
-    personality: card.data.personality || "",
-    scenario: card.data.scenario || "",
-    first_mes: card.data.first_mes || "",
-    mes_example: card.data.mes_example || "",
-    system_prompt: card.data.system_prompt || "",
-    post_history_instructions: card.data.post_history_instructions || "",
-    alternate_greetings: card.data.alternate_greetings || [],
-    character_book: card.data.character_book ? {
-      entries: (card.data.character_book.entries || []).map((e) => ({
-        keys: e.keys,
-        content: e.content,
-        enabled: e.enabled
-      }))
-    } : null,
-    creator_notes: card.data.creator_notes || ""
-  };
-  return stableStringify(normalized);
-}
 function isWithinTolerance(clientValue, computedValue, tolerance) {
   if (clientValue === void 0) return false;
   if (computedValue === 0) return clientValue === 0;
@@ -8856,18 +8739,15 @@ async function validateClientMetadata(clientMetadata, parseResult, options = {})
   const warnings = [];
   const errors = [];
   const computedTokens = countTokens(card);
-  const canonicalContentV1 = getCanonicalContentV1(card);
-  const canonicalContentV2 = getCanonicalContentV2(card);
-  const computedHashV1 = await computeHash(canonicalContentV1);
-  const computedHashV2 = await computeHash(canonicalContentV2);
+  const canonicalContent = getCanonicalContent(card);
+  const computedHash = await computeHash(canonicalContent);
   const entries = card.data.character_book?.entries || [];
   const computedHasLorebook = entries.length > 0;
   const computedLorebookCount = entries.length;
   const authoritative = {
     name: card.data.name,
     tokens: computedTokens,
-    contentHash: computedHashV1,
-    contentHashV2: computedHashV2,
+    contentHash: computedHash,
     hasLorebook: computedHasLorebook,
     lorebookEntriesCount: computedLorebookCount
   };
@@ -8879,27 +8759,21 @@ async function validateClientMetadata(clientMetadata, parseResult, options = {})
       withinTolerance: false
     });
   }
-  const matchesV1 = clientMetadata.contentHash === computedHashV1;
-  const matchesV2 = clientMetadata.contentHash === computedHashV2;
-  if (!matchesV1 && !matchesV2) {
+  if (clientMetadata.contentHash !== computedHash) {
     const disc = {
       field: "contentHash",
       clientValue: clientMetadata.contentHash,
-      computedValue: computedHashV1,
+      computedValue: computedHash,
       withinTolerance: false
     };
     discrepancies.push(disc);
     if (allowHashMismatch) {
       warnings.push(
-        `Content hash mismatch: client=${clientMetadata.contentHash.substring(0, 8)}..., server(v1)=${computedHashV1.substring(0, 8)}..., server(v2)=${computedHashV2.substring(0, 8)}...`
+        `Content hash mismatch: client=${clientMetadata.contentHash.substring(0, 8)}..., server=${computedHash.substring(0, 8)}...`
       );
     } else {
       errors.push("Content hash mismatch - possible tampering or encoding difference");
     }
-  } else if (matchesV1 && !matchesV2) {
-    warnings.push(
-      "Client contentHash matches legacy v1 canonicalization. Prefer authoritative.contentHashV2 for new storage."
-    );
   }
   const tokenFields = [
     "description",
@@ -8980,11 +8854,7 @@ async function validateClientMetadata(clientMetadata, parseResult, options = {})
   };
 }
 async function computeContentHash(card) {
-  const content = getCanonicalContentV1(card);
-  return sha256Hash(content);
-}
-async function computeContentHashV2(card) {
-  const content = getCanonicalContentV2(card);
+  const content = getCanonicalContent(card);
   return sha256Hash(content);
 }
 function validateClientMetadataSync(clientMetadata, parseResult, options) {
@@ -9000,18 +8870,15 @@ function validateClientMetadataSync(clientMetadata, parseResult, options) {
   const warnings = [];
   const errors = [];
   const computedTokens = countTokens(card);
-  const canonicalContentV1 = getCanonicalContentV1(card);
-  const canonicalContentV2 = getCanonicalContentV2(card);
-  const computedHashV1 = computeHash(canonicalContentV1);
-  const computedHashV2 = computeHash(canonicalContentV2);
+  const canonicalContent = getCanonicalContent(card);
+  const computedHash = computeHash(canonicalContent);
   const entries = card.data.character_book?.entries || [];
   const computedHasLorebook = entries.length > 0;
   const computedLorebookCount = entries.length;
   const authoritative = {
     name: card.data.name,
     tokens: computedTokens,
-    contentHash: computedHashV1,
-    contentHashV2: computedHashV2,
+    contentHash: computedHash,
     hasLorebook: computedHasLorebook,
     lorebookEntriesCount: computedLorebookCount
   };
@@ -9023,13 +8890,11 @@ function validateClientMetadataSync(clientMetadata, parseResult, options) {
       withinTolerance: false
     });
   }
-  const matchesV1 = clientMetadata.contentHash === computedHashV1;
-  const matchesV2 = clientMetadata.contentHash === computedHashV2;
-  if (!matchesV1 && !matchesV2) {
+  if (clientMetadata.contentHash !== computedHash) {
     discrepancies.push({
       field: "contentHash",
       clientValue: clientMetadata.contentHash,
-      computedValue: computedHashV1,
+      computedValue: computedHash,
       withinTolerance: false
     });
     if (allowHashMismatch) {
@@ -9037,10 +8902,6 @@ function validateClientMetadataSync(clientMetadata, parseResult, options) {
     } else {
       errors.push("Content hash mismatch");
     }
-  } else if (matchesV1 && !matchesV2) {
-    warnings.push(
-      "Client contentHash matches legacy v1 canonicalization. Prefer authoritative.contentHashV2 for new storage."
-    );
   }
   const tokenFields = [
     "description",
@@ -9109,7 +8970,6 @@ function validateClientMetadataSync(clientMetadata, parseResult, options) {
 }
 export {
   computeContentHash,
-  computeContentHashV2,
   detectFormat,
   getContainerFormat,
   mightBeCard,