acp-kernel 0.0.98-pr.473.333 → 0.0.98-pr.477.335

package/dist/index.js

@@ -7497,12 +7497,30 @@ function parseStringCore(cleaned, callId, diag) {
   if (value !== null && typeof value === "object" && !Array.isArray(value)) {
     return parseObjectValue(value, callId, diag);
   }
+  if (typeof value === "string") {
+    const recovered2 = salvageLineFormEntries(value, callId);
+    if (recovered2.ranges.length > 0)
+      return finishLineFormSalvage(recovered2, diag, false);
+  }
   if (value !== void 0) {
     diag.kind = "not-object";
     return finish([], diag);
   }
-  const entries = salvageContentEntries(cleaned);
-  return finishSalvage(entries, callId, diag, looksTruncated(cleaned));
+  let entries = salvageContentEntries(cleaned);
+  let fromStringSlot = false;
+  if (entries.length === 0) {
+    entries = salvageStringSlotEntries(cleaned);
+    fromStringSlot = entries.length > 0;
+  }
+  if (entries.length > 0) {
+    const out = finishSalvage(entries, callId, diag, true);
+    if (fromStringSlot && out.ranges.length > 0) diag.contentSalvage = true;
+    return out;
+  }
+  const recovered = salvageLineFormEntries(cleaned, callId);
+  if (recovered.ranges.length > 0)
+    return finishLineFormSalvage(recovered, diag, looksTruncated(cleaned));
+  return finishSalvage([], callId, diag, looksTruncated(cleaned));
 }
 function parseObjectValue(value, callId, diag) {
   diag.keys = Object.keys(value);
@@ -7524,11 +7542,11 @@ function parseObjectValue(value, callId, diag) {
     const parsed = parseContentArray(content);
     if (parsed === null || parsed.entries.length === 0 && content.trim().length > 0) {
       const bare = stripJsonWrapperResidue(content);
-      const entries2 = splitLineEntries(bare);
+      const entries2 = inlineSingleLineEntry(splitLineEntries(bare));
       const { ranges: ranges2, invalid: invalid2, reasons: reasons2 } = validateEntries(entries2, callId);
+      diag.invalidItems = invalid2;
+      if (reasons2.length > 0) diag.invalidReasons = reasons2;
       if (ranges2.length > 0) {
-        diag.invalidItems = invalid2;
-        if (reasons2.length > 0) diag.invalidReasons = reasons2;
         diag.kind = "ok";
         return finish(ranges2, diag);
       }
@@ -7951,6 +7969,56 @@ function looksTruncated(s) {
   }
   return depth > 0 || inString;
 }
+function inlineSingleLineEntry(entries) {
+  if (entries.length !== 1) return entries;
+  const e = entries[0];
+  if (typeof e !== "string" || e.includes("\n")) return entries;
+  const head = e.trim();
+  const m = REF_PAIR_IN_LINE.exec(head) ?? SINGLE_REF_IN_LINE.exec(head);
+  if (m === null) return entries;
+  const rest = head.slice(m.index + m[0].length).trim();
+  if (!/\p{L}|\p{N}/u.test(rest)) return entries;
+  return [m[0] + "\n" + rest];
+}
+function salvageLineFormEntries(text, callId) {
+  return validateEntries(
+    inlineSingleLineEntry(splitLineEntries(stripJsonWrapperResidue(text))),
+    callId
+  );
+}
+function finishLineFormSalvage(result, diag, truncatedShape) {
+  diag.stringSalvage = true;
+  diag.invalidItems = result.invalid;
+  if (result.reasons.length > 0) diag.invalidReasons = result.reasons;
+  diag.kind = truncatedShape ? "truncated" : "ok";
+  return finish(result.ranges, diag);
+}
+function salvageStringSlotEntries(raw) {
+  const match = /"content"\s*:\s*"/.exec(raw);
+  if (match === null) return [];
+  const start = match.index + match[0].length;
+  let i = start;
+  let terminated = false;
+  while (i < raw.length) {
+    const ch = raw.charAt(i);
+    if (ch === "\\") {
+      i += 2;
+      continue;
+    }
+    if (ch === '"') {
+      terminated = true;
+      break;
+    }
+    i++;
+  }
+  const body = raw.slice(start, i).replace(/\\n/g, "\n");
+  const parts = splitLineEntries(body);
+  if (!terminated) {
+    if (parts.length <= 1) return [];
+    parts.pop();
+  }
+  return parts;
+}
 function salvageContentEntries(raw) {
   const match = /"content"\s*:\s*\[/.exec(raw);
   if (match === null) return [];