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

package/dist/compress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAKA,OAAO,EAAkC,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAgBhF,OAAO,KAAK,EAAE,mBAAmB,EAAa,MAAM,UAAU,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAgBvD,OAAO,EAGL,KAAK,YAAY,EAGlB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,sBAAsB,EACtB,gBAAgB,EAChB,gBAAgB,EAEhB,MAAM,EAEN,WAAW,EAGX,iBAAiB,EAEjB,YAAY,EACb,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,KAAK;IACpB,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CACxC;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAC;IACxD;mEAC+D;IAC/D,QAAQ,CAAC,KAAK,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAC;IACvE,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,sBAAsB,CAAC;IACvE,YAAY,IAAI,YAAY,EAAE,CAAC;IAC/B,UAAU,CACR,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,gBAAgB,GACtB,gBAAgB,GAAG,SAAS,CAAC;IAChC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;IACnE,MAAM,CACJ,KAAK,EAAE,gBAAgB,EACvB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,YAAY,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B;8DAC0D;IAC1D,YAAY,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,EAAE,CAAC;IACJ,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACnC;AAqND,wBAAgB,UAAU,CAAC,KAAK,GAAE,KAAU,GAAG,eAAe,CAke7D;AA+qCD,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAKA,OAAO,EAAkC,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAgBhF,OAAO,KAAK,EAAE,mBAAmB,EAAa,MAAM,UAAU,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAgBvD,OAAO,EAGL,KAAK,YAAY,EAGlB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,sBAAsB,EACtB,gBAAgB,EAChB,gBAAgB,EAEhB,MAAM,EAEN,WAAW,EAGX,iBAAiB,EAEjB,YAAY,EACb,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,KAAK;IACpB,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CACxC;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAC;IACxD;mEAC+D;IAC/D,QAAQ,CAAC,KAAK,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAC;IACvE,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,sBAAsB,CAAC;IACvE,YAAY,IAAI,YAAY,EAAE,CAAC;IAC/B,UAAU,CACR,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,gBAAgB,GACtB,gBAAgB,GAAG,SAAS,CAAC;IAChC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;IACnE,MAAM,CACJ,KAAK,EAAE,gBAAgB,EACvB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,YAAY,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B;8DAC0D;IAC1D,YAAY,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,EAAE,CAAC;IACJ,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACnC;AAqND,wBAAgB,UAAU,CAAC,KAAK,GAAE,KAAU,GAAG,eAAe,CAke7D;AAyrCD,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/index.js

@@ -5261,12 +5261,13 @@ var nudgeNode = {
       countTokens: ctx.countTokens
     });
     const baseline = io.state.nudge.lastPerMessageNudgeTokens;
+    const shownAtDecision = io.state.nudge.lastNudgeShownTokens;
     const nudgeGrowthTokens = resolveAdaptiveGrowth(
       ctx.config.modelContextLimit,
       ctx.config.nudge
     );
     let stamped = { ...io.state.nudge };
-    if (baseline > 0 && ctx.tokenCount < baseline - nudgeGrowthTokens) {
+    if (baseline > 0 && ctx.tokenCount < baseline - nudgeGrowthTokens || shownAtDecision > 0 && ctx.tokenCount < shownAtDecision - nudgeGrowthTokens) {
       stamped.lastPerMessageNudgeTokens = ctx.tokenCount;
       stamped.lastNudgeShownTokens = 0;
       stamped.lastShownByTier = {};
@@ -7497,30 +7498,12 @@ 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);
   }
-  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));
+  const entries = salvageContentEntries(cleaned);
+  return finishSalvage(entries, callId, diag, looksTruncated(cleaned));
 }
 function parseObjectValue(value, callId, diag) {
   diag.keys = Object.keys(value);
@@ -7542,11 +7525,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 = inlineSingleLineEntry(splitLineEntries(bare));
+      const entries2 = 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);
       }
@@ -7969,56 +7952,6 @@ 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 [];