acp-kernel 0.0.46-pr.171.22 → 0.0.46-pr.173.24
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/boundaries.d.ts +1 -3
- package/dist/boundaries.d.ts.map +1 -1
- package/dist/compress.d.ts.map +1 -1
- package/dist/index.js +31 -71
- package/dist/index.js.map +1 -1
- package/dist/parse-compress-input.d.ts +2 -0
- package/dist/parse-compress-input.d.ts.map +1 -1
- package/dist/persist/index.js +132 -45
- package/dist/persist/index.js.map +1 -1
- package/dist/persist/store.d.ts +46 -5
- package/dist/persist/store.d.ts.map +1 -1
- package/dist/prune.d.ts.map +1 -1
- package/package.json +1 -1
package/dist/boundaries.d.ts
CHANGED
|
@@ -33,8 +33,6 @@ export interface ResolvedRange {
|
|
|
33
33
|
boundaryKind: BoundaryKind;
|
|
34
34
|
protectedGaps: number[];
|
|
35
35
|
snappedBoundaries: string[];
|
|
36
|
-
refStart: number | null;
|
|
37
|
-
refEnd: number | null;
|
|
38
36
|
}
|
|
39
37
|
export declare function resolveBoundaries(input: ResolveBoundariesInput): ResolvedRange;
|
|
40
38
|
/**
|
|
@@ -45,7 +43,7 @@ export declare function resolveBoundaries(input: ResolveBoundariesInput): Resolv
|
|
|
45
43
|
* promoted (dog/billion-context-pi#195).
|
|
46
44
|
*/
|
|
47
45
|
export declare function visibleBlockAnchor(block: CompressionBlock, indexByMessageId: Map<string, number>): number | null;
|
|
48
|
-
export declare function blockVisibleInRange(block: CompressionBlock, indexByMessageId: Map<string, number>, startIndex: number, endIndex: number
|
|
46
|
+
export declare function blockVisibleInRange(block: CompressionBlock, indexByMessageId: Map<string, number>, startIndex: number, endIndex: number): boolean;
|
|
49
47
|
export declare function earliestIndexOfIds(ids: string[], indexByMessageId: Map<string, number>): number | null;
|
|
50
48
|
export declare function toResolvedBoundary(range: ResolvedRange): ResolvedBoundary;
|
|
51
49
|
//# sourceMappingURL=boundaries.d.ts.map
|
package/dist/boundaries.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"boundaries.d.ts","sourceRoot":"","sources":["../src/boundaries.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACb;AAKD,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAehE;AAED;;;;;;GAMG;AACH,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,QAAQ,CAAC,IAAI,wBAAwB;IACrC,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,UAAU,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,KAAK,CAAC;gBAGjC,IAAI,EAAE,SAAS,GAAG,UAAU,EAC5B,QAAQ,EAAE,OAAO,GAAG,KAAK,EACzB,OAAO,EAAE,MAAM;CAQlB;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,iBAAiB,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"boundaries.d.ts","sourceRoot":"","sources":["../src/boundaries.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACb;AAKD,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAehE;AAED;;;;;;GAMG;AACH,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,QAAQ,CAAC,IAAI,wBAAwB;IACrC,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,UAAU,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,KAAK,CAAC;gBAGjC,IAAI,EAAE,SAAS,GAAG,UAAU,EAC5B,QAAQ,EAAE,OAAO,GAAG,KAAK,EACzB,OAAO,EAAE,MAAM;CAQlB;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,sBAAsB,GAC5B,aAAa,CAuEf;AAgJD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,gBAAgB,EACvB,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,MAAM,GAAG,IAAI,CAIf;AAOD,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,gBAAgB,EACvB,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAcT;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EAAE,EACb,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,MAAM,GAAG,IAAI,CASf;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,aAAa,GAAG,gBAAgB,CAMzE"}
|
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;AAchF,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;AA2BD,wBAAgB,UAAU,CAAC,KAAK,GAAE,KAAU,GAAG,eAAe,CA+T7D;
|
|
1
|
+
{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkC,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAchF,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;AA2BD,wBAAgB,UAAU,CAAC,KAAK,GAAE,KAAU,GAAG,eAAe,CA+T7D;AAs5BD,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -117,10 +117,6 @@ function prune(messages, state, options = {}) {
|
|
|
117
117
|
const firstUserIndex = messages.findIndex(
|
|
118
118
|
(message) => message.role === "user"
|
|
119
119
|
);
|
|
120
|
-
const firstNonSystemIndex = messages.findIndex(
|
|
121
|
-
(message) => message.role !== "system"
|
|
122
|
-
);
|
|
123
|
-
const summaryClampIndex = firstNonSystemIndex >= 0 ? firstNonSystemIndex : 0;
|
|
124
120
|
const indexById = /* @__PURE__ */ new Map();
|
|
125
121
|
const summaryIndexById = /* @__PURE__ */ new Map();
|
|
126
122
|
messages.forEach((message, index) => {
|
|
@@ -128,12 +124,7 @@ function prune(messages, state, options = {}) {
|
|
|
128
124
|
if (isRenderedSummaryMessage(message))
|
|
129
125
|
summaryIndexById.set(message.id, index);
|
|
130
126
|
});
|
|
131
|
-
const anchors = inject ? collectSummaryAnchors(
|
|
132
|
-
state,
|
|
133
|
-
indexById,
|
|
134
|
-
summaryIndexById,
|
|
135
|
-
summaryClampIndex
|
|
136
|
-
) : [];
|
|
127
|
+
const anchors = inject ? collectSummaryAnchors(state, indexById, summaryIndexById) : [];
|
|
137
128
|
return stripOrphanedReasoning(
|
|
138
129
|
stripOrphanedToolResults(
|
|
139
130
|
stripOrphanedToolCalls(
|
|
@@ -142,7 +133,7 @@ function prune(messages, state, options = {}) {
|
|
|
142
133
|
)
|
|
143
134
|
);
|
|
144
135
|
}
|
|
145
|
-
function collectSummaryAnchors(state, indexById, summaryIndexById
|
|
136
|
+
function collectSummaryAnchors(state, indexById, summaryIndexById) {
|
|
146
137
|
const anchors = [];
|
|
147
138
|
for (const block of activeBlocks(state)) {
|
|
148
139
|
const existingIndex = summaryIndexById.get(summaryMessageId(block.blockId));
|
|
@@ -151,8 +142,7 @@ function collectSummaryAnchors(state, indexById, summaryIndexById, clampIndex) {
|
|
|
151
142
|
blockId: block.blockId,
|
|
152
143
|
summary: block.summary,
|
|
153
144
|
topic: block.topic,
|
|
154
|
-
insertAt:
|
|
155
|
-
orderKey: existingIndex
|
|
145
|
+
insertAt: existingIndex
|
|
156
146
|
});
|
|
157
147
|
continue;
|
|
158
148
|
}
|
|
@@ -163,16 +153,14 @@ function collectSummaryAnchors(state, indexById, summaryIndexById, clampIndex) {
|
|
|
163
153
|
earliest = index;
|
|
164
154
|
}
|
|
165
155
|
}
|
|
166
|
-
const original = earliest ?? 0;
|
|
167
156
|
anchors.push({
|
|
168
157
|
blockId: block.blockId,
|
|
169
158
|
summary: block.summary,
|
|
170
159
|
topic: block.topic,
|
|
171
|
-
insertAt:
|
|
172
|
-
orderKey: original
|
|
160
|
+
insertAt: earliest ?? 0
|
|
173
161
|
});
|
|
174
162
|
}
|
|
175
|
-
anchors.sort((left, right) => left.
|
|
163
|
+
anchors.sort((left, right) => left.insertAt - right.insertAt);
|
|
176
164
|
return anchors;
|
|
177
165
|
}
|
|
178
166
|
function rebuildMessages(messages, covered, firstUserIndex, anchors) {
|
|
@@ -457,9 +445,6 @@ function resolveBoundaries(input) {
|
|
|
457
445
|
if (startIndex > endIndex) {
|
|
458
446
|
[startIndex, endIndex] = [endIndex, startIndex];
|
|
459
447
|
}
|
|
460
|
-
const bothMessageRefs = start.kind === "message" && end.kind === "message";
|
|
461
|
-
const refStart = bothMessageRefs ? Math.min(start.numericId, end.numericId) : null;
|
|
462
|
-
const refEnd = bothMessageRefs ? Math.max(start.numericId, end.numericId) : null;
|
|
463
448
|
const messageIds = [];
|
|
464
449
|
for (let index = startIndex; index <= endIndex; index++) {
|
|
465
450
|
const message = input.messages[index];
|
|
@@ -470,15 +455,7 @@ function resolveBoundaries(input) {
|
|
|
470
455
|
const nestedBlockIds = [];
|
|
471
456
|
const nestedSeen = /* @__PURE__ */ new Set();
|
|
472
457
|
for (const block of activeBlocks(input.state)) {
|
|
473
|
-
if (blockVisibleInRange(
|
|
474
|
-
block,
|
|
475
|
-
indexByMessageId,
|
|
476
|
-
startIndex,
|
|
477
|
-
endIndex,
|
|
478
|
-
input.state.messageRefs.byRaw,
|
|
479
|
-
refStart,
|
|
480
|
-
refEnd
|
|
481
|
-
)) {
|
|
458
|
+
if (blockVisibleInRange(block, indexByMessageId, startIndex, endIndex)) {
|
|
482
459
|
if (!nestedSeen.has(block.blockId)) {
|
|
483
460
|
nestedSeen.add(block.blockId);
|
|
484
461
|
nestedBlockIds.push(block.blockId);
|
|
@@ -493,9 +470,7 @@ function resolveBoundaries(input) {
|
|
|
493
470
|
nestedBlockIds,
|
|
494
471
|
boundaryKind,
|
|
495
472
|
protectedGaps,
|
|
496
|
-
snappedBoundaries
|
|
497
|
-
refStart,
|
|
498
|
-
refEnd
|
|
473
|
+
snappedBoundaries
|
|
499
474
|
};
|
|
500
475
|
}
|
|
501
476
|
function resolveAnchorIndex(boundary, state, indexByMessageId, endpoint) {
|
|
@@ -604,7 +579,7 @@ function visibleBlockAnchor(block, indexByMessageId) {
|
|
|
604
579
|
if (summaryIndex !== void 0) return summaryIndex;
|
|
605
580
|
return earliestIndexOfIds(block.effectiveMessageIds, indexByMessageId);
|
|
606
581
|
}
|
|
607
|
-
function blockVisibleInRange(block, indexByMessageId, startIndex, endIndex
|
|
582
|
+
function blockVisibleInRange(block, indexByMessageId, startIndex, endIndex) {
|
|
608
583
|
const summaryIndex = indexByMessageId.get(summaryMessageId(block.blockId));
|
|
609
584
|
if (summaryIndex !== void 0 && summaryIndex >= startIndex && summaryIndex <= endIndex) {
|
|
610
585
|
return true;
|
|
@@ -613,22 +588,7 @@ function blockVisibleInRange(block, indexByMessageId, startIndex, endIndex, byRa
|
|
|
613
588
|
block.effectiveMessageIds,
|
|
614
589
|
indexByMessageId
|
|
615
590
|
);
|
|
616
|
-
|
|
617
|
-
return true;
|
|
618
|
-
}
|
|
619
|
-
if (rawIndex === null && refStart !== null && refEnd !== null) {
|
|
620
|
-
for (const id of block.effectiveMessageIds) {
|
|
621
|
-
const ref = byRaw[id];
|
|
622
|
-
if (ref === void 0) continue;
|
|
623
|
-
const num = refNumber(ref);
|
|
624
|
-
if (num !== null && num >= refStart && num <= refEnd) return true;
|
|
625
|
-
}
|
|
626
|
-
}
|
|
627
|
-
return false;
|
|
628
|
-
}
|
|
629
|
-
function refNumber(ref) {
|
|
630
|
-
const match = MESSAGE_REF_PATTERN.exec(ref);
|
|
631
|
-
return match ? Number(match[1]) : null;
|
|
591
|
+
return rawIndex !== null && rawIndex >= startIndex && rawIndex <= endIndex;
|
|
632
592
|
}
|
|
633
593
|
function earliestIndexOfIds(ids, indexByMessageId) {
|
|
634
594
|
let earliest = null;
|
|
@@ -2314,15 +2274,7 @@ function applySingleRange(input) {
|
|
|
2314
2274
|
const nestedSeen = new Set(resolved.nestedBlockIds);
|
|
2315
2275
|
for (const block2 of activeBlocks(input.state)) {
|
|
2316
2276
|
if (nestedSeen.has(block2.blockId)) continue;
|
|
2317
|
-
if (blockVisibleInRange(
|
|
2318
|
-
block2,
|
|
2319
|
-
indexByMessageId,
|
|
2320
|
-
adjustedStart,
|
|
2321
|
-
adjustedEnd,
|
|
2322
|
-
input.state.messageRefs.byRaw,
|
|
2323
|
-
resolved.refStart,
|
|
2324
|
-
resolved.refEnd
|
|
2325
|
-
)) {
|
|
2277
|
+
if (blockVisibleInRange(block2, indexByMessageId, adjustedStart, adjustedEnd)) {
|
|
2326
2278
|
nestedSeen.add(block2.blockId);
|
|
2327
2279
|
resolved.nestedBlockIds.push(block2.blockId);
|
|
2328
2280
|
}
|
|
@@ -3201,9 +3153,9 @@ function parseObjectValue(value, callId, diag) {
|
|
|
3201
3153
|
const content = value["content"];
|
|
3202
3154
|
if (content === void 0) {
|
|
3203
3155
|
const single = validateEntry(value, callId);
|
|
3204
|
-
if (single) {
|
|
3156
|
+
if ("range" in single) {
|
|
3205
3157
|
diag.kind = "ok";
|
|
3206
|
-
return finish([single], diag);
|
|
3158
|
+
return finish([single.range], diag);
|
|
3207
3159
|
}
|
|
3208
3160
|
diag.kind = "missing-content";
|
|
3209
3161
|
return finish([], diag);
|
|
@@ -3224,7 +3176,7 @@ function parseObjectValue(value, callId, diag) {
|
|
|
3224
3176
|
diag.kind = "content-not-array";
|
|
3225
3177
|
return finish([], diag);
|
|
3226
3178
|
}
|
|
3227
|
-
const { ranges, invalid } = validateEntries(entries, callId);
|
|
3179
|
+
const { ranges, invalid, reasons } = validateEntries(entries, callId);
|
|
3228
3180
|
const topTopic = stringOr(value["topic"]);
|
|
3229
3181
|
const topMaxChars = value["summaryMaxChars"];
|
|
3230
3182
|
const hasTopMaxChars = typeof topMaxChars === "number" && Number.isFinite(topMaxChars);
|
|
@@ -3235,6 +3187,7 @@ function parseObjectValue(value, callId, diag) {
|
|
|
3235
3187
|
}
|
|
3236
3188
|
}
|
|
3237
3189
|
diag.invalidItems = invalid;
|
|
3190
|
+
if (reasons.length > 0) diag.invalidReasons = reasons;
|
|
3238
3191
|
diag.kind = salvaged ? "truncated" : ranges.length > 0 ? "ok" : "no-valid-ranges";
|
|
3239
3192
|
return finish(ranges, diag);
|
|
3240
3193
|
}
|
|
@@ -3258,36 +3211,43 @@ function finish(ranges, diag) {
|
|
|
3258
3211
|
return { ranges, diagnostics: diag };
|
|
3259
3212
|
}
|
|
3260
3213
|
function finishSalvage(entries, callId, diag, truncatedShape) {
|
|
3261
|
-
const { ranges, invalid } = validateEntries(entries, callId);
|
|
3214
|
+
const { ranges, invalid, reasons } = validateEntries(entries, callId);
|
|
3262
3215
|
diag.invalidItems = invalid;
|
|
3216
|
+
if (reasons.length > 0) diag.invalidReasons = reasons;
|
|
3263
3217
|
diag.kind = entries.length > 0 || truncatedShape ? "truncated" : "malformed-json";
|
|
3264
3218
|
return finish(ranges, diag);
|
|
3265
3219
|
}
|
|
3266
3220
|
function validateEntries(entries, callId) {
|
|
3267
3221
|
const ranges = [];
|
|
3222
|
+
const reasons = [];
|
|
3268
3223
|
let invalid = 0;
|
|
3269
|
-
for (
|
|
3270
|
-
const
|
|
3271
|
-
if (range
|
|
3272
|
-
else
|
|
3224
|
+
for (let i = 0; i < entries.length; i++) {
|
|
3225
|
+
const outcome = validateEntry(entries[i], callId);
|
|
3226
|
+
if ("range" in outcome) ranges.push(outcome.range);
|
|
3227
|
+
else {
|
|
3228
|
+
invalid++;
|
|
3229
|
+
reasons.push(`entry ${i}: ${outcome.reason}`);
|
|
3230
|
+
}
|
|
3273
3231
|
}
|
|
3274
|
-
return { ranges, invalid };
|
|
3232
|
+
return { ranges, invalid, reasons };
|
|
3275
3233
|
}
|
|
3276
3234
|
function validateEntry(entry, callId) {
|
|
3277
|
-
if (entry === null || typeof entry !== "object" || Array.isArray(entry)) return
|
|
3235
|
+
if (entry === null || typeof entry !== "object" || Array.isArray(entry)) return { reason: "not an object" };
|
|
3278
3236
|
const e = entry;
|
|
3279
3237
|
const start = stringOr(e["startRef"]) ?? stringOr(e["startId"]) ?? stringOr(e["messageId"]);
|
|
3280
3238
|
const end = stringOr(e["endRef"]) ?? stringOr(e["endId"]) ?? stringOr(e["messageId"]);
|
|
3281
|
-
if (start === void 0 || end === void 0)
|
|
3239
|
+
if (start === void 0 || end === void 0) {
|
|
3240
|
+
return { reason: "missing range bounds (need startRef/startId and endRef/endId)" };
|
|
3241
|
+
}
|
|
3282
3242
|
const summary = stringOr(e["summary"]);
|
|
3283
|
-
if (summary === void 0) return
|
|
3243
|
+
if (summary === void 0) return { reason: "missing summary" };
|
|
3284
3244
|
const range = { startRef: start, endRef: end, summary };
|
|
3285
3245
|
const topic = stringOr(e["topic"]);
|
|
3286
3246
|
if (topic !== void 0) range.topic = topic;
|
|
3287
3247
|
const maxChars = e["summaryMaxChars"];
|
|
3288
3248
|
if (typeof maxChars === "number" && Number.isFinite(maxChars)) range.summaryMaxChars = maxChars;
|
|
3289
3249
|
if (callId !== void 0) range.compressCallId = callId;
|
|
3290
|
-
return range;
|
|
3250
|
+
return { range };
|
|
3291
3251
|
}
|
|
3292
3252
|
function stringOr(value) {
|
|
3293
3253
|
return typeof value === "string" && value.length > 0 ? value : void 0;
|