zelari-code 2.4.0 → 2.6.0
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/cli/budget/budgetRuntime.js +115 -0
- package/dist/cli/budget/budgetRuntime.js.map +1 -0
- package/dist/cli/budget/historySummary.js +40 -2
- package/dist/cli/budget/historySummary.js.map +1 -1
- package/dist/cli/budget/modelContextBuilder.js +137 -0
- package/dist/cli/budget/modelContextBuilder.js.map +1 -0
- package/dist/cli/budget/persistCompact.js +67 -0
- package/dist/cli/budget/persistCompact.js.map +1 -0
- package/dist/cli/budget/resourceLedger.js +61 -0
- package/dist/cli/budget/resourceLedger.js.map +1 -0
- package/dist/cli/budget/resourceSnapshot.js +43 -0
- package/dist/cli/budget/resourceSnapshot.js.map +1 -0
- package/dist/cli/budget/tokenBudget.js +47 -13
- package/dist/cli/budget/tokenBudget.js.map +1 -1
- package/dist/cli/compaction.js +5 -0
- package/dist/cli/compaction.js.map +1 -1
- package/dist/cli/gauntlet/policy.js +9 -0
- package/dist/cli/gauntlet/policy.js.map +1 -1
- package/dist/cli/harnessManifest.js +62 -0
- package/dist/cli/harnessManifest.js.map +1 -0
- package/dist/cli/headlessSpine.js +18 -2
- package/dist/cli/headlessSpine.js.map +1 -1
- package/dist/cli/hooks/historyCompaction.js +56 -8
- package/dist/cli/hooks/historyCompaction.js.map +1 -1
- package/dist/cli/hooks/useChatTurn.js +56 -68
- package/dist/cli/hooks/useChatTurn.js.map +1 -1
- package/dist/cli/kraken/taskContract.js +44 -0
- package/dist/cli/kraken/taskContract.js.map +1 -0
- package/dist/cli/main.bundled.js +3002 -1214
- package/dist/cli/main.bundled.js.map +4 -4
- package/dist/cli/metrics.js +16 -0
- package/dist/cli/metrics.js.map +1 -1
- package/dist/cli/runHeadless.js +96 -10
- package/dist/cli/runHeadless.js.map +1 -1
- package/dist/cli/sessionSpine.js +183 -11
- package/dist/cli/sessionSpine.js.map +1 -1
- package/package.json +5 -3
|
@@ -16,6 +16,18 @@ import { envNumber } from '../utils/envNumber.js';
|
|
|
16
16
|
import { compactHistoryAsync, compactHistoryDetailed, pruneToolResultsDetailed, } from '../hooks/historyCompaction.js';
|
|
17
17
|
import { applySessionSurface } from '../hooks/observationStore.js';
|
|
18
18
|
import { capabilitiesFor } from '../provider/capabilities.js';
|
|
19
|
+
function mergeCompactRange(into, r) {
|
|
20
|
+
if (r.fromSeq !== undefined && r.toSeq !== undefined) {
|
|
21
|
+
into.fromSeq = into.fromSeq === undefined ? r.fromSeq : Math.min(into.fromSeq, r.fromSeq);
|
|
22
|
+
into.toSeq = into.toSeq === undefined ? r.toSeq : Math.max(into.toSeq, r.toSeq);
|
|
23
|
+
if (r.sourceEventSeqs)
|
|
24
|
+
into.sourceSeqs.push(...r.sourceEventSeqs);
|
|
25
|
+
}
|
|
26
|
+
if (r.strategy === 'llm')
|
|
27
|
+
into.strategy = 'llm';
|
|
28
|
+
else if (r.strategy && !into.strategy)
|
|
29
|
+
into.strategy = r.strategy;
|
|
30
|
+
}
|
|
19
31
|
/** Rough chars→tokens (OpenAI-ish). */
|
|
20
32
|
export function estimateTokens(text) {
|
|
21
33
|
if (!text)
|
|
@@ -88,6 +100,7 @@ export function applyBudgetPolicy(history, phase, opts) {
|
|
|
88
100
|
let { estimated, occupancy } = occupancyOf(hist, sessionExtra, contextLimit);
|
|
89
101
|
let compactSummary = '';
|
|
90
102
|
let messagesRemoved = 0;
|
|
103
|
+
const compactRange = { sourceSeqs: [] };
|
|
91
104
|
if (occupancy >= compact.warnAt && occupancy < compact.compactAt) {
|
|
92
105
|
warnings.push(`[budget] context ~${Math.round(occupancy * 100)}% full (${estimated + sessionExtra}/${contextLimit} tok est.) — consider /compact or shorter replies.`);
|
|
93
106
|
}
|
|
@@ -101,6 +114,7 @@ export function applyBudgetPolicy(history, phase, opts) {
|
|
|
101
114
|
messagesRemoved += r.messagesRemoved;
|
|
102
115
|
if (r.summary)
|
|
103
116
|
compactSummary = r.summary;
|
|
117
|
+
mergeCompactRange(compactRange, r);
|
|
104
118
|
}
|
|
105
119
|
({ estimated, occupancy } = occupancyOf(hist, sessionExtra, contextLimit));
|
|
106
120
|
warnings.push(`[budget] auto-compact at 85% — kept ~${forcedTurns} turns (${estimated} tok history est.` +
|
|
@@ -114,6 +128,7 @@ export function applyBudgetPolicy(history, phase, opts) {
|
|
|
114
128
|
messagesRemoved += hard.messagesRemoved;
|
|
115
129
|
if (hard.summary)
|
|
116
130
|
compactSummary = hard.summary;
|
|
131
|
+
mergeCompactRange(compactRange, hard);
|
|
117
132
|
}
|
|
118
133
|
({ estimated, occupancy } = occupancyOf(hist, sessionExtra, contextLimit));
|
|
119
134
|
historyTurns = 2;
|
|
@@ -130,6 +145,14 @@ export function applyBudgetPolicy(history, phase, opts) {
|
|
|
130
145
|
occupancy,
|
|
131
146
|
compactSummary: compactSummary || undefined,
|
|
132
147
|
messagesRemoved: messagesRemoved || undefined,
|
|
148
|
+
...(compactRange.fromSeq !== undefined && compactRange.toSeq !== undefined
|
|
149
|
+
? {
|
|
150
|
+
compactedFromSeq: compactRange.fromSeq,
|
|
151
|
+
compactedToSeq: compactRange.toSeq,
|
|
152
|
+
compactSourceSeqs: compactRange.sourceSeqs,
|
|
153
|
+
compactStrategy: compactRange.strategy,
|
|
154
|
+
}
|
|
155
|
+
: {}),
|
|
133
156
|
};
|
|
134
157
|
}
|
|
135
158
|
/** Reserved output headroom factored into context pressure (v1.36.0). */
|
|
@@ -158,30 +181,31 @@ export async function applyBudgetPolicyAsync(history, phase, opts) {
|
|
|
158
181
|
const warnings = [];
|
|
159
182
|
let { historyTurns, maxToolLoopIterations } = phaseKnobs(phase);
|
|
160
183
|
const envelope = opts?.requestSnapshot ?? null;
|
|
184
|
+
const surface = envelope?.snapshot ?? opts?.requestSurface ?? null;
|
|
161
185
|
// v1.36.0 (case 12): when only the providerStream is available (no routed
|
|
162
186
|
// snapshot yet — first turn, tests), synthesize a DEGRADED replay base so
|
|
163
187
|
// the summarizer still runs on a cold minimal prefix: no cache reuse, but
|
|
164
188
|
// LLM compaction proceeds instead of being silently skipped. The METER
|
|
165
189
|
// stays anchored to real snapshots only (a degraded envelope would add
|
|
166
190
|
// RESERVED_OUTPUT_TOKENS pressure that was never measured).
|
|
167
|
-
const replayBase =
|
|
191
|
+
const replayBase = surface
|
|
168
192
|
? {
|
|
169
|
-
provider:
|
|
170
|
-
model:
|
|
171
|
-
systemMessages:
|
|
172
|
-
tools:
|
|
193
|
+
provider: surface.provider,
|
|
194
|
+
model: surface.model,
|
|
195
|
+
systemMessages: surface.systemMessages,
|
|
196
|
+
tools: surface.tools,
|
|
173
197
|
}
|
|
174
198
|
: opts?.providerStream
|
|
175
199
|
? { provider: 'local', model: opts?.model ?? 'unknown', systemMessages: [], tools: [] }
|
|
176
200
|
: null;
|
|
177
201
|
// Full-request meter (anchored when snapshot+usage are available).
|
|
178
|
-
const headerTokens =
|
|
179
|
-
? estimateSystemTokensLite(
|
|
180
|
-
estimateToolSchemaTokensLite(
|
|
202
|
+
const headerTokens = surface
|
|
203
|
+
? estimateSystemTokensLite(surface.systemMessages) +
|
|
204
|
+
estimateToolSchemaTokensLite(surface.tools)
|
|
181
205
|
: 0;
|
|
182
206
|
const convTokensOf = (h) => estimateConversationTokensLite(h);
|
|
183
207
|
let hist = history;
|
|
184
|
-
let estimated =
|
|
208
|
+
let estimated = surface
|
|
185
209
|
? headerTokens + convTokensOf(hist) + RESERVED_OUTPUT_TOKENS
|
|
186
210
|
: estimateHistoryTokens(hist) + sessionExtra;
|
|
187
211
|
let occupancy = Math.min(1, estimated / contextLimit);
|
|
@@ -189,6 +213,7 @@ export async function applyBudgetPolicyAsync(history, phase, opts) {
|
|
|
189
213
|
let messagesRemoved = 0;
|
|
190
214
|
let cacheReuseExpected;
|
|
191
215
|
let prunedTotal = 0;
|
|
216
|
+
const compactRange = { sourceSeqs: [] };
|
|
192
217
|
if (occupancy >= compact.warnAt && occupancy < compact.compactAt) {
|
|
193
218
|
warnings.push(`[budget] context ~${Math.round(occupancy * 100)}% full (${estimated}/${contextLimit} tok full-request est.) — consider /compact or shorter replies.`);
|
|
194
219
|
}
|
|
@@ -198,7 +223,7 @@ export async function applyBudgetPolicyAsync(history, phase, opts) {
|
|
|
198
223
|
if (pruned.stats.pruned > 0) {
|
|
199
224
|
hist = pruned.messages;
|
|
200
225
|
prunedTotal += pruned.stats.pruned;
|
|
201
|
-
estimated =
|
|
226
|
+
estimated = surface
|
|
202
227
|
? headerTokens + convTokensOf(hist) + RESERVED_OUTPUT_TOKENS
|
|
203
228
|
: estimateHistoryTokens(hist) + sessionExtra;
|
|
204
229
|
occupancy = Math.min(1, estimated / contextLimit);
|
|
@@ -211,11 +236,12 @@ export async function applyBudgetPolicyAsync(history, phase, opts) {
|
|
|
211
236
|
messagesRemoved += r.messagesRemoved;
|
|
212
237
|
if (r.summary)
|
|
213
238
|
compactSummary = r.summary;
|
|
239
|
+
mergeCompactRange(compactRange, r);
|
|
214
240
|
if (r.cacheReuseExpected !== undefined) {
|
|
215
241
|
cacheReuseExpected = r.cacheReuseExpected;
|
|
216
242
|
}
|
|
217
243
|
}
|
|
218
|
-
estimated =
|
|
244
|
+
estimated = surface
|
|
219
245
|
? headerTokens + convTokensOf(hist) + RESERVED_OUTPUT_TOKENS
|
|
220
246
|
: estimateHistoryTokens(hist) + sessionExtra;
|
|
221
247
|
occupancy = Math.min(1, estimated / contextLimit);
|
|
@@ -283,12 +309,20 @@ export async function applyBudgetPolicyAsync(history, phase, opts) {
|
|
|
283
309
|
warnings,
|
|
284
310
|
maxToolLoopIterations,
|
|
285
311
|
historyTurns,
|
|
286
|
-
estimatedHistoryTokens:
|
|
312
|
+
estimatedHistoryTokens: surface ? convTokensOf(hist) : estimated,
|
|
287
313
|
contextLimit,
|
|
288
314
|
occupancy,
|
|
289
315
|
compactSummary: compactSummary || undefined,
|
|
290
316
|
messagesRemoved: messagesRemoved || undefined,
|
|
291
|
-
...(
|
|
317
|
+
...(compactRange.fromSeq !== undefined && compactRange.toSeq !== undefined
|
|
318
|
+
? {
|
|
319
|
+
compactedFromSeq: compactRange.fromSeq,
|
|
320
|
+
compactedToSeq: compactRange.toSeq,
|
|
321
|
+
compactSourceSeqs: compactRange.sourceSeqs,
|
|
322
|
+
compactStrategy: compactRange.strategy,
|
|
323
|
+
}
|
|
324
|
+
: {}),
|
|
325
|
+
...(surface ? { contextPressureTokens: estimated } : {}),
|
|
292
326
|
...(cacheReuseExpected !== undefined ? { cacheReuseExpected } : {}),
|
|
293
327
|
...(cacheMetricsLine ? { cacheMetricsLine } : {}),
|
|
294
328
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenBudget.js","sourceRoot":"","sources":["../../../src/cli/budget/tokenBudget.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tokenBudget.js","sourceRoot":"","sources":["../../../src/cli/budget/tokenBudget.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/compaction.js
CHANGED
|
@@ -16,12 +16,17 @@
|
|
|
16
16
|
* The LLM-summarization path can be added later as a sibling function
|
|
17
17
|
* (e.g. `compactTranscriptWithSummary(messages, providerStream)`) without
|
|
18
18
|
* breaking this contract.
|
|
19
|
+
*
|
|
20
|
+
* @deprecated Compatibility-only UI transcript transform for /compact.
|
|
21
|
+
* Model context compaction is owned by budget/modelContextBuilder.ts.
|
|
19
22
|
*/
|
|
20
23
|
/**
|
|
21
24
|
* Compact a transcript when it exceeds the threshold.
|
|
22
25
|
*
|
|
23
26
|
* Returns the same array reference (with no summary) when compaction
|
|
24
27
|
* isn't needed, so callers can compare references cheaply.
|
|
28
|
+
*
|
|
29
|
+
* @deprecated Use only for the legacy /compact transcript display.
|
|
25
30
|
*/
|
|
26
31
|
export function compactTranscript(messages, options = {}) {
|
|
27
32
|
const threshold = options.threshold ?? 50;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../src/cli/compaction.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../src/cli/compaction.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAwCH;;;;;;;GAOG;AACH,MAAM,UAAU,iBAAiB,CAC/B,QAAuC,EACvC,UAA6B,EAAE;IAE/B,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC;IAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;IAC5C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;IACtC,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC;IAEjC,IAAI,QAAQ,IAAI,SAAS,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC;QACpD,OAAO;YACL,QAAQ;YACR,YAAY,EAAE,CAAC;YACf,aAAa,EAAE,QAAQ;YACvB,cAAc,EAAE,IAAI;SACrB,CAAC;IACJ,CAAC;IAED,oDAAoD;IACpD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,QAAQ,GAAG,SAAS,CAAC;IAC1C,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC;IAExC,MAAM,OAAO,GAAmB;QAC9B,EAAE,EAAE,WAAW,GAAG,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;QAC9D,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,aAAa,YAAY,qCAAqC,SAAS,6CAA6C;QAC7H,EAAE,EAAE,GAAG;KACR,CAAC;IAEF,OAAO;QACL,QAAQ,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC;QAC5B,YAAY;QACZ,aAAa,EAAE,QAAQ;QACvB,cAAc,EAAE,OAAO;KACxB,CAAC;AACJ,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,uBAAuB,CAAC,MAAwB;IAC9D,IAAI,MAAM,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,mCAAmC,MAAM,CAAC,aAAa,6BAA6B,CAAC;IAC9F,CAAC;IACD,OAAO,aAAa,MAAM,CAAC,aAAa,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,sBAAsB,MAAM,CAAC,YAAY,GAAG,CAAC;AACnH,CAAC"}
|
|
@@ -58,4 +58,13 @@ export function shouldRunGauntletHostLoop(opts) {
|
|
|
58
58
|
const phase = opts.phase ?? 'build';
|
|
59
59
|
return phase !== 'plan';
|
|
60
60
|
}
|
|
61
|
+
export function budgetAwareGauntletGate(input) {
|
|
62
|
+
if (input.verdict === 'PASS')
|
|
63
|
+
return 'proceed';
|
|
64
|
+
if (input.toolCallsRemaining <= input.verificationReserve)
|
|
65
|
+
return 'finalize-verify';
|
|
66
|
+
if (input.toolCallsRemaining <= 0)
|
|
67
|
+
return 'hold';
|
|
68
|
+
return 'proceed';
|
|
69
|
+
}
|
|
61
70
|
//# sourceMappingURL=policy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../../src/cli/gauntlet/policy.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;AACpC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;AACpC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AACtC,0EAA0E;AAC1E,MAAM,CAAC,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAE9C,gEAAgE;AAChE,MAAM,CAAC,MAAM,6BAA6B,GAAG;IAC3C,YAAY;IACZ,WAAW;IACX,YAAY;IACZ,MAAM;CACE,CAAC;AAUX,SAAS,MAAM,CAAC,GAAuB,EAAE,QAAgB,EAAE,GAAW,EAAE,GAAW;IACjF,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,EAAE;QAAE,OAAO,QAAQ,CAAC;IACrD,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACnC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QAAE,OAAO,QAAQ,CAAC;IACzC,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,QAAkB,EAClB,MAAyB,OAAO,CAAC,GAAG;IAEpC,IAAI,QAAQ,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACnC,IAAI,QAAQ,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IACrC,MAAM,GAAG,GAAG,GAAG,CAAC,eAAe,CAAC;IAChC,IAAI,CAAC,GAAG;QAAE,OAAO,KAAK,CAAC;IACvB,OAAO,GAAG,KAAK,GAAG,IAAI,GAAG,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAyB,OAAO,CAAC,GAAG;IACtE,MAAM,OAAO,GAAG,GAAG,CAAC,uBAAuB,CAAC;IAC5C,IAAI,WAAW,GAAG,eAAe,CAAC;IAClC,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;QAC5C,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACvC,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,WAAW,GAAG,CAAC,CAAC;IACpD,CAAC;IACD,OAAO;QACL,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,0BAA0B,EAAE,kBAAkB,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5E,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,0BAA0B,EAAE,kBAAkB,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3E,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC,4BAA4B,EAAE,oBAAoB,EAAE,CAAC,EAAE,CAAC,CAAC;QACjF,WAAW;KACZ,CAAC;AACJ,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,yBAAyB,CAAC,IAMzC;IACC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IACnD,IAAI,IAAI,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC;IACnC,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACvF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,OAAO,CAAC;IACpC,OAAO,KAAK,KAAK,MAAM,CAAC;AAC1B,CAAC"}
|
|
1
|
+
{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../../src/cli/gauntlet/policy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* src/cli/harnessManifest.ts — builds and emits the canonical harness
|
|
3
|
+
* manifest for the running CLI session (2.6 Track A, doc §6).
|
|
4
|
+
*
|
|
5
|
+
* Pure assembly: raw prompt texts / policy objects go IN, hashes come OUT
|
|
6
|
+
* (never the raw text). Version resolution follows the updater.ts precedent
|
|
7
|
+
* (`__dirname` + `require`, bundle-safe); everything else is injected so the
|
|
8
|
+
* builder stays unit-testable and deterministic.
|
|
9
|
+
*/
|
|
10
|
+
import { HarnessManifestV1Schema, harnessInputHash, hashHarnessManifest, } from '@zelari/core';
|
|
11
|
+
import { profileHash, toolManifestHash } from '@zelari/core';
|
|
12
|
+
import { getCurrentVersion } from './updater.js';
|
|
13
|
+
function resolveCoreVersion() {
|
|
14
|
+
try {
|
|
15
|
+
// Same bundle-safe precedent as updater.ts getCurrentVersion().
|
|
16
|
+
const pkgPath = require.resolve('@zelari/core/package.json');
|
|
17
|
+
const pkg = require(pkgPath);
|
|
18
|
+
return pkg.version;
|
|
19
|
+
}
|
|
20
|
+
catch {
|
|
21
|
+
return '0.0.0';
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
/** Build + validate + hash the manifest. Throws on invalid assembly. */
|
|
25
|
+
export function buildHarnessManifest(parts) {
|
|
26
|
+
const prompts = {};
|
|
27
|
+
for (const [role, text] of Object.entries(parts.prompts ?? {})) {
|
|
28
|
+
if (typeof text === 'string' && text.length > 0) {
|
|
29
|
+
prompts[role] = harnessInputHash(text);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
const manifest = HarnessManifestV1Schema.parse({
|
|
33
|
+
schemaVersion: 1,
|
|
34
|
+
profile: {
|
|
35
|
+
id: parts.profile.id,
|
|
36
|
+
phase: parts.phase,
|
|
37
|
+
hash: profileHash(parts.profile),
|
|
38
|
+
},
|
|
39
|
+
prompts,
|
|
40
|
+
capabilities: {
|
|
41
|
+
toolManifestHash: toolManifestHash(parts.toolNames),
|
|
42
|
+
skillManifestHash: harnessInputHash([...(parts.skillIds ?? [])].sort()),
|
|
43
|
+
},
|
|
44
|
+
policies: {
|
|
45
|
+
routingHash: harnessInputHash(parts.routing ?? { unset: true }),
|
|
46
|
+
verificationHash: harnessInputHash(parts.verification ?? { engine: 'deterministic' }),
|
|
47
|
+
completionPolicyHash: harnessInputHash(parts.completionPolicy ?? { mode: 'strict', required: '*' }),
|
|
48
|
+
compactionHash: harnessInputHash(parts.compaction ?? { version: 1 }),
|
|
49
|
+
resourcePolicyHash: harnessInputHash(parts.resourcePolicy ?? { unset: true }),
|
|
50
|
+
},
|
|
51
|
+
runtime: {
|
|
52
|
+
coreVersion: parts.coreVersion ?? resolveCoreVersion(),
|
|
53
|
+
cliVersion: parts.cliVersion ?? getCurrentVersion(),
|
|
54
|
+
},
|
|
55
|
+
});
|
|
56
|
+
return { manifest, manifestHash: hashHarnessManifest(manifest) };
|
|
57
|
+
}
|
|
58
|
+
/** Session event payload for `session.harness_manifest` (state-only). */
|
|
59
|
+
export function harnessManifestEventData(manifest, manifestHash) {
|
|
60
|
+
return { manifest, manifestHash };
|
|
61
|
+
}
|
|
62
|
+
//# sourceMappingURL=harnessManifest.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"harnessManifest.js","sourceRoot":"","sources":["../../src/cli/harnessManifest.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EACL,uBAAuB,EACvB,gBAAgB,EAChB,mBAAmB,GAEpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAgB,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AA8BjD,SAAS,kBAAkB;IACzB,IAAI,CAAC;QACH,gEAAgE;QAChE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;QAC7D,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAwB,CAAC;QACpD,OAAO,GAAG,CAAC,OAAO,CAAC;IACrB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,oBAAoB,CAAC,KAA2B;IAI9D,MAAM,OAAO,GAAiC,EAAE,CAAC;IACjD,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;QAC/D,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChD,OAAO,CAAC,IAA0C,CAAC,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IACD,MAAM,QAAQ,GAAsB,uBAAuB,CAAC,KAAK,CAAC;QAChE,aAAa,EAAE,CAAC;QAChB,OAAO,EAAE;YACP,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE;YACpB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;SACjC;QACD,OAAO;QACP,YAAY,EAAE;YACZ,gBAAgB,EAAE,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC;YACnD,iBAAiB,EAAE,gBAAgB,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACxE;QACD,QAAQ,EAAE;YACR,WAAW,EAAE,gBAAgB,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;YAC/D,gBAAgB,EAAE,gBAAgB,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;YACrF,oBAAoB,EAAE,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC;YACnG,cAAc,EAAE,gBAAgB,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;YACpE,kBAAkB,EAAE,gBAAgB,CAAC,KAAK,CAAC,cAAc,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;SAC9E;QACD,OAAO,EAAE;YACP,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,kBAAkB,EAAE;YACtD,UAAU,EAAE,KAAK,CAAC,UAAU,IAAI,iBAAiB,EAAE;SACpD;KACF,CAAC,CAAC;IACH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,mBAAmB,CAAC,QAAQ,CAAC,EAAE,CAAC;AACnE,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,wBAAwB,CAAC,QAA2B,EAAE,YAAoB;IACxF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;AACpC,CAAC"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import { cleanAgentContent } from '@zelari/core';
|
|
2
2
|
import { exportSessionJson, SessionStore, resolveSessionsDir, derivedToAgentMessages, } from '@zelari/core/session';
|
|
3
3
|
import { deriveMissionState } from '@zelari/core/mission';
|
|
4
|
+
import { readSessionLog } from '@zelari/core/session';
|
|
5
|
+
import path from 'node:path';
|
|
4
6
|
import { resolveProfile, toolManifestHash } from '@zelari/core/runtime';
|
|
5
7
|
import { SessionSpineMirror } from './sessionSpine.js';
|
|
8
|
+
import { BudgetRuntime, resolveResourceEnforcement } from './budget/budgetRuntime.js';
|
|
6
9
|
import { defaultProfileForMode } from './headless.js';
|
|
7
10
|
/**
|
|
8
11
|
* E1.4 (ADR-0016/0021): the NDJSON event hosts consume to learn which 2.0
|
|
@@ -46,6 +49,15 @@ export async function openHeadlessSpine(opts) {
|
|
|
46
49
|
};
|
|
47
50
|
const spine = await SessionSpineMirror.adopt(opts.sessionId, mirrorOpts);
|
|
48
51
|
if (spine.status === 'active') {
|
|
52
|
+
// 2.6 Track B (Phase 2/3): count tool calls, emit resource.snapshot.
|
|
53
|
+
const budget = new BudgetRuntime(profileId, { enforcement: resolveResourceEnforcement() });
|
|
54
|
+
if (spine.resumedFromSeq !== undefined && spine.resumedFromSeq > 0) {
|
|
55
|
+
// §9.5 reconstructable state: rebuild usage from the prior log.
|
|
56
|
+
const prior = await readSessionLog(path.join(spine.sessionsDir, opts.sessionId, 'events.jsonl')).catch(() => null);
|
|
57
|
+
if (prior)
|
|
58
|
+
budget.adoptLedgerFromEvents(prior.events);
|
|
59
|
+
}
|
|
60
|
+
spine.attachBudgetRuntime(budget);
|
|
49
61
|
spine.note('headless.profile', { profile: profileId, mode: opts.mode ?? 'kraken' });
|
|
50
62
|
}
|
|
51
63
|
return {
|
|
@@ -60,6 +72,9 @@ export async function openHeadlessSpine(opts) {
|
|
|
60
72
|
userMessage(text) {
|
|
61
73
|
spine.userMessage(text);
|
|
62
74
|
},
|
|
75
|
+
gateResourceToolCall(toolName) {
|
|
76
|
+
return spine.gateResourceToolCall(toolName);
|
|
77
|
+
},
|
|
63
78
|
verificationRun(payload) {
|
|
64
79
|
spine.verificationRun(payload);
|
|
65
80
|
},
|
|
@@ -196,15 +211,16 @@ function filterLegacySeed(legacy) {
|
|
|
196
211
|
export function derivedModelSeed(derived) {
|
|
197
212
|
return derivedToAgentMessages(derived)
|
|
198
213
|
.map((m) => m.role === 'system'
|
|
199
|
-
? { role: 'user'
|
|
214
|
+
? { ...m, role: 'user' }
|
|
200
215
|
: m)
|
|
201
216
|
.map((m) => m.role === 'assistant' && m.content
|
|
202
217
|
? {
|
|
203
|
-
|
|
218
|
+
...m,
|
|
204
219
|
content: cleanAgentContent(m.content, {
|
|
205
220
|
stripQuestion: false,
|
|
206
221
|
stripThink: false,
|
|
207
222
|
}),
|
|
223
|
+
...(m.seq !== undefined ? { seq: m.seq } : {}),
|
|
208
224
|
}
|
|
209
225
|
: m)
|
|
210
226
|
.filter((m) => m.role === 'user' || m.role === 'assistant')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headlessSpine.js","sourceRoot":"","sources":["../../src/cli/headlessSpine.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,kBAAkB,EAClB,sBAAsB,GAGvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAA2B,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"headlessSpine.js","sourceRoot":"","sources":["../../src/cli/headlessSpine.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,kBAAkB,EAClB,sBAAsB,GAGvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAA2B,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAEtF,OAAO,EAAE,qBAAqB,EAAqB,MAAM,eAAe,CAAC;AAsCzE;;;;;;;;GAQG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAA2B;IAK7D,OAAO;QACL,IAAI,EAAE,iBAAiB;QACvB,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM;KAC3B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,IAA8B,EAC9B,QAAiB;IAEjB,IAAI,QAAQ;QAAE,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;IACjD,OAAO,qBAAqB,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAOvC;IACC,MAAM,SAAS,GAAG,wBAAwB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACpE,IAAI,YAAY,GAAsB,EAAE,CAAC;IACzC,IAAI,CAAC;QACH,YAAY,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,YAAY,GAAG,EAAE,CAAC;IACpB,CAAC;IACD,MAAM,KAAK,GAA4B;QACrC,OAAO,EAAE,SAAS;QAClB,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,EAAE;QAC1C,gBAAgB,EAAE,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS;KACvF,CAAC;IACF,MAAM,UAAU,GAAuB;QACrC,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,YAAY,EAAE,KAAK;KACpB,CAAC;IACF,MAAM,KAAK,GAAG,MAAM,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACzE,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC9B,qEAAqE;QACrE,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,SAAS,EAAE,EAAE,WAAW,EAAE,0BAA0B,EAAE,EAAE,CAAC,CAAC;QAC3F,IAAI,KAAK,CAAC,cAAc,KAAK,SAAS,IAAI,KAAK,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC;YACnE,gEAAgE;YAChE,MAAM,KAAK,GAAG,MAAM,cAAc,CAChC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAC7D,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;YACpB,IAAI,KAAK;gBAAE,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACxD,CAAC;QACD,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAClC,KAAK,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,QAAQ,EAAE,CAAC,CAAC;IACtF,CAAC;IAED,OAAO;QACL,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,SAAS;QACT,KAAK;QACL,OAAO,CAAC,EAAW;YACjB,IAAI,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,MAAM,IAAI,EAAE,EAAE,CAAC;gBACjD,KAAK,CAAC,gBAAgB,CAAC,EAAgB,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;QACD,WAAW,CAAC,IAAY;YACtB,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QACD,oBAAoB,CAAC,QAAgB;YACnC,OAAO,KAAK,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAC9C,CAAC;QACD,eAAe,CAAC,OAAgC;YAC9C,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;QACD,WAAW,CAAC,KAAwB;YAClC,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAClC,CAAC;QACD,mBAAmB;YACjB,OAAO,KAAK,CAAC,mBAAmB,EAAE,CAAC;QACrC,CAAC;QACD,YAAY,CAAC,KAAa,EAAE,IAAa;YACvC,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAClC,CAAC;QACD,eAAe,CAAC,MAMf;YACC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,IAAY,EAAE,IAA8B;YAC/C,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACzB,CAAC;QACD,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,WAAW;YAC9B,MAAM,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,IAAa;YAC3B,IAAI,IAAI;gBAAE,KAAK,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YACrD,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACxB,CAAC;QACD,KAAK,CAAC,UAAU;YACd,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC,kBAAkB,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;gBAC9E,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAAE,OAAO,IAAI,CAAC;gBACvD,OAAO,MAAM,iBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACxD,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED,6EAA6E;AAC7E,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,SAAiB,EACjB,OAAgB;IAEhB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;YACrC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,sBAAsB,SAAS,EAAE,EAAE,CAAC;QACjE,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,CAAC;IACvE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;IAChF,CAAC;AACH,CAAC;AAED,oEAAoE;AACpE,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,SAAiB,EACjB,OAAgB;IAEhB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAClD,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACrD,OAAO,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAWD;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,MAA2B,EAC3B,MAAgC;IAEhC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC;IAC5B,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC5C,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAC9E,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,iBAAiB,EAAE,CAAC;IAClD,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpC,OAAO,EAAE,OAAO,EAAE,gBAAgB,CAAC,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IACpF,CAAC;IACD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IAC5D,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACtB,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;IACD,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACrB,MAAM,OAAO,GAAG,CAAC,MAAM,MAAM,CAAC,iBAAiB,EAAE,CAAC,IAAI,EAAE,CAAC;IACzD,OAAO;QACL,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC;QAClC,aAAa,EAAE,UAAU,CAAC,MAAM;QAChC,MAAM,EAAE,cAAc;KACvB,CAAC;AACJ,CAAC;AAED,mFAAmF;AACnF,SAAS,gBAAgB,CAAC,MAAgC;IACxD,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;SAClB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC;SAC1D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,CAAC,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,OAAO;QACjC,CAAC,CAAC;YACE,IAAI,EAAE,WAAoB;YAC1B,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,OAAO,EAAE;gBACpC,aAAa,EAAE,KAAK;gBACpB,UAAU,EAAE,KAAK;aAClB,CAAC;SACH;QACH,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAA4B,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,EAAE,EAAE,CACvE;SACA,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACxD,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAkC;IACjE,OAAO,sBAAsB,CAAC,OAAO,CAAC;SACnC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,CAAC,CAAC,IAAI,KAAK,QAAQ;QACjB,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE;QACjC,CAAC,CAAC,CAAC,CACN;SACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,CAAC,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,OAAO;QACjC,CAAC,CAAC;YACE,GAAG,CAAC;YACJ,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,OAAO,EAAE;gBACpC,aAAa,EAAE,KAAK;gBACpB,UAAU,EAAE,KAAK;aAClB,CAAC;YACF,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC/C;QACH,CAAC,CAAC,CAAC,CACN;SACA,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC;SAC1D,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACxD,CAAC"}
|
|
@@ -29,6 +29,45 @@ import { llmSummarizeHistoryReplay, } from "../budget/llmCompact.js";
|
|
|
29
29
|
import { envNumber } from "../utils/envNumber.js";
|
|
30
30
|
/** Marker prepended when messages are dropped (legacy short form). */
|
|
31
31
|
const COMPACT_MARKER = "[history] Earlier turns were compacted to stay within the context budget.";
|
|
32
|
+
/** Min/max spine seq of dropped messages. Undefined when any dropped msg lacks seq. */
|
|
33
|
+
export function compactedRangeFromDropped(dropped) {
|
|
34
|
+
if (dropped.length === 0)
|
|
35
|
+
return undefined;
|
|
36
|
+
const seqs = [];
|
|
37
|
+
const sources = [];
|
|
38
|
+
for (const m of dropped) {
|
|
39
|
+
const hasCompactRange = typeof m.compactedFromSeq === 'number' &&
|
|
40
|
+
Number.isInteger(m.compactedFromSeq) &&
|
|
41
|
+
m.compactedFromSeq > 0 &&
|
|
42
|
+
typeof m.compactedToSeq === 'number' &&
|
|
43
|
+
Number.isInteger(m.compactedToSeq) &&
|
|
44
|
+
m.compactedToSeq >= m.compactedFromSeq;
|
|
45
|
+
if (hasCompactRange) {
|
|
46
|
+
seqs.push(m.compactedFromSeq, m.compactedToSeq);
|
|
47
|
+
sources.push(...(m.sourceEventSeqs ?? []));
|
|
48
|
+
if (typeof m.seq === 'number' && Number.isInteger(m.seq) && m.seq > 0) {
|
|
49
|
+
seqs.push(m.seq);
|
|
50
|
+
sources.push(m.seq);
|
|
51
|
+
}
|
|
52
|
+
continue;
|
|
53
|
+
}
|
|
54
|
+
if (typeof m.seq !== 'number' || !Number.isInteger(m.seq) || m.seq < 1)
|
|
55
|
+
return undefined;
|
|
56
|
+
seqs.push(m.seq);
|
|
57
|
+
sources.push(m.seq);
|
|
58
|
+
}
|
|
59
|
+
return {
|
|
60
|
+
fromSeq: Math.min(...seqs),
|
|
61
|
+
toSeq: Math.max(...seqs),
|
|
62
|
+
sourceEventSeqs: [...new Set(sources)],
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
function withDroppedRange(result, dropped, strategy) {
|
|
66
|
+
const range = compactedRangeFromDropped(dropped);
|
|
67
|
+
if (!range)
|
|
68
|
+
return { ...result, strategy };
|
|
69
|
+
return { ...result, ...range, strategy };
|
|
70
|
+
}
|
|
32
71
|
/**
|
|
33
72
|
* Resolve the effective max-messages cap from options or the env var.
|
|
34
73
|
* Returns 0 to signal "history disabled" (caller should short-circuit).
|
|
@@ -181,13 +220,20 @@ export function compactHistory(messages, opts) {
|
|
|
181
220
|
*/
|
|
182
221
|
const CHECKPOINT_WRAPPER_PREFIX = 'This is an automatically generated checkpoint of earlier conversation. ' +
|
|
183
222
|
'Treat it as established context and continue directly.';
|
|
184
|
-
export function buildCheckpointMessage(summaryText) {
|
|
223
|
+
export function buildCheckpointMessage(summaryText, range) {
|
|
185
224
|
return {
|
|
186
225
|
role: 'user',
|
|
187
226
|
content: CHECKPOINT_WRAPPER_PREFIX +
|
|
188
227
|
'\n\n<compacted-summary>\n' +
|
|
189
228
|
summaryText +
|
|
190
229
|
'\n</compacted-summary>',
|
|
230
|
+
...(range
|
|
231
|
+
? {
|
|
232
|
+
compactedFromSeq: range.fromSeq,
|
|
233
|
+
compactedToSeq: range.toSeq,
|
|
234
|
+
sourceEventSeqs: [...range.sourceEventSeqs],
|
|
235
|
+
}
|
|
236
|
+
: {}),
|
|
191
237
|
};
|
|
192
238
|
}
|
|
193
239
|
/**
|
|
@@ -196,7 +242,7 @@ export function buildCheckpointMessage(summaryText) {
|
|
|
196
242
|
export function compactHistoryDetailed(messages, opts) {
|
|
197
243
|
const maxMessages = resolveMaxMessages(opts);
|
|
198
244
|
if (maxMessages === 0) {
|
|
199
|
-
return { messages: [], compacted: true, messagesRemoved: messages.length, summary:
|
|
245
|
+
return withDroppedRange({ messages: [], compacted: true, messagesRemoved: messages.length, summary: '' }, messages, 'extractive');
|
|
200
246
|
}
|
|
201
247
|
// Trigger at 2× cap so we don't compact on every single turn (amortize).
|
|
202
248
|
// v1.36.0 (P8): occupancy-driven callers pass force=true so high TOKEN
|
|
@@ -220,17 +266,18 @@ export function compactHistoryDetailed(messages, opts) {
|
|
|
220
266
|
};
|
|
221
267
|
}
|
|
222
268
|
const droppedMsgs = messages.slice(0, cut);
|
|
269
|
+
const droppedRange = compactedRangeFromDropped(droppedMsgs);
|
|
223
270
|
const pruned = pruneToolResultsDetailed(messages.slice(cut));
|
|
224
271
|
const kept = pruned.messages;
|
|
225
272
|
const summaryText = extractiveHistorySummary(droppedMsgs);
|
|
226
|
-
const summary = buildCheckpointMessage(summaryText || `${COMPACT_MARKER} ${cut} earlier message(s) dropped
|
|
227
|
-
return {
|
|
273
|
+
const summary = buildCheckpointMessage(summaryText || `${COMPACT_MARKER} ${cut} earlier message(s) dropped.`, droppedRange);
|
|
274
|
+
return withDroppedRange({
|
|
228
275
|
messages: [summary, ...kept],
|
|
229
276
|
compacted: true,
|
|
230
277
|
messagesRemoved: cut,
|
|
231
278
|
summary: summary.content,
|
|
232
279
|
prunedToolResults: pruned.stats.pruned,
|
|
233
|
-
};
|
|
280
|
+
}, droppedMsgs, 'extractive');
|
|
234
281
|
}
|
|
235
282
|
/**
|
|
236
283
|
* Async compaction: extractive summary, then optional LLM rewrite when
|
|
@@ -275,8 +322,9 @@ export async function compactHistoryAsync(messages, opts) {
|
|
|
275
322
|
}
|
|
276
323
|
const pruned = pruneToolResultsDetailed(messages.slice(cut));
|
|
277
324
|
const kept = pruned.messages;
|
|
278
|
-
const summary = buildCheckpointMessage(summaryText);
|
|
279
|
-
|
|
325
|
+
const summary = buildCheckpointMessage(summaryText, compactedRangeFromDropped(droppedMsgs));
|
|
326
|
+
const usedLlm = summaryText !== extractive && summaryText.trim().length > 40;
|
|
327
|
+
return withDroppedRange({
|
|
280
328
|
messages: [summary, ...kept],
|
|
281
329
|
compacted: true,
|
|
282
330
|
messagesRemoved: cut,
|
|
@@ -284,7 +332,7 @@ export async function compactHistoryAsync(messages, opts) {
|
|
|
284
332
|
prunedToolResults: pruned.stats.pruned,
|
|
285
333
|
cacheReuseExpected,
|
|
286
334
|
replayExactPrefix,
|
|
287
|
-
};
|
|
335
|
+
}, droppedMsgs, usedLlm ? 'llm' : 'extractive');
|
|
288
336
|
}
|
|
289
337
|
/** Rough chars/4 token estimate over content + tool args (local, no cycle). */
|
|
290
338
|
function roughTokens(msgs) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"historyCompaction.js","sourceRoot":"","sources":["../../../src/cli/hooks/historyCompaction.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"historyCompaction.js","sourceRoot":"","sources":["../../../src/cli/hooks/historyCompaction.ts"],"names":[],"mappings":"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"}
|