@character-foundry/character-foundry 0.4.2-dev.1765997746 → 0.4.2

package/dist/loader.cjs

@@ -21,7 +21,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var loader_exports = {};
 __export(loader_exports, {
   computeContentHash: () => computeContentHash,
-  computeContentHashV2: () => computeContentHashV2,
   detectFormat: () => detectFormat,
   getContainerFormat: () => getContainerFormat,
   mightBeCard: () => mightBeCard,
@@ -504,7 +503,7 @@ var CCv2LorebookEntrySchema = import_zod2.z.object({
   selective: import_zod2.z.boolean().nullable().optional(),
   secondary_keys: import_zod2.z.array(import_zod2.z.string()).nullable().optional(),
   constant: import_zod2.z.boolean().nullable().optional(),
-  position: import_zod2.z.union([import_zod2.z.enum(["before_char", "after_char", "in_chat"]), import_zod2.z.number().int(), import_zod2.z.literal("")]).nullable().optional()
+  position: import_zod2.z.union([import_zod2.z.enum(["before_char", "after_char"]), import_zod2.z.number().int(), import_zod2.z.literal("")]).nullable().optional()
 }).passthrough();
 var CCv2CharacterBookSchema = import_zod2.z.object({
   name: import_zod2.z.string().optional(),
@@ -568,7 +567,7 @@ var CCv3LorebookEntrySchema = import_zod3.z.object({
   selective: import_zod3.z.boolean().nullable().optional(),
   secondary_keys: import_zod3.z.array(import_zod3.z.string()).nullable().optional(),
   constant: import_zod3.z.boolean().nullable().optional(),
-  position: import_zod3.z.union([import_zod3.z.enum(["before_char", "after_char", "in_chat"]), import_zod3.z.number().int(), import_zod3.z.literal("")]).nullable().optional(),
+  position: import_zod3.z.union([import_zod3.z.enum(["before_char", "after_char"]), import_zod3.z.number().int(), import_zod3.z.literal("")]).nullable().optional(),
   extensions: import_zod3.z.record(import_zod3.z.unknown()).optional(),
   // v3 specific - also lenient with types since SillyTavern uses numbers for enums
   automation_id: import_zod3.z.string().optional(),
@@ -8728,7 +8727,7 @@ function defaultTokenCounter(_card) {
     total: 0
   };
 }
-function getCanonicalContentV1(card) {
+function getCanonicalContent(card) {
   const normalized = {
     name: card.data.name,
     description: card.data.description || "",
@@ -8750,69 +8749,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;
@@ -8833,18 +8769,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
   };
@@ -8856,27 +8789,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",
@@ -8957,11 +8884,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) {
@@ -8977,18 +8900,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
   };
@@ -9000,13 +8920,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) {
@@ -9014,10 +8932,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",