@kenkaiiii/ggcoder 4.2.17 → 4.2.18
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/core/agent-session.d.ts.map +1 -1
- package/dist/core/agent-session.js +12 -1
- package/dist/core/agent-session.js.map +1 -1
- package/dist/core/agents.d.ts +0 -2
- package/dist/core/agents.d.ts.map +1 -1
- package/dist/core/agents.js +1 -5
- package/dist/core/agents.js.map +1 -1
- package/dist/core/compaction/compactor.d.ts +35 -5
- package/dist/core/compaction/compactor.d.ts.map +1 -1
- package/dist/core/compaction/compactor.js +215 -63
- package/dist/core/compaction/compactor.js.map +1 -1
- package/dist/core/compaction/compactor.test.js +354 -32
- package/dist/core/compaction/compactor.test.js.map +1 -1
- package/dist/tools/subagent.d.ts.map +1 -1
- package/dist/tools/subagent.js +1 -2
- package/dist/tools/subagent.js.map +1 -1
- package/dist/ui/App.d.ts.map +1 -1
- package/dist/ui/App.js +5 -0
- package/dist/ui/App.js.map +1 -1
- package/dist/utils/error-handler.d.ts.map +1 -1
- package/dist/utils/error-handler.js +16 -1
- package/dist/utils/error-handler.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,49 +1,52 @@
|
|
|
1
|
-
import { describe, it, expect } from "vitest";
|
|
2
|
-
import { shouldCompact, findRecentCutPoint } from "./compactor.js";
|
|
1
|
+
import { describe, it, expect, vi } from "vitest";
|
|
2
|
+
import { shouldCompact, findRecentCutPoint, prepareMessagesForSummary, selectMessagesInBudget, buildFallbackSummary, extractSummaryText, compact, } from "./compactor.js";
|
|
3
3
|
import { estimateConversationTokens } from "./token-estimator.js";
|
|
4
4
|
function makeMessage(role, content) {
|
|
5
5
|
return { role, content };
|
|
6
6
|
}
|
|
7
|
-
function makeToolCallMessage() {
|
|
7
|
+
function makeToolCallMessage(name = "read", args = { file_path: "foo.ts" }, id = "t1") {
|
|
8
8
|
return {
|
|
9
9
|
role: "assistant",
|
|
10
|
-
content: [{ type: "tool_call", id
|
|
10
|
+
content: [{ type: "tool_call", id, name, args }],
|
|
11
11
|
};
|
|
12
12
|
}
|
|
13
|
-
function makeToolResultMessage() {
|
|
13
|
+
function makeToolResultMessage(toolCallId = "t1", content = "file contents") {
|
|
14
14
|
return {
|
|
15
15
|
role: "tool",
|
|
16
|
-
content: [{ type: "tool_result", toolCallId
|
|
16
|
+
content: [{ type: "tool_result", toolCallId, content }],
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
function makeAssistantWithThinking(text, thinking) {
|
|
20
|
+
return {
|
|
21
|
+
role: "assistant",
|
|
22
|
+
content: [
|
|
23
|
+
{ type: "thinking", text: thinking, signature: "sig123" },
|
|
24
|
+
{ type: "text", text },
|
|
25
|
+
],
|
|
17
26
|
};
|
|
18
27
|
}
|
|
19
28
|
// ── shouldCompact ──────────────────────────────────────────
|
|
20
29
|
describe("shouldCompact", () => {
|
|
21
30
|
it("returns false when under threshold", () => {
|
|
22
31
|
const messages = [makeMessage("system", "sys"), makeMessage("user", "hello")];
|
|
23
|
-
// Estimated tokens ~= 13, contextWindow 200k, threshold 0.8 → 160k
|
|
24
32
|
expect(shouldCompact(messages, 200_000, 0.8)).toBe(false);
|
|
25
33
|
});
|
|
26
34
|
it("returns true when over threshold", () => {
|
|
27
|
-
|
|
28
|
-
const bigContent = "x".repeat(1000); // ~250 tokens
|
|
35
|
+
const bigContent = "x".repeat(1000);
|
|
29
36
|
const messages = [makeMessage("system", bigContent), makeMessage("user", bigContent)];
|
|
30
|
-
// Total ~508 tokens, window=500, threshold 0.8 → 400
|
|
31
37
|
expect(shouldCompact(messages, 500, 0.8)).toBe(true);
|
|
32
38
|
});
|
|
33
39
|
it("uses default threshold of 0.8", () => {
|
|
34
|
-
const content = "x".repeat(400);
|
|
40
|
+
const content = "x".repeat(400);
|
|
35
41
|
const messages = [makeMessage("user", content)];
|
|
36
42
|
const estimated = estimateConversationTokens(messages);
|
|
37
|
-
// With window = estimated / 0.7 → should be under 0.8 threshold
|
|
38
43
|
expect(shouldCompact(messages, Math.ceil(estimated / 0.7))).toBe(false);
|
|
39
|
-
// With window = estimated / 0.9 → should be over 0.8 threshold
|
|
40
44
|
expect(shouldCompact(messages, Math.ceil(estimated / 0.9))).toBe(true);
|
|
41
45
|
});
|
|
42
46
|
it("handles custom threshold", () => {
|
|
43
|
-
const content = "x".repeat(200);
|
|
47
|
+
const content = "x".repeat(200);
|
|
44
48
|
const messages = [makeMessage("user", content)];
|
|
45
49
|
const estimated = estimateConversationTokens(messages);
|
|
46
|
-
// Tight threshold: 0.5 → need window > estimated/0.5 to not compact
|
|
47
50
|
expect(shouldCompact(messages, estimated * 3, 0.5)).toBe(false);
|
|
48
51
|
expect(shouldCompact(messages, estimated, 0.5)).toBe(true);
|
|
49
52
|
});
|
|
@@ -56,21 +59,19 @@ describe("findRecentCutPoint", () => {
|
|
|
56
59
|
makeMessage("user", "hello"),
|
|
57
60
|
makeMessage("assistant", "hi"),
|
|
58
61
|
];
|
|
59
|
-
// All messages are small, budget is huge
|
|
60
62
|
const cut = findRecentCutPoint(messages, 100_000);
|
|
61
|
-
expect(cut).toBe(1);
|
|
63
|
+
expect(cut).toBe(1);
|
|
62
64
|
});
|
|
63
65
|
it("keeps only recent messages when total exceeds budget", () => {
|
|
64
|
-
const big = "x".repeat(400);
|
|
66
|
+
const big = "x".repeat(400);
|
|
65
67
|
const messages = [
|
|
66
68
|
makeMessage("system", "sys"),
|
|
67
|
-
makeMessage("user", big),
|
|
68
|
-
makeMessage("assistant", big),
|
|
69
|
-
makeMessage("user", big),
|
|
70
|
-
makeMessage("assistant", big),
|
|
71
|
-
makeMessage("user", "last"),
|
|
69
|
+
makeMessage("user", big),
|
|
70
|
+
makeMessage("assistant", big),
|
|
71
|
+
makeMessage("user", big),
|
|
72
|
+
makeMessage("assistant", big),
|
|
73
|
+
makeMessage("user", "last"),
|
|
72
74
|
];
|
|
73
|
-
// Budget of 120 tokens — should keep last ~1-2 messages
|
|
74
75
|
const cut = findRecentCutPoint(messages, 120);
|
|
75
76
|
expect(cut).toBeGreaterThan(1);
|
|
76
77
|
expect(cut).toBeLessThan(messages.length);
|
|
@@ -81,18 +82,15 @@ describe("findRecentCutPoint", () => {
|
|
|
81
82
|
expect(cut).toBeGreaterThanOrEqual(1);
|
|
82
83
|
});
|
|
83
84
|
it("does not split tool_call and tool_result pairs", () => {
|
|
84
|
-
const big = "x".repeat(400);
|
|
85
|
+
const big = "x".repeat(400);
|
|
85
86
|
const messages = [
|
|
86
87
|
makeMessage("system", "sys"),
|
|
87
88
|
makeMessage("user", big),
|
|
88
|
-
makeToolCallMessage(),
|
|
89
|
-
makeToolResultMessage(),
|
|
89
|
+
makeToolCallMessage(),
|
|
90
|
+
makeToolResultMessage(),
|
|
90
91
|
makeMessage("user", "thanks"),
|
|
91
92
|
];
|
|
92
|
-
// Budget that would normally cut at the tool result (index 3)
|
|
93
|
-
// should back up to include the tool_call (index 2)
|
|
94
93
|
const cut = findRecentCutPoint(messages, 50);
|
|
95
|
-
// The cut should NOT leave a tool result as the first kept message
|
|
96
94
|
if (cut < messages.length) {
|
|
97
95
|
expect(messages[cut].role).not.toBe("tool");
|
|
98
96
|
}
|
|
@@ -100,7 +98,7 @@ describe("findRecentCutPoint", () => {
|
|
|
100
98
|
it("handles conversation with only system message", () => {
|
|
101
99
|
const messages = [makeMessage("system", "sys")];
|
|
102
100
|
const cut = findRecentCutPoint(messages, 100);
|
|
103
|
-
expect(cut).toBe(1);
|
|
101
|
+
expect(cut).toBe(1);
|
|
104
102
|
});
|
|
105
103
|
it("returns length when budget is 0", () => {
|
|
106
104
|
const messages = [
|
|
@@ -109,8 +107,332 @@ describe("findRecentCutPoint", () => {
|
|
|
109
107
|
makeMessage("assistant", "hi"),
|
|
110
108
|
];
|
|
111
109
|
const cut = findRecentCutPoint(messages, 0);
|
|
112
|
-
// Can't fit anything — cut at the end
|
|
113
110
|
expect(cut).toBe(messages.length);
|
|
114
111
|
});
|
|
115
112
|
});
|
|
113
|
+
// ── prepareMessagesForSummary ──────────────────────────────
|
|
114
|
+
describe("prepareMessagesForSummary", () => {
|
|
115
|
+
it("strips thinking blocks from assistant messages", () => {
|
|
116
|
+
const msgs = [makeAssistantWithThinking("Hello there", "Let me think about this...")];
|
|
117
|
+
const prepared = prepareMessagesForSummary(msgs);
|
|
118
|
+
const content = prepared[0].content;
|
|
119
|
+
expect(content).toHaveLength(1);
|
|
120
|
+
expect(content[0].type).toBe("text");
|
|
121
|
+
});
|
|
122
|
+
it("truncates long tool results", () => {
|
|
123
|
+
const longContent = "x".repeat(5000);
|
|
124
|
+
const msgs = [makeToolResultMessage("t1", longContent)];
|
|
125
|
+
const prepared = prepareMessagesForSummary(msgs);
|
|
126
|
+
const results = prepared[0].content;
|
|
127
|
+
expect(results[0].content.length).toBeLessThan(longContent.length);
|
|
128
|
+
expect(results[0].content).toContain("truncated");
|
|
129
|
+
});
|
|
130
|
+
it("truncates long user messages", () => {
|
|
131
|
+
const longContent = "x".repeat(5000);
|
|
132
|
+
const msgs = [makeMessage("user", longContent)];
|
|
133
|
+
const prepared = prepareMessagesForSummary(msgs);
|
|
134
|
+
expect(prepared[0].content.length).toBeLessThan(longContent.length);
|
|
135
|
+
expect(prepared[0].content).toContain("truncated");
|
|
136
|
+
});
|
|
137
|
+
it("truncates long assistant text parts", () => {
|
|
138
|
+
const longText = "x".repeat(5000);
|
|
139
|
+
const msgs = [
|
|
140
|
+
{ role: "assistant", content: [{ type: "text", text: longText }] },
|
|
141
|
+
];
|
|
142
|
+
const prepared = prepareMessagesForSummary(msgs);
|
|
143
|
+
const content = prepared[0].content;
|
|
144
|
+
const textPart = content[0];
|
|
145
|
+
expect(textPart.text.length).toBeLessThan(longText.length);
|
|
146
|
+
expect(textPart.text).toContain("truncated");
|
|
147
|
+
});
|
|
148
|
+
it("does not mutate original messages", () => {
|
|
149
|
+
const longContent = "x".repeat(5000);
|
|
150
|
+
const original = makeToolResultMessage("t1", longContent);
|
|
151
|
+
const originalContent = original.content[0].content;
|
|
152
|
+
prepareMessagesForSummary([original]);
|
|
153
|
+
// Original should be unchanged
|
|
154
|
+
expect(original.content[0].content).toBe(originalContent);
|
|
155
|
+
expect(original.content[0].content.length).toBe(5000);
|
|
156
|
+
});
|
|
157
|
+
it("passes through short messages unchanged", () => {
|
|
158
|
+
const msgs = [makeMessage("user", "hello")];
|
|
159
|
+
const prepared = prepareMessagesForSummary(msgs);
|
|
160
|
+
expect(prepared[0].content).toBe("hello");
|
|
161
|
+
});
|
|
162
|
+
it("returns empty string content when all parts are thinking blocks", () => {
|
|
163
|
+
const msgs = [
|
|
164
|
+
{
|
|
165
|
+
role: "assistant",
|
|
166
|
+
content: [{ type: "thinking", text: "deep thoughts", signature: "sig" }],
|
|
167
|
+
},
|
|
168
|
+
];
|
|
169
|
+
const prepared = prepareMessagesForSummary(msgs);
|
|
170
|
+
expect(prepared[0].content).toBe("");
|
|
171
|
+
});
|
|
172
|
+
});
|
|
173
|
+
// ── selectMessagesInBudget ─────────────────────────────────
|
|
174
|
+
describe("selectMessagesInBudget", () => {
|
|
175
|
+
it("selects all messages when budget is large", () => {
|
|
176
|
+
const msgs = [makeMessage("user", "hello"), makeMessage("assistant", "hi")];
|
|
177
|
+
const selected = selectMessagesInBudget(msgs, 100_000);
|
|
178
|
+
expect(selected).toHaveLength(2);
|
|
179
|
+
});
|
|
180
|
+
it("selects no messages when budget is 0", () => {
|
|
181
|
+
const msgs = [makeMessage("user", "hello")];
|
|
182
|
+
const selected = selectMessagesInBudget(msgs, 0);
|
|
183
|
+
expect(selected).toHaveLength(0);
|
|
184
|
+
});
|
|
185
|
+
it("stops when budget is exceeded", () => {
|
|
186
|
+
const big = "x".repeat(2000); // ~500 tokens each + overhead
|
|
187
|
+
const msgs = [
|
|
188
|
+
makeMessage("user", big),
|
|
189
|
+
makeMessage("assistant", big),
|
|
190
|
+
makeMessage("user", big),
|
|
191
|
+
makeMessage("assistant", big),
|
|
192
|
+
];
|
|
193
|
+
const selected = selectMessagesInBudget(msgs, 600);
|
|
194
|
+
expect(selected.length).toBeGreaterThan(0);
|
|
195
|
+
expect(selected.length).toBeLessThan(msgs.length);
|
|
196
|
+
});
|
|
197
|
+
it("walks forward from start", () => {
|
|
198
|
+
const msgs = [
|
|
199
|
+
makeMessage("user", "first"),
|
|
200
|
+
makeMessage("assistant", "second"),
|
|
201
|
+
makeMessage("user", "third"),
|
|
202
|
+
];
|
|
203
|
+
const selected = selectMessagesInBudget(msgs, 100_000);
|
|
204
|
+
expect(selected[0].content).toBe("first");
|
|
205
|
+
expect(selected[2].content).toBe("third");
|
|
206
|
+
});
|
|
207
|
+
});
|
|
208
|
+
// ── buildFallbackSummary ───────────────────────────────────
|
|
209
|
+
describe("buildFallbackSummary", () => {
|
|
210
|
+
it("includes goal from first user message", () => {
|
|
211
|
+
const msgs = [
|
|
212
|
+
makeMessage("user", "Fix the login bug"),
|
|
213
|
+
makeMessage("assistant", "I'll look into it"),
|
|
214
|
+
];
|
|
215
|
+
const summary = buildFallbackSummary(msgs, { read: new Set(), modified: new Set() });
|
|
216
|
+
expect(summary).toContain("Fix the login bug");
|
|
217
|
+
expect(summary).toContain("## Goal");
|
|
218
|
+
});
|
|
219
|
+
it("includes message and tool call counts", () => {
|
|
220
|
+
const msgs = [
|
|
221
|
+
makeMessage("user", "Fix it"),
|
|
222
|
+
makeToolCallMessage(),
|
|
223
|
+
makeToolResultMessage(),
|
|
224
|
+
makeMessage("assistant", "Done"),
|
|
225
|
+
];
|
|
226
|
+
const summary = buildFallbackSummary(msgs, { read: new Set(), modified: new Set() });
|
|
227
|
+
expect(summary).toContain("## Progress");
|
|
228
|
+
expect(summary).toContain("4 messages exchanged");
|
|
229
|
+
expect(summary).toContain("1 tool calls executed");
|
|
230
|
+
});
|
|
231
|
+
it("includes read files", () => {
|
|
232
|
+
const fileOps = {
|
|
233
|
+
read: new Set(["src/foo.ts", "src/bar.ts"]),
|
|
234
|
+
modified: new Set(),
|
|
235
|
+
};
|
|
236
|
+
const summary = buildFallbackSummary([makeMessage("user", "Check files")], fileOps);
|
|
237
|
+
expect(summary).toContain("## Files Read");
|
|
238
|
+
expect(summary).toContain("src/foo.ts");
|
|
239
|
+
expect(summary).toContain("src/bar.ts");
|
|
240
|
+
});
|
|
241
|
+
it("includes modified files", () => {
|
|
242
|
+
const fileOps = {
|
|
243
|
+
read: new Set(),
|
|
244
|
+
modified: new Set(["src/main.ts"]),
|
|
245
|
+
};
|
|
246
|
+
const summary = buildFallbackSummary([makeMessage("user", "Edit main")], fileOps);
|
|
247
|
+
expect(summary).toContain("## Files Modified");
|
|
248
|
+
expect(summary).toContain("src/main.ts");
|
|
249
|
+
});
|
|
250
|
+
it("handles no user messages gracefully", () => {
|
|
251
|
+
const summary = buildFallbackSummary([makeMessage("assistant", "Something")], {
|
|
252
|
+
read: new Set(),
|
|
253
|
+
modified: new Set(),
|
|
254
|
+
});
|
|
255
|
+
expect(summary).toContain("could not determine");
|
|
256
|
+
});
|
|
257
|
+
it("truncates very long first user message", () => {
|
|
258
|
+
const longMsg = "x".repeat(1000);
|
|
259
|
+
const summary = buildFallbackSummary([makeMessage("user", longMsg)], {
|
|
260
|
+
read: new Set(),
|
|
261
|
+
modified: new Set(),
|
|
262
|
+
});
|
|
263
|
+
expect(summary.length).toBeLessThan(longMsg.length);
|
|
264
|
+
});
|
|
265
|
+
});
|
|
266
|
+
// ── extractSummaryText ─────────────────────────────────────
|
|
267
|
+
describe("extractSummaryText", () => {
|
|
268
|
+
it("returns string content directly", () => {
|
|
269
|
+
expect(extractSummaryText("Hello summary")).toBe("Hello summary");
|
|
270
|
+
});
|
|
271
|
+
it("extracts text from ContentPart array", () => {
|
|
272
|
+
const parts = [
|
|
273
|
+
{ type: "text", text: "Part one. " },
|
|
274
|
+
{ type: "text", text: "Part two." },
|
|
275
|
+
];
|
|
276
|
+
expect(extractSummaryText(parts)).toBe("Part one. Part two.");
|
|
277
|
+
});
|
|
278
|
+
it("filters out non-text parts", () => {
|
|
279
|
+
const parts = [
|
|
280
|
+
{ type: "thinking", text: "hmm", signature: "sig" },
|
|
281
|
+
{ type: "text", text: "The summary." },
|
|
282
|
+
];
|
|
283
|
+
expect(extractSummaryText(parts)).toBe("The summary.");
|
|
284
|
+
});
|
|
285
|
+
it("returns empty string for empty array", () => {
|
|
286
|
+
expect(extractSummaryText([])).toBe("");
|
|
287
|
+
});
|
|
288
|
+
it("returns empty string for array with only thinking parts", () => {
|
|
289
|
+
const parts = [{ type: "thinking", text: "hmm", signature: "sig" }];
|
|
290
|
+
expect(extractSummaryText(parts)).toBe("");
|
|
291
|
+
});
|
|
292
|
+
});
|
|
293
|
+
// ── compact (integration) ──────────────────────────────────
|
|
294
|
+
vi.mock("@kenkaiiii/gg-ai", async (importOriginal) => {
|
|
295
|
+
const actual = await importOriginal();
|
|
296
|
+
return {
|
|
297
|
+
...actual,
|
|
298
|
+
stream: vi.fn(),
|
|
299
|
+
};
|
|
300
|
+
});
|
|
301
|
+
// Must import stream AFTER mock setup
|
|
302
|
+
import { stream } from "@kenkaiiii/gg-ai";
|
|
303
|
+
describe("compact", () => {
|
|
304
|
+
const baseOptions = {
|
|
305
|
+
provider: "anthropic",
|
|
306
|
+
model: "claude-sonnet-4-6-20250514",
|
|
307
|
+
apiKey: "test-key",
|
|
308
|
+
contextWindow: 200_000,
|
|
309
|
+
};
|
|
310
|
+
// Each user message: ~20 + 10000 chars ≈ 2504 tokens + 4 overhead ≈ 2508 tokens
|
|
311
|
+
// Each assistant: ~12 chars ≈ 7 tokens
|
|
312
|
+
// 30 pairs ≈ 30 × 2515 ≈ 75K tokens total (well over 20K recent budget)
|
|
313
|
+
function buildConversation(middleCount) {
|
|
314
|
+
const msgs = [makeMessage("system", "You are a helpful assistant.")];
|
|
315
|
+
for (let i = 0; i < middleCount; i++) {
|
|
316
|
+
const big = `Message content ${i} ${"x".repeat(10_000)}`;
|
|
317
|
+
msgs.push(makeMessage("user", big));
|
|
318
|
+
msgs.push(makeMessage("assistant", `Response ${i}`));
|
|
319
|
+
}
|
|
320
|
+
// Add a recent small message
|
|
321
|
+
msgs.push(makeMessage("user", "latest question"));
|
|
322
|
+
return msgs;
|
|
323
|
+
}
|
|
324
|
+
/** Build a mock StreamResult-like object that resolves to the given response. */
|
|
325
|
+
function mockStreamResult(response) {
|
|
326
|
+
// Suppress unhandled rejection for error mocks
|
|
327
|
+
response.catch(() => { });
|
|
328
|
+
return {
|
|
329
|
+
response,
|
|
330
|
+
events: {
|
|
331
|
+
[Symbol.asyncIterator]: () => ({
|
|
332
|
+
next: () => Promise.resolve({ done: true, value: undefined }),
|
|
333
|
+
}),
|
|
334
|
+
},
|
|
335
|
+
[Symbol.asyncIterator]() {
|
|
336
|
+
return {
|
|
337
|
+
next: () => Promise.resolve({ done: true, value: undefined }),
|
|
338
|
+
};
|
|
339
|
+
},
|
|
340
|
+
};
|
|
341
|
+
}
|
|
342
|
+
it("skips compaction when too few middle messages", async () => {
|
|
343
|
+
const messages = [
|
|
344
|
+
makeMessage("system", "sys"),
|
|
345
|
+
makeMessage("user", "hi"),
|
|
346
|
+
makeMessage("assistant", "hello"),
|
|
347
|
+
];
|
|
348
|
+
const result = await compact(messages, baseOptions);
|
|
349
|
+
expect(result.result.originalCount).toBe(3);
|
|
350
|
+
expect(result.result.newCount).toBe(3);
|
|
351
|
+
expect(result.messages).toHaveLength(3);
|
|
352
|
+
});
|
|
353
|
+
it("produces summary message with LLM response", async () => {
|
|
354
|
+
const mockStream = vi.mocked(stream);
|
|
355
|
+
mockStream.mockReturnValue(mockStreamResult(Promise.resolve({
|
|
356
|
+
message: { role: "assistant", content: "This is a great summary of the conversation." },
|
|
357
|
+
stopReason: "end_turn",
|
|
358
|
+
usage: { inputTokens: 1000, outputTokens: 200 },
|
|
359
|
+
})));
|
|
360
|
+
const messages = buildConversation(30);
|
|
361
|
+
const result = await compact(messages, baseOptions);
|
|
362
|
+
// Should have: system + summary + assistant ack + recent messages
|
|
363
|
+
expect(result.messages.length).toBeLessThan(messages.length);
|
|
364
|
+
expect(result.result.originalCount).toBe(messages.length);
|
|
365
|
+
// The summary message should contain the LLM's summary
|
|
366
|
+
const summaryMsg = result.messages[1];
|
|
367
|
+
expect(summaryMsg.role).toBe("user");
|
|
368
|
+
expect(summaryMsg.content).toContain("[Previous conversation summary]");
|
|
369
|
+
expect(summaryMsg.content).toContain("great summary");
|
|
370
|
+
});
|
|
371
|
+
it("uses fallback summary when LLM returns empty", async () => {
|
|
372
|
+
const mockStream = vi.mocked(stream);
|
|
373
|
+
mockStream.mockReturnValue(mockStreamResult(Promise.resolve({
|
|
374
|
+
message: { role: "assistant", content: "" },
|
|
375
|
+
stopReason: "end_turn",
|
|
376
|
+
usage: { inputTokens: 1000, outputTokens: 0 },
|
|
377
|
+
})));
|
|
378
|
+
const messages = buildConversation(30);
|
|
379
|
+
const result = await compact(messages, baseOptions);
|
|
380
|
+
const summaryMsg = result.messages[1];
|
|
381
|
+
expect(summaryMsg.role).toBe("user");
|
|
382
|
+
expect(summaryMsg.content).toContain("[Previous conversation summary]");
|
|
383
|
+
expect(summaryMsg.content).toContain("## Goal");
|
|
384
|
+
expect(summaryMsg.content).toContain("## Progress");
|
|
385
|
+
});
|
|
386
|
+
it("uses fallback summary when LLM throws error", async () => {
|
|
387
|
+
const mockStream = vi.mocked(stream);
|
|
388
|
+
mockStream.mockReturnValue(mockStreamResult(Promise.reject(new Error("API error"))));
|
|
389
|
+
const messages = buildConversation(30);
|
|
390
|
+
const result = await compact(messages, baseOptions);
|
|
391
|
+
const summaryMsg = result.messages[1];
|
|
392
|
+
expect(summaryMsg.content).toContain("## Goal");
|
|
393
|
+
});
|
|
394
|
+
it("preserves system message", async () => {
|
|
395
|
+
const mockStream = vi.mocked(stream);
|
|
396
|
+
mockStream.mockReturnValue(mockStreamResult(Promise.resolve({
|
|
397
|
+
message: { role: "assistant", content: "Summary text here." },
|
|
398
|
+
stopReason: "end_turn",
|
|
399
|
+
usage: { inputTokens: 500, outputTokens: 100 },
|
|
400
|
+
})));
|
|
401
|
+
const messages = buildConversation(30);
|
|
402
|
+
const result = await compact(messages, baseOptions);
|
|
403
|
+
expect(result.messages[0].role).toBe("system");
|
|
404
|
+
expect(result.messages[0].content).toBe("You are a helpful assistant.");
|
|
405
|
+
});
|
|
406
|
+
it("does not end with an assistant message", async () => {
|
|
407
|
+
const mockStream = vi.mocked(stream);
|
|
408
|
+
mockStream.mockReturnValue(mockStreamResult(Promise.resolve({
|
|
409
|
+
message: { role: "assistant", content: "Summary." },
|
|
410
|
+
stopReason: "end_turn",
|
|
411
|
+
usage: { inputTokens: 500, outputTokens: 50 },
|
|
412
|
+
})));
|
|
413
|
+
const messages = buildConversation(30);
|
|
414
|
+
const result = await compact(messages, baseOptions);
|
|
415
|
+
const lastMsg = result.messages[result.messages.length - 1];
|
|
416
|
+
expect(lastMsg.role).not.toBe("assistant");
|
|
417
|
+
});
|
|
418
|
+
it("retries on empty response before falling back", async () => {
|
|
419
|
+
const mockStream = vi.mocked(stream);
|
|
420
|
+
let callCount = 0;
|
|
421
|
+
mockStream.mockImplementation(() => {
|
|
422
|
+
callCount++;
|
|
423
|
+
const content = callCount <= 2 ? "" : "Summary on third try.";
|
|
424
|
+
return mockStreamResult(Promise.resolve({
|
|
425
|
+
message: { role: "assistant", content },
|
|
426
|
+
stopReason: "end_turn",
|
|
427
|
+
usage: { inputTokens: 500, outputTokens: callCount <= 2 ? 0 : 100 },
|
|
428
|
+
}));
|
|
429
|
+
});
|
|
430
|
+
const messages = buildConversation(30);
|
|
431
|
+
const result = await compact(messages, baseOptions);
|
|
432
|
+
// Should have retried and gotten the summary on the 3rd attempt
|
|
433
|
+
expect(callCount).toBe(3);
|
|
434
|
+
const summaryMsg = result.messages[1];
|
|
435
|
+
expect(summaryMsg.content).toContain("Summary on third try");
|
|
436
|
+
});
|
|
437
|
+
});
|
|
116
438
|
//# sourceMappingURL=compactor.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compactor.test.js","sourceRoot":"","sources":["../../../src/core/compaction/compactor.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"compactor.test.js","sourceRoot":"","sources":["../../../src/core/compaction/compactor.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent.d.ts","sourceRoot":"","sources":["../../src/tools/subagent.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAQzD,QAAA,MAAM,cAAc;;;iBAMlB,CAAC;AAEH,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9C,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9C,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,eAAe,EAAE,EACzB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,GAClB,SAAS,CAAC,OAAO,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"subagent.d.ts","sourceRoot":"","sources":["../../src/tools/subagent.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAQzD,QAAA,MAAM,cAAc;;;iBAMlB,CAAC;AAEH,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9C,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9C,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,eAAe,EAAE,EACzB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,GAClB,SAAS,CAAC,OAAO,cAAc,CAAC,CAqKlC"}
|
package/dist/tools/subagent.js
CHANGED
|
@@ -35,7 +35,6 @@ export function createSubAgentTool(cwd, agents, parentProvider, parentModel) {
|
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
|
-
const useModel = agentDef?.model ?? parentModel;
|
|
39
38
|
const useProvider = parentProvider;
|
|
40
39
|
// Build CLI args — limit turns to prevent runaway context growth
|
|
41
40
|
const cliArgs = [
|
|
@@ -43,7 +42,7 @@ export function createSubAgentTool(cwd, agents, parentProvider, parentModel) {
|
|
|
43
42
|
"--provider",
|
|
44
43
|
useProvider,
|
|
45
44
|
"--model",
|
|
46
|
-
|
|
45
|
+
parentModel,
|
|
47
46
|
"--max-turns",
|
|
48
47
|
String(SUB_AGENT_MAX_TURNS),
|
|
49
48
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent.js","sourceRoot":"","sources":["../../src/tools/subagent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAC/B,MAAM,0BAA0B,GAAG,OAAO,CAAC,CAAC,yCAAyC;AACrF,MAAM,0BAA0B,GAAG,GAAG,CAAC;AACvC,MAAM,0BAA0B,GAAG,MAAM,CAAC,CAAC,yCAAyC;AAEpF,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,uCAAuC,CAAC;IAClE,KAAK,EAAE,CAAC;SACL,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,mEAAmE,CAAC;CACjF,CAAC,CAAC;AAcH,MAAM,UAAU,kBAAkB,CAChC,GAAW,EACX,MAAyB,EACzB,cAAsB,EACtB,WAAmB;IAEnB,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChF,MAAM,SAAS,GAAG,SAAS;QACzB,CAAC,CAAC,gCAAgC,SAAS,EAAE;QAC7C,CAAC,CAAC,iCAAiC,CAAC;IAEtC,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,WAAW,EACT,sNAAsN;YACtN,SAAS;QACX,UAAU,EAAE,cAAc;QAC1B,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO;YACzB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE7B,wCAAwC;YACxC,IAAI,QAAqC,CAAC;YAC1C,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACf,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,KAAM,CAAC,WAAW,EAAE,CAAC,CAAC;gBAClF,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,OAAO;wBACL,OAAO,EAAE,mBAAmB,IAAI,CAAC,KAAK,wBAAwB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE;qBAC/G,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,MAAM,
|
|
1
|
+
{"version":3,"file":"subagent.js","sourceRoot":"","sources":["../../src/tools/subagent.ts"],"names":[],"mappings":"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"}
|
package/dist/ui/App.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/ui/App.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAA6B,MAAM,kBAAkB,CAAC;AAEpG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAI3D,OAAO,EAAiB,KAAK,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAYjF,OAAO,KAAK,EAAE,cAAc,EAAqB,MAAM,4BAA4B,CAAC;AAYpF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/ui/App.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAA6B,MAAM,kBAAkB,CAAC;AAEpG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAI3D,OAAO,EAAiB,KAAK,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAYjF,OAAO,KAAK,EAAE,cAAc,EAAqB,MAAM,4BAA4B,CAAC;AAYpF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAuD3D,UAAU,QAAQ;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,QAAQ;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,aAAa;IACrB,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,aAAa;IACrB,IAAI,EAAE,YAAY,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,YAAY;IACpB,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,SAAS;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,QAAQ;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,YAAY,CAAC;IACnB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,aAAa;IACrB,IAAI,EAAE,WAAW,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,YAAY;IACpB,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,QAAQ,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,iBAAiB;IACzB,IAAI,EAAE,gBAAgB,CAAC;IACvB,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,mBAAmB;IAC3B,IAAI,EAAE,mBAAmB,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,UAAU,kBAAkB;IAC1B,IAAI,EAAE,kBAAkB,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,MAAM,aAAa,GACrB,QAAQ,GACR,QAAQ,GACR,aAAa,GACb,aAAa,GACb,YAAY,GACZ,mBAAmB,GACnB,kBAAkB,GAClB,SAAS,GACT,QAAQ,GACR,cAAc,GACd,aAAa,GACb,YAAY,GACZ,UAAU,GACV,iBAAiB,CAAC;AAiItB,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC3D,iBAAiB,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC/B,qBAAqB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpF,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAID,wBAAgB,GAAG,CAAC,KAAK,EAAE,QAAQ,2CAutClC"}
|
package/dist/ui/App.js
CHANGED
|
@@ -66,6 +66,11 @@ function getProviderErrorHint(message) {
|
|
|
66
66
|
if (lower.includes("500") && lower.includes("internal server error")) {
|
|
67
67
|
return "The provider experienced an internal error. This is not a ggcoder issue.";
|
|
68
68
|
}
|
|
69
|
+
if (lower.includes("does not recognize the requested model") ||
|
|
70
|
+
(lower.includes("model") &&
|
|
71
|
+
(lower.includes("not exist") || lower.includes("not found") || lower.includes("no access")))) {
|
|
72
|
+
return "Use /model to switch to a different model, or check that your account has access to the requested model.";
|
|
73
|
+
}
|
|
69
74
|
return null;
|
|
70
75
|
}
|
|
71
76
|
// pruneHistory, flushOnTurnText, flushOnTurnEnd, MAX_HISTORY_ITEMS
|