@roackb2/heddle 0.0.25 → 0.0.27
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/README.md +3 -2
- package/dist/src/cli/ask.d.ts +3 -0
- package/dist/src/cli/ask.d.ts.map +1 -1
- package/dist/src/cli/ask.js +85 -2
- package/dist/src/cli/ask.js.map +1 -1
- package/dist/src/cli/chat/App.d.ts.map +1 -1
- package/dist/src/cli/chat/App.js +104 -8
- package/dist/src/cli/chat/App.js.map +1 -1
- package/dist/src/cli/chat/debug/tui-debug-snapshot.d.ts +49 -0
- package/dist/src/cli/chat/debug/tui-debug-snapshot.d.ts.map +1 -0
- package/dist/src/cli/chat/debug/tui-debug-snapshot.js +103 -0
- package/dist/src/cli/chat/debug/tui-debug-snapshot.js.map +1 -0
- package/dist/src/cli/chat/debug/tui-frame-recorder.d.ts +20 -0
- package/dist/src/cli/chat/debug/tui-frame-recorder.d.ts.map +1 -0
- package/dist/src/cli/chat/debug/tui-frame-recorder.js +75 -0
- package/dist/src/cli/chat/debug/tui-frame-recorder.js.map +1 -0
- package/dist/src/cli/chat/hooks/useAgentRun.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/useAgentRun.js +93 -22
- package/dist/src/cli/chat/hooks/useAgentRun.js.map +1 -1
- package/dist/src/cli/chat/hooks/useChatSessions.js +1 -1
- package/dist/src/cli/chat/hooks/useChatSessions.js.map +1 -1
- package/dist/src/cli/chat/hooks/usePromptSubmission.d.ts +2 -1
- package/dist/src/cli/chat/hooks/usePromptSubmission.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/usePromptSubmission.js +11 -1
- package/dist/src/cli/chat/hooks/usePromptSubmission.js.map +1 -1
- package/dist/src/cli/chat/index.d.ts.map +1 -1
- package/dist/src/cli/chat/index.js +15 -1
- package/dist/src/cli/chat/index.js.map +1 -1
- package/dist/src/cli/chat/state/compaction.d.ts +1 -1
- package/dist/src/cli/chat/state/compaction.d.ts.map +1 -1
- package/dist/src/cli/chat/state/compaction.js +1 -1
- package/dist/src/cli/chat/state/compaction.js.map +1 -1
- package/dist/src/cli/chat/state/local-commands.d.ts +3 -1
- package/dist/src/cli/chat/state/local-commands.d.ts.map +1 -1
- package/dist/src/cli/chat/state/local-commands.js +49 -1
- package/dist/src/cli/chat/state/local-commands.js.map +1 -1
- package/dist/src/cli/chat/submit.d.ts +1 -0
- package/dist/src/cli/chat/submit.d.ts.map +1 -1
- package/dist/src/cli/chat/submit.js +39 -16
- package/dist/src/cli/chat/submit.js.map +1 -1
- package/dist/src/cli/chat/utils/runtime.d.ts +11 -0
- package/dist/src/cli/chat/utils/runtime.d.ts.map +1 -1
- package/dist/src/cli/chat/utils/runtime.js.map +1 -1
- package/dist/src/cli/main.js +12 -2
- package/dist/src/cli/main.js.map +1 -1
- package/dist/src/core/chat/archive.d.ts +19 -0
- package/dist/src/core/chat/archive.d.ts.map +1 -0
- package/dist/src/core/chat/archive.js +129 -0
- package/dist/src/core/chat/archive.js.map +1 -0
- package/dist/src/core/chat/compaction.d.ts +39 -2
- package/dist/src/core/chat/compaction.d.ts.map +1 -1
- package/dist/src/core/chat/compaction.js +309 -19
- package/dist/src/core/chat/compaction.js.map +1 -1
- package/dist/src/core/chat/conversation-lines.d.ts.map +1 -1
- package/dist/src/core/chat/conversation-lines.js +4 -1
- package/dist/src/core/chat/conversation-lines.js.map +1 -1
- package/dist/src/core/chat/session-submit.d.ts +7 -0
- package/dist/src/core/chat/session-submit.d.ts.map +1 -1
- package/dist/src/core/chat/session-submit.js +62 -6
- package/dist/src/core/chat/session-submit.js.map +1 -1
- package/dist/src/core/chat/storage.d.ts +2 -1
- package/dist/src/core/chat/storage.d.ts.map +1 -1
- package/dist/src/core/chat/storage.js +34 -1
- package/dist/src/core/chat/storage.js.map +1 -1
- package/dist/src/core/chat/types.d.ts +21 -0
- package/dist/src/core/chat/types.d.ts.map +1 -1
- package/dist/src/core/tools/file-edit-core.js +0 -4
- package/dist/src/core/tools/file-edit-core.js.map +1 -1
- package/dist/src/server/features/control-plane/router.d.ts +27 -0
- package/dist/src/server/features/control-plane/router.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/router.js +19 -1
- package/dist/src/server/features/control-plane/router.js.map +1 -1
- package/dist/src/server/features/control-plane/services/chat-sessions.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/services/chat-sessions.js +58 -9
- package/dist/src/server/features/control-plane/services/chat-sessions.js.map +1 -1
- package/dist/src/server/features/control-plane/services/heartbeat.d.ts +2 -0
- package/dist/src/server/features/control-plane/services/heartbeat.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/services/heartbeat.js +46 -1
- package/dist/src/server/features/control-plane/services/heartbeat.js.map +1 -1
- package/dist/src/server/features/control-plane/types.d.ts +22 -1
- package/dist/src/server/features/control-plane/types.d.ts.map +1 -1
- package/dist/src/server/router.d.ts +27 -0
- package/dist/src/server/router.d.ts.map +1 -1
- package/dist/src/web/assets/index-BPZ31ir-.js +12 -0
- package/dist/src/web/assets/index-C9sFoCL6.css +2 -0
- package/dist/src/web/index.html +3 -3
- package/package.json +2 -1
- package/dist/src/web/assets/index-C9ux8zc8.js +0 -12
- package/dist/src/web/assets/index-D6c7O-7y.css +0 -2
|
@@ -1,12 +1,151 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createLlmAdapter, inferProviderFromModel } from '../../index.js';
|
|
2
|
+
import { resolveApiKeyForModel } from '../runtime/api-keys.js';
|
|
2
3
|
import { estimateBuiltInContextWindow } from '../llm/openai-models.js';
|
|
4
|
+
import { createArchiveId, deriveChatArchivePaths, loadChatArchiveManifest, readArchiveSummaryMarkdown, saveChatArchiveManifest, updateChatArchiveManifest, writeArchivedMessagesJsonl, writeArchiveSummaryMarkdown, } from './archive.js';
|
|
3
5
|
const DEFAULT_CONTEXT_WINDOW_ESTIMATE = 200_000;
|
|
4
6
|
const MAX_HISTORY_RATIO = 0.6;
|
|
5
7
|
const MIN_RECENT_MESSAGES = 16;
|
|
6
8
|
const MIN_FORCED_RECENT_MESSAGES = 3;
|
|
7
|
-
const
|
|
8
|
-
const MAX_SUMMARY_CHARS = 4_000;
|
|
9
|
+
const MAX_ROLLING_SUMMARY_CHARS = 12_000;
|
|
9
10
|
const COMPACTED_HISTORY_MARKER = 'Heddle compacted earlier conversation history.';
|
|
11
|
+
const DEFAULT_OPENAI_COMPACTION_MODEL = 'gpt-5.1-codex-mini';
|
|
12
|
+
const DEFAULT_ANTHROPIC_COMPACTION_MODEL = 'claude-haiku-4-5';
|
|
13
|
+
export async function compactChatHistoryWithArchive(options) {
|
|
14
|
+
const estimatedWindow = estimateBuiltInContextWindow(options.model) ?? DEFAULT_CONTEXT_WINDOW_ESTIMATE;
|
|
15
|
+
const maxHistoryTokens = Math.floor(estimatedWindow * MAX_HISTORY_RATIO);
|
|
16
|
+
const minRecentMessages = options.force ? MIN_FORCED_RECENT_MESSAGES : MIN_RECENT_MESSAGES;
|
|
17
|
+
const needsCompaction = estimateChatHistoryTokens(options.history) > maxHistoryTokens
|
|
18
|
+
|| (Boolean(options.force) && countNonCompactedMessages(options.history) > 0);
|
|
19
|
+
if (!needsCompaction) {
|
|
20
|
+
const manifest = loadChatArchiveManifest(options.stateRoot, options.sessionId);
|
|
21
|
+
return {
|
|
22
|
+
history: options.history,
|
|
23
|
+
context: buildContextStats({
|
|
24
|
+
history: options.history,
|
|
25
|
+
usage: options.usage,
|
|
26
|
+
estimatedRequestTokens: estimateRequestTokens({
|
|
27
|
+
history: options.history,
|
|
28
|
+
systemContext: options.systemContext,
|
|
29
|
+
toolNames: options.toolNames ?? [],
|
|
30
|
+
goal: options.goal,
|
|
31
|
+
}),
|
|
32
|
+
archives: manifest.archives,
|
|
33
|
+
currentSummaryPath: manifest.currentSummaryPath,
|
|
34
|
+
}),
|
|
35
|
+
archives: manifest.archives,
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
const splitIndex = findCompactionSplit(options.history, minRecentMessages);
|
|
39
|
+
if (splitIndex <= 0 || splitIndex >= options.history.length) {
|
|
40
|
+
const manifest = loadChatArchiveManifest(options.stateRoot, options.sessionId);
|
|
41
|
+
return {
|
|
42
|
+
history: options.history,
|
|
43
|
+
context: buildContextStats({
|
|
44
|
+
history: options.history,
|
|
45
|
+
usage: options.usage,
|
|
46
|
+
estimatedRequestTokens: estimateRequestTokens({
|
|
47
|
+
history: options.history,
|
|
48
|
+
systemContext: options.systemContext,
|
|
49
|
+
toolNames: options.toolNames ?? [],
|
|
50
|
+
goal: options.goal,
|
|
51
|
+
}),
|
|
52
|
+
archives: manifest.archives,
|
|
53
|
+
currentSummaryPath: manifest.currentSummaryPath,
|
|
54
|
+
}),
|
|
55
|
+
archives: manifest.archives,
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
const archivedMessages = options.history.slice(0, splitIndex);
|
|
59
|
+
const recentMessages = options.history.slice(splitIndex);
|
|
60
|
+
const manifest = loadChatArchiveManifest(options.stateRoot, options.sessionId);
|
|
61
|
+
const previousRollingSummary = (manifest.currentSummaryPath ? readArchiveSummaryMarkdown(manifest.currentSummaryPath, options.stateRoot) : undefined)
|
|
62
|
+
?? extractPriorSummary(options.history);
|
|
63
|
+
const archiveId = createArchiveId();
|
|
64
|
+
const archivePath = writeArchivedMessagesJsonl(options.stateRoot, options.sessionId, archiveId, archivedMessages);
|
|
65
|
+
options.onStatusChange?.({ status: 'running', archivePath });
|
|
66
|
+
try {
|
|
67
|
+
const summarizer = resolveSummarizer(options);
|
|
68
|
+
if (!summarizer.llm) {
|
|
69
|
+
throw new Error(`Missing provider API key for ${summarizer.model}`);
|
|
70
|
+
}
|
|
71
|
+
const rollingSummary = await summarizeChatArchive({
|
|
72
|
+
llm: summarizer.llm,
|
|
73
|
+
summaryModel: summarizer.model,
|
|
74
|
+
sessionId: options.sessionId,
|
|
75
|
+
archivePath,
|
|
76
|
+
manifest,
|
|
77
|
+
previousRollingSummary,
|
|
78
|
+
archivedMessages,
|
|
79
|
+
});
|
|
80
|
+
const summaryPath = writeArchiveSummaryMarkdown(options.stateRoot, options.sessionId, archiveId, rollingSummary);
|
|
81
|
+
const archiveRecord = {
|
|
82
|
+
id: archiveId,
|
|
83
|
+
path: archivePath,
|
|
84
|
+
summaryPath,
|
|
85
|
+
shortDescription: deriveShortDescription(rollingSummary),
|
|
86
|
+
messageCount: countNonCompactedMessages(archivedMessages),
|
|
87
|
+
createdAt: new Date().toISOString(),
|
|
88
|
+
summaryModel: summarizer.model,
|
|
89
|
+
};
|
|
90
|
+
const nextManifest = updateChatArchiveManifest(manifest, archiveRecord);
|
|
91
|
+
saveChatArchiveManifest(options.stateRoot, options.sessionId, nextManifest);
|
|
92
|
+
const compactedHistory = [
|
|
93
|
+
buildCompactedSummaryMessage({
|
|
94
|
+
sessionId: options.sessionId,
|
|
95
|
+
rollingSummary,
|
|
96
|
+
archives: nextManifest.archives,
|
|
97
|
+
}),
|
|
98
|
+
...recentMessages,
|
|
99
|
+
];
|
|
100
|
+
options.onStatusChange?.({
|
|
101
|
+
status: 'finished',
|
|
102
|
+
archivePath: archiveRecord.path,
|
|
103
|
+
summaryPath: archiveRecord.summaryPath,
|
|
104
|
+
});
|
|
105
|
+
return {
|
|
106
|
+
history: compactedHistory,
|
|
107
|
+
context: buildContextStats({
|
|
108
|
+
history: compactedHistory,
|
|
109
|
+
usage: options.usage,
|
|
110
|
+
compactedMessages: archiveRecord.messageCount,
|
|
111
|
+
estimatedRequestTokens: estimateRequestTokens({
|
|
112
|
+
history: compactedHistory,
|
|
113
|
+
systemContext: options.systemContext,
|
|
114
|
+
toolNames: options.toolNames ?? [],
|
|
115
|
+
goal: options.goal,
|
|
116
|
+
}),
|
|
117
|
+
compactedAt: archiveRecord.createdAt,
|
|
118
|
+
archives: nextManifest.archives,
|
|
119
|
+
currentSummaryPath: nextManifest.currentSummaryPath,
|
|
120
|
+
lastArchivePath: archiveRecord.path,
|
|
121
|
+
}),
|
|
122
|
+
archives: nextManifest.archives,
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
catch (error) {
|
|
126
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
127
|
+
options.onStatusChange?.({ status: 'failed', archivePath, error: message });
|
|
128
|
+
return {
|
|
129
|
+
history: options.history,
|
|
130
|
+
context: buildContextStats({
|
|
131
|
+
history: options.history,
|
|
132
|
+
usage: options.usage,
|
|
133
|
+
estimatedRequestTokens: estimateRequestTokens({
|
|
134
|
+
history: options.history,
|
|
135
|
+
systemContext: options.systemContext,
|
|
136
|
+
toolNames: options.toolNames ?? [],
|
|
137
|
+
goal: options.goal,
|
|
138
|
+
}),
|
|
139
|
+
compactionStatus: 'failed',
|
|
140
|
+
compactionError: message,
|
|
141
|
+
archives: manifest.archives,
|
|
142
|
+
currentSummaryPath: manifest.currentSummaryPath,
|
|
143
|
+
lastArchivePath: archivePath,
|
|
144
|
+
}),
|
|
145
|
+
archives: manifest.archives,
|
|
146
|
+
};
|
|
147
|
+
}
|
|
148
|
+
}
|
|
10
149
|
export function compactChatHistory(options) {
|
|
11
150
|
const estimatedWindow = estimateBuiltInContextWindow(options.model) ?? DEFAULT_CONTEXT_WINDOW_ESTIMATE;
|
|
12
151
|
const maxHistoryTokens = Math.floor(estimatedWindow * MAX_HISTORY_RATIO);
|
|
@@ -20,7 +159,7 @@ export function compactChatHistory(options) {
|
|
|
20
159
|
break;
|
|
21
160
|
}
|
|
22
161
|
compactedMessages += countNonCompactedMessages(nextHistory.slice(0, splitIndex));
|
|
23
|
-
nextHistory =
|
|
162
|
+
nextHistory = buildLegacyCompactedHistory(nextHistory, splitIndex);
|
|
24
163
|
}
|
|
25
164
|
return {
|
|
26
165
|
history: nextHistory,
|
|
@@ -28,6 +167,7 @@ export function compactChatHistory(options) {
|
|
|
28
167
|
history: nextHistory,
|
|
29
168
|
usage: options.usage,
|
|
30
169
|
compactedMessages,
|
|
170
|
+
compactedAt: compactedMessages > 0 ? new Date().toISOString() : undefined,
|
|
31
171
|
estimatedRequestTokens: estimateRequestTokens({
|
|
32
172
|
history: nextHistory,
|
|
33
173
|
systemContext: options.systemContext,
|
|
@@ -43,6 +183,17 @@ export function estimateChatHistoryTokens(history) {
|
|
|
43
183
|
export function isCompactedHistorySummary(message) {
|
|
44
184
|
return message.role === 'system' && message.content.startsWith(COMPACTED_HISTORY_MARKER);
|
|
45
185
|
}
|
|
186
|
+
export function buildCompactionRunningContext(options) {
|
|
187
|
+
return {
|
|
188
|
+
...options.previous,
|
|
189
|
+
estimatedHistoryTokens: estimateChatHistoryTokens(options.history),
|
|
190
|
+
compactionStatus: 'running',
|
|
191
|
+
compactionError: undefined,
|
|
192
|
+
archiveCount: options.archiveCount ?? options.previous?.archiveCount,
|
|
193
|
+
currentSummaryPath: options.currentSummaryPath ?? options.previous?.currentSummaryPath,
|
|
194
|
+
lastArchivePath: options.lastArchivePath ?? options.previous?.lastArchivePath,
|
|
195
|
+
};
|
|
196
|
+
}
|
|
46
197
|
function buildContextStats(options) {
|
|
47
198
|
return {
|
|
48
199
|
estimatedHistoryTokens: estimateChatHistoryTokens(options.history),
|
|
@@ -52,18 +203,23 @@ function buildContextStats(options) {
|
|
|
52
203
|
lastRunTotalTokens: options.usage?.totalTokens,
|
|
53
204
|
cachedInputTokens: options.usage?.cachedInputTokens,
|
|
54
205
|
reasoningTokens: options.usage?.reasoningTokens,
|
|
55
|
-
compactedMessages: options.compactedMessages > 0 ? options.compactedMessages : undefined,
|
|
56
|
-
compactedAt: options.
|
|
206
|
+
compactedMessages: options.compactedMessages && options.compactedMessages > 0 ? options.compactedMessages : undefined,
|
|
207
|
+
compactedAt: options.compactedAt,
|
|
208
|
+
compactionStatus: options.compactionStatus ?? 'idle',
|
|
209
|
+
compactionError: options.compactionError,
|
|
210
|
+
archiveCount: options.archives?.length || undefined,
|
|
211
|
+
currentSummaryPath: options.currentSummaryPath,
|
|
212
|
+
lastArchivePath: options.lastArchivePath,
|
|
57
213
|
};
|
|
58
214
|
}
|
|
59
|
-
function
|
|
215
|
+
function buildLegacyCompactedHistory(history, splitIndex) {
|
|
60
216
|
const archived = history.slice(0, splitIndex);
|
|
61
217
|
const recent = history.slice(splitIndex);
|
|
62
218
|
const priorSummary = extractPriorSummary(archived);
|
|
63
219
|
const visibleLines = archived
|
|
64
220
|
.filter((message) => !isCompactedHistorySummary(message))
|
|
65
|
-
.flatMap(
|
|
66
|
-
.slice(-
|
|
221
|
+
.flatMap(summarizeMessageForLegacyCompaction)
|
|
222
|
+
.slice(-12);
|
|
67
223
|
const summaryParts = [COMPACTED_HISTORY_MARKER];
|
|
68
224
|
if (priorSummary) {
|
|
69
225
|
summaryParts.push('', 'Earlier compacted summary:', priorSummary);
|
|
@@ -71,20 +227,123 @@ function buildCompactedHistory(history, splitIndex) {
|
|
|
71
227
|
if (visibleLines.length > 0) {
|
|
72
228
|
summaryParts.push('', 'More recent archived turns:', ...visibleLines);
|
|
73
229
|
}
|
|
74
|
-
|
|
230
|
+
return [{
|
|
231
|
+
role: 'system',
|
|
232
|
+
content: truncateSummary(summaryParts.join('\n')),
|
|
233
|
+
}, ...recent];
|
|
234
|
+
}
|
|
235
|
+
function buildCompactedSummaryMessage(options) {
|
|
236
|
+
const archivePaths = options.archives
|
|
237
|
+
.slice(-8)
|
|
238
|
+
.map((archive) => `- ${archive.path}: ${archive.shortDescription ?? `${archive.messageCount} messages archived`}`);
|
|
239
|
+
const content = [
|
|
240
|
+
COMPACTED_HISTORY_MARKER,
|
|
241
|
+
'',
|
|
242
|
+
`Archive root: ${deriveChatArchivePaths('.', options.sessionId).displayArchivesDir}`,
|
|
243
|
+
'',
|
|
244
|
+
'Current rolling summary:',
|
|
245
|
+
truncateSummary(options.rollingSummary),
|
|
246
|
+
'',
|
|
247
|
+
'Archive index:',
|
|
248
|
+
...(archivePaths.length > 0 ? archivePaths : ['- No archive records found.']),
|
|
249
|
+
'',
|
|
250
|
+
'If exact wording, tool output, or earlier rationale matters, inspect the archive files with normal file tools before relying on this summary.',
|
|
251
|
+
].join('\n');
|
|
252
|
+
return {
|
|
75
253
|
role: 'system',
|
|
76
|
-
content
|
|
254
|
+
content,
|
|
255
|
+
};
|
|
256
|
+
}
|
|
257
|
+
async function summarizeChatArchive(options) {
|
|
258
|
+
const archiveIndex = options.manifest.archives.map((archive) => ({
|
|
259
|
+
id: archive.id,
|
|
260
|
+
path: archive.path,
|
|
261
|
+
summaryPath: archive.summaryPath,
|
|
262
|
+
shortDescription: archive.shortDescription,
|
|
263
|
+
messageCount: archive.messageCount,
|
|
264
|
+
createdAt: archive.createdAt,
|
|
265
|
+
}));
|
|
266
|
+
const transcript = options.archivedMessages
|
|
267
|
+
.map((message, index) => `## Message ${index + 1}\n${renderArchivedMessage(message)}`)
|
|
268
|
+
.join('\n\n');
|
|
269
|
+
const response = await options.llm.chat([
|
|
270
|
+
{
|
|
271
|
+
role: 'system',
|
|
272
|
+
content: [
|
|
273
|
+
'You summarize archived coding-agent conversations for later continuation.',
|
|
274
|
+
'Produce markdown with moderate fidelity and no preamble.',
|
|
275
|
+
'Preserve confirmed facts, user intent, concrete file/code references, decisions, commands, verification, risks, and follow-ups.',
|
|
276
|
+
'Use these exact sections when relevant:',
|
|
277
|
+
'# Compacted Conversation Rolling Summary',
|
|
278
|
+
'## User Goals And Preferences',
|
|
279
|
+
'## Work Completed',
|
|
280
|
+
'## Important Decisions',
|
|
281
|
+
'## Files And Code Areas Touched',
|
|
282
|
+
'## Commands And Verification',
|
|
283
|
+
'## Open Questions / Follow-Ups',
|
|
284
|
+
'## Archive Index',
|
|
285
|
+
'## High-Fidelity Details Worth Retrieving',
|
|
286
|
+
'Integrate the previous rolling summary when present.',
|
|
287
|
+
'Do not invent work that did not happen.',
|
|
288
|
+
].join('\n'),
|
|
289
|
+
},
|
|
290
|
+
{
|
|
291
|
+
role: 'user',
|
|
292
|
+
content: [
|
|
293
|
+
`Session: ${options.sessionId}`,
|
|
294
|
+
`New archive path: ${options.archivePath}`,
|
|
295
|
+
'',
|
|
296
|
+
'Previous rolling summary:',
|
|
297
|
+
options.previousRollingSummary?.trim() || '(none)',
|
|
298
|
+
'',
|
|
299
|
+
'Existing archive index JSON:',
|
|
300
|
+
JSON.stringify(archiveIndex, null, 2),
|
|
301
|
+
'',
|
|
302
|
+
'Newly archived transcript:',
|
|
303
|
+
transcript,
|
|
304
|
+
'',
|
|
305
|
+
'Produce the next cumulative rolling summary for the active history. Keep it concise enough for model context, but detailed enough that another agent can reconstruct the work state.',
|
|
306
|
+
].join('\n'),
|
|
307
|
+
},
|
|
308
|
+
], []);
|
|
309
|
+
const content = response.content?.trim();
|
|
310
|
+
if (!content) {
|
|
311
|
+
throw new Error(`Compaction summarizer returned no content for ${options.summaryModel}`);
|
|
312
|
+
}
|
|
313
|
+
return content;
|
|
314
|
+
}
|
|
315
|
+
function resolveSummarizer(options) {
|
|
316
|
+
if (options.summarizer?.llm) {
|
|
317
|
+
return {
|
|
318
|
+
llm: options.summarizer.llm,
|
|
319
|
+
model: options.summarizer.llm.info?.model ?? options.summarizer.model ?? options.model,
|
|
320
|
+
};
|
|
321
|
+
}
|
|
322
|
+
const provider = options.summarizer?.provider === 'active' || !options.summarizer?.provider ?
|
|
323
|
+
inferProviderFromModel(options.model)
|
|
324
|
+
: options.summarizer.provider;
|
|
325
|
+
const model = options.summarizer?.model
|
|
326
|
+
?? (provider === 'anthropic' ?
|
|
327
|
+
DEFAULT_ANTHROPIC_COMPACTION_MODEL
|
|
328
|
+
: DEFAULT_OPENAI_COMPACTION_MODEL);
|
|
329
|
+
const apiKey = options.summarizer?.apiKey ?? resolveApiKeyForModel(model);
|
|
330
|
+
if (!apiKey) {
|
|
331
|
+
return { model };
|
|
332
|
+
}
|
|
333
|
+
return {
|
|
334
|
+
model,
|
|
335
|
+
llm: createLlmAdapter({ model, apiKey }),
|
|
77
336
|
};
|
|
78
|
-
return [compactedSummary, ...recent];
|
|
79
337
|
}
|
|
80
338
|
function extractPriorSummary(history) {
|
|
81
339
|
const summaryMessage = history.find(isCompactedHistorySummary);
|
|
82
340
|
if (!summaryMessage || summaryMessage.role !== 'system') {
|
|
83
341
|
return undefined;
|
|
84
342
|
}
|
|
85
|
-
|
|
343
|
+
const content = summaryMessage.content.slice(COMPACTED_HISTORY_MARKER.length).trim();
|
|
344
|
+
return content || undefined;
|
|
86
345
|
}
|
|
87
|
-
function
|
|
346
|
+
function summarizeMessageForLegacyCompaction(message) {
|
|
88
347
|
if (message.role === 'user') {
|
|
89
348
|
return [`User: ${truncateLine(message.content, 220)}`];
|
|
90
349
|
}
|
|
@@ -100,11 +359,39 @@ function summarizeMessageForCompaction(message) {
|
|
|
100
359
|
}
|
|
101
360
|
return [];
|
|
102
361
|
}
|
|
362
|
+
function renderArchivedMessage(message) {
|
|
363
|
+
if (message.role === 'assistant') {
|
|
364
|
+
return [
|
|
365
|
+
'Role: assistant',
|
|
366
|
+
message.content ? `Content:\n${message.content}` : 'Content: (empty)',
|
|
367
|
+
message.toolCalls?.length ? `Tool calls:\n${JSON.stringify(message.toolCalls, null, 2)}` : undefined,
|
|
368
|
+
].filter((part) => Boolean(part)).join('\n\n');
|
|
369
|
+
}
|
|
370
|
+
if (message.role === 'tool') {
|
|
371
|
+
return [
|
|
372
|
+
'Role: tool',
|
|
373
|
+
`Tool call id: ${message.toolCallId}`,
|
|
374
|
+
`Content:\n${message.content}`,
|
|
375
|
+
].join('\n\n');
|
|
376
|
+
}
|
|
377
|
+
return [
|
|
378
|
+
`Role: ${message.role}`,
|
|
379
|
+
`Content:\n${message.content}`,
|
|
380
|
+
].join('\n\n');
|
|
381
|
+
}
|
|
382
|
+
function deriveShortDescription(summary) {
|
|
383
|
+
const lines = summary
|
|
384
|
+
.split('\n')
|
|
385
|
+
.map((line) => line.trim())
|
|
386
|
+
.filter((line) => line && !line.startsWith('#'));
|
|
387
|
+
const first = lines[0];
|
|
388
|
+
return first ? truncateLine(first, 120) : undefined;
|
|
389
|
+
}
|
|
103
390
|
function truncateSummary(value) {
|
|
104
|
-
if (value.length <=
|
|
391
|
+
if (value.length <= MAX_ROLLING_SUMMARY_CHARS) {
|
|
105
392
|
return value;
|
|
106
393
|
}
|
|
107
|
-
return `${value.slice(0,
|
|
394
|
+
return `${value.slice(0, MAX_ROLLING_SUMMARY_CHARS - 1).trimEnd()}…`;
|
|
108
395
|
}
|
|
109
396
|
function truncateLine(value, maxChars) {
|
|
110
397
|
const compact = value.replace(/\s+/g, ' ').trim();
|
|
@@ -149,9 +436,12 @@ function estimateTextTokens(text) {
|
|
|
149
436
|
}
|
|
150
437
|
function estimateRequestTokens(options) {
|
|
151
438
|
const syntheticGoal = options.goal ?? 'Continue from the current conversation.';
|
|
152
|
-
const
|
|
153
|
-
|
|
154
|
-
|
|
439
|
+
const systemPromptEstimate = estimateTextTokens([
|
|
440
|
+
syntheticGoal,
|
|
441
|
+
options.systemContext ?? '',
|
|
442
|
+
options.toolNames.join(','),
|
|
443
|
+
].join('\n'));
|
|
444
|
+
return systemPromptEstimate + estimateChatHistoryTokens(options.history) + estimateTextTokens(syntheticGoal) + 24;
|
|
155
445
|
}
|
|
156
446
|
function isAssistantToolCallMessage(message) {
|
|
157
447
|
return message?.role === 'assistant' && !!message.toolCalls && message.toolCalls.length > 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../../../src/core/chat/compaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AAGvE,MAAM,+BAA+B,GAAG,OAAO,CAAC;AAChD,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAC9B,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAC/B,MAAM,0BAA0B,GAAG,CAAC,CAAC;AACrC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAC7B,MAAM,iBAAiB,GAAG,KAAK,CAAC;AAChC,MAAM,wBAAwB,GAAG,gDAAgD,CAAC;AAElF,MAAM,UAAU,kBAAkB,CAAC,OAQlC;IACC,MAAM,eAAe,GAAG,4BAA4B,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,+BAA+B,CAAC;IACvG,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,iBAAiB,CAAC,CAAC;IACzE,MAAM,iBAAiB,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAC3F,IAAI,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAClC,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAE1B,OACE,CAAC,yBAAyB,CAAC,WAAW,CAAC,GAAG,gBAAgB,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,iBAAiB,KAAK,CAAC,CAAC,CAAC;QACzG,yBAAyB,CAAC,WAAW,CAAC,GAAG,iBAAiB,EAC1D,CAAC;QACD,MAAM,UAAU,GAAG,mBAAmB,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;QACvE,IAAI,UAAU,IAAI,CAAC,IAAI,UAAU,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;YACxD,MAAM;QACR,CAAC;QAED,iBAAiB,IAAI,yBAAyB,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;QACjF,WAAW,GAAG,qBAAqB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAC/D,CAAC;IAED,OAAO;QACL,OAAO,EAAE,WAAW;QACpB,OAAO,EAAE,iBAAiB,CAAC;YACzB,OAAO,EAAE,WAAW;YACpB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,iBAAiB;YACjB,sBAAsB,EAAE,qBAAqB,CAAC;gBAC5C,OAAO,EAAE,WAAW;gBACpB,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB,CAAC;SACH,CAAC;KACH,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,OAAsB;IAC9D,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,KAAK,GAAG,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACvF,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,OAAoB;IAC5D,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;AAC3F,CAAC;AAED,SAAS,iBAAiB,CAAC,OAK1B;IACC,OAAO;QACL,sBAAsB,EAAE,yBAAyB,CAAC,OAAO,CAAC,OAAO,CAAC;QAClE,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;QACtD,kBAAkB,EAAE,OAAO,CAAC,KAAK,EAAE,WAAW;QAC9C,mBAAmB,EAAE,OAAO,CAAC,KAAK,EAAE,YAAY;QAChD,kBAAkB,EAAE,OAAO,CAAC,KAAK,EAAE,WAAW;QAC9C,iBAAiB,EAAE,OAAO,CAAC,KAAK,EAAE,iBAAiB;QACnD,eAAe,EAAE,OAAO,CAAC,KAAK,EAAE,eAAe;QAC/C,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS;QACxF,WAAW,EAAE,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS;KAClF,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAsB,EAAE,UAAkB;IACvE,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACzC,MAAM,YAAY,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,QAAQ;SAC1B,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;SACxD,OAAO,CAAC,6BAA6B,CAAC;SACtC,KAAK,CAAC,CAAC,iBAAiB,CAAC,CAAC;IAE7B,MAAM,YAAY,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAChD,IAAI,YAAY,EAAE,CAAC;QACjB,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,4BAA4B,EAAE,YAAY,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,6BAA6B,EAAE,GAAG,YAAY,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,gBAAgB,GAAgB;QACpC,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KAClD,CAAC;IACF,OAAO,CAAC,gBAAgB,EAAE,GAAG,MAAM,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAsB;IACjD,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAC/D,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACxD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;AAC3F,CAAC;AAED,SAAS,6BAA6B,CAAC,OAAoB;IACzD,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC5B,OAAO,CAAC,SAAS,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,CAAC,cAAc,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACnE,IAAI,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;YAC9B,KAAK,CAAC,IAAI,CAAC,yBAAyB,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/F,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC5B,OAAO,CAAC,4BAA4B,OAAO,CAAC,UAAU,GAAG,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,eAAe,CAAC,KAAa;IACpC,IAAI,KAAK,CAAC,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACtC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC;AAC/D,CAAC;AAED,SAAS,YAAY,CAAC,KAAa,EAAE,QAAgB;IACnD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IAClD,IAAI,OAAO,CAAC,MAAM,IAAI,QAAQ,EAAE,CAAC;QAC/B,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC;AACxD,CAAC;AAED,SAAS,yBAAyB,CAAC,OAAsB;IACvD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;AACjF,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAsB,EAAE,iBAAyB;IAC5E,IAAI,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,iBAAiB,CAAC,CAAC;IAEjE,OAAO,UAAU,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,EAAE,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3E,UAAU,EAAE,CAAC;IACf,CAAC;IAED,OACE,UAAU,GAAG,OAAO,CAAC,MAAM;QAC3B,UAAU,GAAG,CAAC;QACd,0BAA0B,CAAC,OAAO,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,EACnD,CAAC;QACD,UAAU,EAAE,CAAC;QACb,OAAO,UAAU,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,EAAE,IAAI,KAAK,MAAM,EAAE,CAAC;YAC3E,UAAU,EAAE,CAAC;QACf,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAoB;IACjD,IAAI,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC;QACvC,OAAO,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;IAClD,CAAC;IAED,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,QAAQ,CAAC;QACd,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QAClD,KAAK,WAAW;YACd,OAAO,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC;IAC5F,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,qBAAqB,CAAC,OAK9B;IACC,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,IAAI,yCAAyC,CAAC;IAChF,MAAM,YAAY,GAAG,iBAAiB,CAAC,aAAa,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IAChG,MAAM,UAAU,GAAG,aAAa,CAAC;IACjC,OAAO,kBAAkB,CAAC,YAAY,CAAC,GAAG,yBAAyB,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;AAC7H,CAAC;AAED,SAAS,0BAA0B,CACjC,OAAgC;IAEhC,OAAO,OAAO,EAAE,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;AAC9F,CAAC"}
|
|
1
|
+
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../../../src/core/chat/compaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-lines.d.ts","sourceRoot":"","sources":["../../../../src/core/chat/conversation-lines.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"conversation-lines.d.ts","sourceRoot":"","sources":["../../../../src/core/chat/conversation-lines.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,gBAAgB,EAAE,CAiCpF"}
|
|
@@ -2,10 +2,13 @@ import { isCompactedHistorySummary } from './compaction.js';
|
|
|
2
2
|
export function buildConversationMessages(history) {
|
|
3
3
|
return history.flatMap((message, index) => {
|
|
4
4
|
if (isCompactedHistorySummary(message)) {
|
|
5
|
+
const archiveRootMatch = message.content.match(/Archive root:\s*(.+)/);
|
|
5
6
|
return [{
|
|
6
7
|
id: `compacted-${index}`,
|
|
7
8
|
role: 'assistant',
|
|
8
|
-
text:
|
|
9
|
+
text: archiveRootMatch ?
|
|
10
|
+
`Earlier conversation history was summarized and archived. Raw transcript remains available in ${archiveRootMatch[1]}.`
|
|
11
|
+
: 'Earlier conversation history was summarized and archived for longer chats.',
|
|
9
12
|
}];
|
|
10
13
|
}
|
|
11
14
|
if (message.role === 'user' || message.role === 'assistant') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-lines.js","sourceRoot":"","sources":["../../../../src/core/chat/conversation-lines.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAG5D,MAAM,UAAU,yBAAyB,CAAC,OAAsB;IAC9D,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QACxC,IAAI,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC;YACvC,OAAO,CAAC;oBACN,EAAE,EAAE,aAAa,KAAK,EAAE;oBACxB,IAAI,EAAE,WAAW;oBACjB,IAAI,
|
|
1
|
+
{"version":3,"file":"conversation-lines.js","sourceRoot":"","sources":["../../../../src/core/chat/conversation-lines.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,14 @@ export type SubmitChatSessionPromptArgs = {
|
|
|
7
7
|
sessionStoragePath: string;
|
|
8
8
|
sessionId: string;
|
|
9
9
|
prompt: string;
|
|
10
|
+
apiKey?: string;
|
|
10
11
|
onEvent?: (event: AgentLoopEvent) => void;
|
|
12
|
+
onCompactionStatus?: (event: {
|
|
13
|
+
status: 'running' | 'finished' | 'failed';
|
|
14
|
+
archivePath?: string;
|
|
15
|
+
summaryPath?: string;
|
|
16
|
+
error?: string;
|
|
17
|
+
}) => void;
|
|
11
18
|
approveToolCall?: (call: ToolCall, tool: ToolDefinition) => Promise<{
|
|
12
19
|
approved: boolean;
|
|
13
20
|
reason?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-submit.d.ts","sourceRoot":"","sources":["../../../../src/core/chat/session-submit.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAK/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAK9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,MAAM,MAAM,2BAA2B,GAAG;IACxC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAC1C,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5G,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AAEF,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,2BAA2B;;;;
|
|
1
|
+
{"version":3,"file":"session-submit.d.ts","sourceRoot":"","sources":["../../../../src/core/chat/session-submit.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAK/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAK9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,MAAM,MAAM,2BAA2B,GAAG;IACxC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAC1C,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,QAAQ,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAChJ,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5G,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AAEF,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,2BAA2B;;;;GAsJ9E"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { join } from 'node:path';
|
|
2
2
|
import { createDefaultAgentTools, createLlmAdapter, DEFAULT_OPENAI_MODEL, inferProviderFromModel, runAgentLoop, } from '../../index.js';
|
|
3
|
-
import {
|
|
3
|
+
import { buildCompactionRunningContext, compactChatHistoryWithArchive, estimateChatHistoryTokens } from './compaction.js';
|
|
4
4
|
import { buildConversationMessages } from './conversation-lines.js';
|
|
5
5
|
import { formatChatFailureMessage } from './failure-messages.js';
|
|
6
6
|
import { loadChatSessions, saveChatSessions, touchSession } from './storage.js';
|
|
@@ -15,7 +15,7 @@ export async function submitChatSessionPrompt(args) {
|
|
|
15
15
|
}
|
|
16
16
|
const model = session.model ?? process.env.OPENAI_MODEL ?? process.env.ANTHROPIC_MODEL ?? DEFAULT_OPENAI_MODEL;
|
|
17
17
|
const provider = inferProviderFromModel(model);
|
|
18
|
-
const apiKey = resolveApiKeyForModel(model);
|
|
18
|
+
const apiKey = args.apiKey ?? resolveApiKeyForModel(model);
|
|
19
19
|
if (!apiKey) {
|
|
20
20
|
throw new Error(`Missing provider API key for ${provider}`);
|
|
21
21
|
}
|
|
@@ -28,6 +28,42 @@ export async function submitChatSessionPrompt(args) {
|
|
|
28
28
|
searchIgnoreDirs: [],
|
|
29
29
|
includePlanTool: true,
|
|
30
30
|
});
|
|
31
|
+
const preflightCompacted = await compactChatHistoryWithArchive({
|
|
32
|
+
history: session.history,
|
|
33
|
+
model,
|
|
34
|
+
sessionId: session.id,
|
|
35
|
+
stateRoot: args.stateRoot,
|
|
36
|
+
toolNames: tools.map((tool) => tool.name),
|
|
37
|
+
goal: args.prompt,
|
|
38
|
+
onStatusChange: (event) => {
|
|
39
|
+
args.onCompactionStatus?.(event);
|
|
40
|
+
if (event.status === 'running') {
|
|
41
|
+
const compactionSeed = touchSession({
|
|
42
|
+
...session,
|
|
43
|
+
context: buildCompactionRunningContext({
|
|
44
|
+
history: session.history,
|
|
45
|
+
previous: session.context,
|
|
46
|
+
archiveCount: session.archives?.length,
|
|
47
|
+
currentSummaryPath: session.context?.currentSummaryPath,
|
|
48
|
+
lastArchivePath: event.archivePath,
|
|
49
|
+
}),
|
|
50
|
+
});
|
|
51
|
+
saveChatSessions(args.sessionStoragePath, sessions.map((candidate) => candidate.id === session.id ? compactionSeed : candidate));
|
|
52
|
+
}
|
|
53
|
+
},
|
|
54
|
+
});
|
|
55
|
+
const preflightSession = preflightCompacted.history !== session.history || preflightCompacted.archives.length !== (session.archives?.length ?? 0) ?
|
|
56
|
+
touchSession({
|
|
57
|
+
...session,
|
|
58
|
+
history: preflightCompacted.history,
|
|
59
|
+
context: preflightCompacted.context,
|
|
60
|
+
archives: preflightCompacted.archives,
|
|
61
|
+
messages: buildConversationMessages(preflightCompacted.history),
|
|
62
|
+
})
|
|
63
|
+
: session;
|
|
64
|
+
if (preflightSession !== session) {
|
|
65
|
+
saveChatSessions(args.sessionStoragePath, sessions.map((candidate) => candidate.id === session.id ? preflightSession : candidate));
|
|
66
|
+
}
|
|
31
67
|
const result = await runAgentLoop({
|
|
32
68
|
goal: args.prompt,
|
|
33
69
|
model,
|
|
@@ -38,17 +74,36 @@ export async function submitChatSessionPrompt(args) {
|
|
|
38
74
|
llm,
|
|
39
75
|
tools,
|
|
40
76
|
includeDefaultTools: false,
|
|
41
|
-
history:
|
|
77
|
+
history: preflightSession.history,
|
|
42
78
|
onEvent: args.onEvent,
|
|
43
79
|
approveToolCall: args.approveToolCall,
|
|
44
80
|
abortSignal: args.abortSignal,
|
|
45
81
|
});
|
|
46
|
-
const compacted =
|
|
82
|
+
const compacted = await compactChatHistoryWithArchive({
|
|
47
83
|
history: result.transcript,
|
|
48
84
|
model,
|
|
85
|
+
sessionId: session.id,
|
|
86
|
+
stateRoot: args.stateRoot,
|
|
49
87
|
usage: result.usage,
|
|
50
88
|
toolNames: tools.map((tool) => tool.name),
|
|
51
89
|
goal: args.prompt,
|
|
90
|
+
onStatusChange: (event) => {
|
|
91
|
+
args.onCompactionStatus?.(event);
|
|
92
|
+
if (event.status === 'running') {
|
|
93
|
+
const compactionSeed = touchSession({
|
|
94
|
+
...preflightSession,
|
|
95
|
+
history: result.transcript,
|
|
96
|
+
context: buildCompactionRunningContext({
|
|
97
|
+
history: result.transcript,
|
|
98
|
+
previous: preflightSession.context,
|
|
99
|
+
archiveCount: preflightSession.archives?.length,
|
|
100
|
+
currentSummaryPath: preflightSession.context?.currentSummaryPath,
|
|
101
|
+
lastArchivePath: event.archivePath,
|
|
102
|
+
}),
|
|
103
|
+
});
|
|
104
|
+
saveChatSessions(args.sessionStoragePath, sessions.map((candidate) => candidate.id === session.id ? compactionSeed : candidate));
|
|
105
|
+
}
|
|
106
|
+
},
|
|
52
107
|
});
|
|
53
108
|
const traceFile = saveTrace(join(args.stateRoot, 'traces'), result.trace);
|
|
54
109
|
const nextTurn = {
|
|
@@ -67,12 +122,13 @@ export async function submitChatSessionPrompt(args) {
|
|
|
67
122
|
})
|
|
68
123
|
: result.summary;
|
|
69
124
|
const updatedSession = touchSession({
|
|
70
|
-
...
|
|
125
|
+
...preflightSession,
|
|
71
126
|
lastContinuePrompt: args.prompt,
|
|
72
127
|
history: compacted.history,
|
|
73
128
|
context: compacted.context,
|
|
129
|
+
archives: compacted.archives,
|
|
74
130
|
messages: buildConversationMessages(compacted.history),
|
|
75
|
-
turns: [...
|
|
131
|
+
turns: [...preflightSession.turns, nextTurn].slice(-8),
|
|
76
132
|
});
|
|
77
133
|
const nextSessions = sessions.map((candidate) => candidate.id === session.id ? updatedSession : candidate);
|
|
78
134
|
saveChatSessions(args.sessionStoragePath, nextSessions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-submit.js","sourceRoot":"","sources":["../../../../src/core/chat/session-submit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,uBAAuB,EACvB,gBAAgB,EAChB,oBAAoB,EACpB,sBAAsB,EACtB,YAAY,GACb,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"session-submit.js","sourceRoot":"","sources":["../../../../src/core/chat/session-submit.ts"],"names":[],"mappings":"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"}
|