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

package/dist/loader.js

@@ -462,7 +462,7 @@ var CCv2LorebookEntrySchema = z2.object({
   content: z2.string(),
   enabled: z2.boolean().default(true),
   // Default to enabled if missing
-  insertion_order: z2.number().int().nullable().default(0),
+  insertion_order: z2.preprocess((v) => v ?? 0, z2.number().int()),
   // Optional fields - be lenient with nulls since wild data has them
   extensions: z2.record(z2.unknown()).optional(),
   case_sensitive: z2.boolean().nullable().optional(),
@@ -473,7 +473,7 @@ var CCv2LorebookEntrySchema = z2.object({
   selective: z2.boolean().nullable().optional(),
   secondary_keys: z2.array(z2.string()).nullable().optional(),
   constant: z2.boolean().nullable().optional(),
-  position: z2.union([z2.enum(["before_char", "after_char"]), z2.number().int(), z2.literal("")]).nullable().optional()
+  position: z2.union([z2.enum(["before_char", "after_char", "in_chat"]), z2.number().int(), z2.literal("")]).nullable().optional()
 }).passthrough();
 var CCv2CharacterBookSchema = z2.object({
   name: z2.string().optional(),
@@ -527,7 +527,7 @@ var CCv3LorebookEntrySchema = z3.object({
   content: z3.string(),
   enabled: z3.boolean().default(true),
   // Default to enabled if missing
-  insertion_order: z3.number().int().nullable().default(0),
+  insertion_order: z3.preprocess((v) => v ?? 0, z3.number().int()),
   // Optional fields - be lenient with nulls since wild data has them
   case_sensitive: z3.boolean().nullable().optional(),
   name: z3.string().optional(),
@@ -537,7 +537,7 @@ var CCv3LorebookEntrySchema = z3.object({
   selective: z3.boolean().nullable().optional(),
   secondary_keys: z3.array(z3.string()).nullable().optional(),
   constant: z3.boolean().nullable().optional(),
-  position: z3.union([z3.enum(["before_char", "after_char"]), z3.number().int(), z3.literal("")]).nullable().optional(),
+  position: z3.union([z3.enum(["before_char", "after_char", "in_chat"]), z3.number().int(), z3.literal("")]).nullable().optional(),
   extensions: z3.record(z3.unknown()).optional(),
   // v3 specific - also lenient with types since SillyTavern uses numbers for enums
   automation_id: z3.string().optional(),
@@ -8697,7 +8697,7 @@ function defaultTokenCounter(_card) {
     total: 0
   };
 }
-function getCanonicalContent(card) {
+function getCanonicalContentV1(card) {
   const normalized = {
     name: card.data.name,
     description: card.data.description || "",
@@ -8719,6 +8719,69 @@ function getCanonicalContent(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;
@@ -8739,15 +8802,18 @@ async function validateClientMetadata(clientMetadata, parseResult, options = {})
   const warnings = [];
   const errors = [];
   const computedTokens = countTokens(card);
-  const canonicalContent = getCanonicalContent(card);
-  const computedHash = await computeHash(canonicalContent);
+  const canonicalContentV1 = getCanonicalContentV1(card);
+  const canonicalContentV2 = getCanonicalContentV2(card);
+  const computedHashV1 = await computeHash(canonicalContentV1);
+  const computedHashV2 = await computeHash(canonicalContentV2);
   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: computedHash,
+    contentHash: computedHashV1,
+    contentHashV2: computedHashV2,
     hasLorebook: computedHasLorebook,
     lorebookEntriesCount: computedLorebookCount
   };
@@ -8759,21 +8825,27 @@ async function validateClientMetadata(clientMetadata, parseResult, options = {})
       withinTolerance: false
     });
   }
-  if (clientMetadata.contentHash !== computedHash) {
+  const matchesV1 = clientMetadata.contentHash === computedHashV1;
+  const matchesV2 = clientMetadata.contentHash === computedHashV2;
+  if (!matchesV1 && !matchesV2) {
     const disc = {
       field: "contentHash",
       clientValue: clientMetadata.contentHash,
-      computedValue: computedHash,
+      computedValue: computedHashV1,
       withinTolerance: false
     };
     discrepancies.push(disc);
     if (allowHashMismatch) {
       warnings.push(
-        `Content hash mismatch: client=${clientMetadata.contentHash.substring(0, 8)}..., server=${computedHash.substring(0, 8)}...`
+        `Content hash mismatch: client=${clientMetadata.contentHash.substring(0, 8)}..., server(v1)=${computedHashV1.substring(0, 8)}..., server(v2)=${computedHashV2.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",
@@ -8854,7 +8926,11 @@ async function validateClientMetadata(clientMetadata, parseResult, options = {})
   };
 }
 async function computeContentHash(card) {
-  const content = getCanonicalContent(card);
+  const content = getCanonicalContentV1(card);
+  return sha256Hash(content);
+}
+async function computeContentHashV2(card) {
+  const content = getCanonicalContentV2(card);
   return sha256Hash(content);
 }
 function validateClientMetadataSync(clientMetadata, parseResult, options) {
@@ -8870,15 +8946,18 @@ function validateClientMetadataSync(clientMetadata, parseResult, options) {
   const warnings = [];
   const errors = [];
   const computedTokens = countTokens(card);
-  const canonicalContent = getCanonicalContent(card);
-  const computedHash = computeHash(canonicalContent);
+  const canonicalContentV1 = getCanonicalContentV1(card);
+  const canonicalContentV2 = getCanonicalContentV2(card);
+  const computedHashV1 = computeHash(canonicalContentV1);
+  const computedHashV2 = computeHash(canonicalContentV2);
   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: computedHash,
+    contentHash: computedHashV1,
+    contentHashV2: computedHashV2,
     hasLorebook: computedHasLorebook,
     lorebookEntriesCount: computedLorebookCount
   };
@@ -8890,11 +8969,13 @@ function validateClientMetadataSync(clientMetadata, parseResult, options) {
       withinTolerance: false
     });
   }
-  if (clientMetadata.contentHash !== computedHash) {
+  const matchesV1 = clientMetadata.contentHash === computedHashV1;
+  const matchesV2 = clientMetadata.contentHash === computedHashV2;
+  if (!matchesV1 && !matchesV2) {
     discrepancies.push({
       field: "contentHash",
       clientValue: clientMetadata.contentHash,
-      computedValue: computedHash,
+      computedValue: computedHashV1,
       withinTolerance: false
     });
     if (allowHashMismatch) {
@@ -8902,6 +8983,10 @@ 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",
@@ -8970,6 +9055,7 @@ function validateClientMetadataSync(clientMetadata, parseResult, options) {
 }
 export {
   computeContentHash,
+  computeContentHashV2,
   detectFormat,
   getContainerFormat,
   mightBeCard,