acp-kernel 0.0.59-pr.222.74 → 0.0.59-pr.225.76
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/compress.d.ts +5 -0
- package/dist/compress.d.ts.map +1 -1
- package/dist/hide-consumed.d.ts.map +1 -1
- package/dist/index.js +89 -19
- package/dist/index.js.map +1 -1
- package/dist/report.d.ts.map +1 -1
- package/dist/types.d.ts +13 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +1 -1
package/dist/compress.d.ts
CHANGED
|
@@ -18,6 +18,11 @@ export interface ProcessTurnInput {
|
|
|
18
18
|
state: CompressionState;
|
|
19
19
|
config: Config;
|
|
20
20
|
tokenCount: number;
|
|
21
|
+
/** Host-side prompt mass the kernel cannot see (replayed reasoning that
|
|
22
|
+
* will be sent despite reasoningReplay, provider-mandated metadata, …).
|
|
23
|
+
* Folded into every usage/pressure decision downstream. Hosts that pass
|
|
24
|
+
* it must do so consistently — cadence baselines persist tokenCount. */
|
|
25
|
+
extraTokens?: number;
|
|
21
26
|
/**
|
|
22
27
|
* Which messages get an <acp> ref tag injected into their text
|
|
23
28
|
* (the render-refs pipeline node). Refs are ALWAYS assigned regardless
|
package/dist/compress.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkC,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAehF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AASvD,OAAO,EAGL,KAAK,YAAY,EAElB,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,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;CAC7B;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;AA2DD,wBAAgB,UAAU,CAAC,KAAK,GAAE,KAAU,GAAG,eAAe,
|
|
1
|
+
{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkC,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAehF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AASvD,OAAO,EAGL,KAAK,YAAY,EAElB,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,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;;;6EAGyE;IACzE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B;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;AA2DD,wBAAgB,UAAU,CAAC,KAAK,GAAE,KAAU,GAAG,eAAe,CA0U7D;AAu+BD,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hide-consumed.d.ts","sourceRoot":"","sources":["../src/hide-consumed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAYhE,MAAM,WAAW,kBAAkB;IAC/B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAClB;
|
|
1
|
+
{"version":3,"file":"hide-consumed.d.ts","sourceRoot":"","sources":["../src/hide-consumed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAYhE,MAAM,WAAW,kBAAkB;IAC/B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAClB;AAuED,wBAAgB,yBAAyB,CACrC,KAAK,EAAE,gBAAgB,EACvB,QAAQ,EAAE,WAAW,EAAE,GACxB,kBAAkB,CAwFpB"}
|
package/dist/index.js
CHANGED
|
@@ -133,6 +133,17 @@ function prune(messages, state, options = {}) {
|
|
|
133
133
|
)
|
|
134
134
|
);
|
|
135
135
|
}
|
|
136
|
+
function isCovered(id, covered) {
|
|
137
|
+
if (covered.has(id)) return true;
|
|
138
|
+
const hash = id.indexOf("#");
|
|
139
|
+
if (hash <= 0) return false;
|
|
140
|
+
const base = id.substring(0, hash);
|
|
141
|
+
if (covered.has(base)) return true;
|
|
142
|
+
for (const coveredId of covered) {
|
|
143
|
+
if (coveredId.startsWith(`${base}#`)) return true;
|
|
144
|
+
}
|
|
145
|
+
return false;
|
|
146
|
+
}
|
|
136
147
|
function collectSummaryAnchors(state, indexById, summaryIndexById) {
|
|
137
148
|
const anchors = [];
|
|
138
149
|
for (const block of activeBlocks(state)) {
|
|
@@ -177,7 +188,7 @@ function rebuildMessages(messages, covered, firstUserIndex, anchors) {
|
|
|
177
188
|
result.push(messages[index]);
|
|
178
189
|
continue;
|
|
179
190
|
}
|
|
180
|
-
if (
|
|
191
|
+
if (isCovered(messages[index].id, covered)) continue;
|
|
181
192
|
if (isRenderedSummaryMessage(messages[index]) && anchoredSummaryIds.has(messages[index].id))
|
|
182
193
|
continue;
|
|
183
194
|
result.push(messages[index]);
|
|
@@ -666,25 +677,57 @@ var KEEP_LAST_ORPHANED = 2;
|
|
|
666
677
|
function rangeKey(startRef, endRef) {
|
|
667
678
|
return `${startRef}::${endRef}`;
|
|
668
679
|
}
|
|
669
|
-
function
|
|
680
|
+
function parseCallText(text) {
|
|
681
|
+
const raw = text ?? "";
|
|
682
|
+
const start = raw.indexOf("{");
|
|
683
|
+
if (start < 0) return null;
|
|
670
684
|
let parsed;
|
|
671
685
|
try {
|
|
672
|
-
parsed = JSON.parse(
|
|
686
|
+
parsed = JSON.parse(raw.slice(start));
|
|
673
687
|
} catch {
|
|
674
688
|
return null;
|
|
675
689
|
}
|
|
676
690
|
if (!parsed || typeof parsed !== "object") return null;
|
|
677
691
|
const obj = parsed;
|
|
678
|
-
|
|
679
|
-
|
|
692
|
+
if (!Array.isArray(obj.content) || obj.content.length === 0) return null;
|
|
693
|
+
return { prefix: raw.slice(0, start), obj, content: obj.content };
|
|
694
|
+
}
|
|
695
|
+
function rewriteCompressText(text, liveKeys) {
|
|
696
|
+
const parsed = parseCallText(text);
|
|
697
|
+
if (!parsed) return null;
|
|
698
|
+
const { prefix, obj, content } = parsed;
|
|
680
699
|
const kept = content.filter((entry) => {
|
|
681
700
|
if (!entry || typeof entry !== "object") return false;
|
|
682
|
-
const
|
|
683
|
-
const
|
|
684
|
-
|
|
701
|
+
const e = entry;
|
|
702
|
+
const s = typeof e.startId === "string" ? e.startId : typeof e.messageId === "string" ? e.messageId : "";
|
|
703
|
+
const end = typeof e.endId === "string" ? e.endId : typeof e.messageId === "string" ? e.messageId : "";
|
|
704
|
+
return liveKeys.has(rangeKey(s, end));
|
|
685
705
|
});
|
|
686
|
-
if (kept.length ===
|
|
687
|
-
return
|
|
706
|
+
if (kept.length === 0) return null;
|
|
707
|
+
return prefix + serializeCompacted(obj, kept).text;
|
|
708
|
+
}
|
|
709
|
+
var SUMMARY_STUB_CHARS = 200;
|
|
710
|
+
function compactEntry(entry) {
|
|
711
|
+
if (!entry || typeof entry !== "object") return entry;
|
|
712
|
+
const e = entry;
|
|
713
|
+
if (typeof e.summary !== "string" || e.summary.length <= SUMMARY_STUB_CHARS) return entry;
|
|
714
|
+
return { ...e, summary: `${e.summary.slice(0, SUMMARY_STUB_CHARS - 1)}\u2026` };
|
|
715
|
+
}
|
|
716
|
+
function serializeCompacted(obj, content) {
|
|
717
|
+
let changed = false;
|
|
718
|
+
const compacted = content.map((entry) => {
|
|
719
|
+
const out = compactEntry(entry);
|
|
720
|
+
if (out !== entry) changed = true;
|
|
721
|
+
return out;
|
|
722
|
+
});
|
|
723
|
+
return { text: JSON.stringify({ ...obj, content: compacted }), changed };
|
|
724
|
+
}
|
|
725
|
+
function compactCompressText(text) {
|
|
726
|
+
const parsed = parseCallText(text);
|
|
727
|
+
if (!parsed) return null;
|
|
728
|
+
const { prefix, obj, content } = parsed;
|
|
729
|
+
const { text: out, changed } = serializeCompacted(obj, content);
|
|
730
|
+
return changed ? prefix + out : null;
|
|
688
731
|
}
|
|
689
732
|
function hideConsumedCompressCalls(state, messages) {
|
|
690
733
|
const allBlockCallIds = /* @__PURE__ */ new Set();
|
|
@@ -743,6 +786,11 @@ function hideConsumedCompressCalls(state, messages) {
|
|
|
743
786
|
continue;
|
|
744
787
|
}
|
|
745
788
|
}
|
|
789
|
+
const compacted = compactCompressText(message.text);
|
|
790
|
+
if (compacted !== null) {
|
|
791
|
+
result.push({ ...message, text: compacted });
|
|
792
|
+
continue;
|
|
793
|
+
}
|
|
746
794
|
}
|
|
747
795
|
result.push(message);
|
|
748
796
|
}
|
|
@@ -2068,7 +2116,7 @@ function createCore(ports = {}) {
|
|
|
2068
2116
|
}
|
|
2069
2117
|
const ctx = {
|
|
2070
2118
|
config: input.config,
|
|
2071
|
-
tokenCount: input.tokenCount,
|
|
2119
|
+
tokenCount: input.tokenCount + (input.extraTokens ?? 0),
|
|
2072
2120
|
countTokens
|
|
2073
2121
|
};
|
|
2074
2122
|
const initial = {
|
|
@@ -2115,6 +2163,7 @@ function createCore(ports = {}) {
|
|
|
2115
2163
|
assignRefsNode,
|
|
2116
2164
|
syncBlocksNode,
|
|
2117
2165
|
pruneNode,
|
|
2166
|
+
stripReasoningNode,
|
|
2118
2167
|
absorbHideNode,
|
|
2119
2168
|
absorbPromptNode,
|
|
2120
2169
|
filterNode,
|
|
@@ -2162,6 +2211,34 @@ var pruneNode = {
|
|
|
2162
2211
|
return { ...io, messages: prune(io.messages, io.state) };
|
|
2163
2212
|
}
|
|
2164
2213
|
};
|
|
2214
|
+
var stripReasoningNode = {
|
|
2215
|
+
name: "strip-reasoning",
|
|
2216
|
+
run(io, ctx) {
|
|
2217
|
+
const policy = ctx.config.reasoningReplay ?? "always";
|
|
2218
|
+
if (policy === "always") return io;
|
|
2219
|
+
const messages = io.messages;
|
|
2220
|
+
if (policy === "never") {
|
|
2221
|
+
const kept2 = messages.filter((m) => m.contentType !== "reasoning");
|
|
2222
|
+
return kept2.length === messages.length ? io : { ...io, messages: kept2 };
|
|
2223
|
+
}
|
|
2224
|
+
let boundary = -1;
|
|
2225
|
+
for (let i = messages.length - 1; i >= 0; i--) {
|
|
2226
|
+
const m = messages[i];
|
|
2227
|
+
if (m.role === "user" && m.contentType === "text") {
|
|
2228
|
+
boundary = i;
|
|
2229
|
+
break;
|
|
2230
|
+
}
|
|
2231
|
+
}
|
|
2232
|
+
if (boundary < 0) return io;
|
|
2233
|
+
let changed = false;
|
|
2234
|
+
const kept = messages.filter((m, i) => {
|
|
2235
|
+
if (m.contentType !== "reasoning" || i >= boundary) return true;
|
|
2236
|
+
changed = true;
|
|
2237
|
+
return false;
|
|
2238
|
+
});
|
|
2239
|
+
return changed ? { ...io, messages: kept } : io;
|
|
2240
|
+
}
|
|
2241
|
+
};
|
|
2165
2242
|
var absorbHideNode = {
|
|
2166
2243
|
name: "absorb-hide",
|
|
2167
2244
|
enabled: (io) => (io.state.absorbed?.length ?? 0) > 0,
|
|
@@ -2931,16 +3008,14 @@ function tierLabel(block) {
|
|
|
2931
3008
|
}
|
|
2932
3009
|
function tierBreakdown(blocks, countTokens) {
|
|
2933
3010
|
const tierTokens = {};
|
|
2934
|
-
const tierCounts = {};
|
|
2935
3011
|
for (const block of blocks) {
|
|
2936
3012
|
tierTokens[block.tier] = (tierTokens[block.tier] ?? 0) + summaryTokensOf(block, countTokens);
|
|
2937
|
-
tierCounts[block.tier] = (tierCounts[block.tier] ?? 0) + 1;
|
|
2938
3013
|
}
|
|
2939
3014
|
const tiers = Object.keys(tierTokens).map(Number);
|
|
2940
3015
|
if (tiers.length <= 1) return null;
|
|
2941
3016
|
const parts = [];
|
|
2942
3017
|
for (const tier of [1, 2, 3]) {
|
|
2943
|
-
if (tierTokens[tier]) parts.push(`T${tier}: ${formatTokens2(tierTokens[tier])}
|
|
3018
|
+
if (tierTokens[tier]) parts.push(`T${tier}: ${formatTokens2(tierTokens[tier])}`);
|
|
2944
3019
|
}
|
|
2945
3020
|
return parts.join(" | ");
|
|
2946
3021
|
}
|
|
@@ -3034,11 +3109,6 @@ function renderOverview(visible, summaryTokens, blocks, state, countTokens, limi
|
|
|
3034
3109
|
` ${block.blockId} (${tierLabel(block)}) ${formatTokens2(eff)}\u2192${formatTokens2(summaryTokensOf(block, countTokens))} ${block.effectiveMessageIds.length} msgs "${topic}"`
|
|
3035
3110
|
);
|
|
3036
3111
|
}
|
|
3037
|
-
if (blocks.length > limit) {
|
|
3038
|
-
lines.push(
|
|
3039
|
-
` ... and ${blocks.length - limit} more blocks not shown (scope:"compressed", limit:${blocks.length} for full list)`
|
|
3040
|
-
);
|
|
3041
|
-
}
|
|
3042
3112
|
}
|
|
3043
3113
|
lines.push("");
|
|
3044
3114
|
lines.push(
|