@kenkaiiii/ggcoder 0.0.3 → 1.0.5
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.js +159 -31
- package/dist/cli.js.map +1 -1
- package/dist/config.d.ts +1 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +1 -0
- package/dist/config.js.map +1 -1
- package/dist/core/agent-session.d.ts.map +1 -1
- package/dist/core/agent-session.js +5 -0
- package/dist/core/agent-session.js.map +1 -1
- package/dist/core/agents.d.ts +32 -0
- package/dist/core/agents.d.ts.map +1 -0
- package/dist/core/agents.js +95 -0
- package/dist/core/agents.js.map +1 -0
- package/dist/core/compaction/compactor.d.ts +7 -0
- package/dist/core/compaction/compactor.d.ts.map +1 -1
- package/dist/core/compaction/compactor.js +32 -1
- package/dist/core/compaction/compactor.js.map +1 -1
- package/dist/core/compaction/compactor.test.d.ts +2 -0
- package/dist/core/compaction/compactor.test.d.ts.map +1 -0
- package/dist/core/compaction/compactor.test.js +116 -0
- package/dist/core/compaction/compactor.test.js.map +1 -0
- package/dist/core/compaction/token-estimator.test.d.ts +2 -0
- package/dist/core/compaction/token-estimator.test.d.ts.map +1 -0
- package/dist/core/compaction/token-estimator.test.js +115 -0
- package/dist/core/compaction/token-estimator.test.js.map +1 -0
- package/dist/core/event-bus.d.ts +14 -0
- package/dist/core/event-bus.d.ts.map +1 -1
- package/dist/core/event-bus.js +20 -0
- package/dist/core/event-bus.js.map +1 -1
- package/dist/modes/json-mode.d.ts +13 -0
- package/dist/modes/json-mode.d.ts.map +1 -0
- package/dist/modes/json-mode.js +70 -0
- package/dist/modes/json-mode.js.map +1 -0
- package/dist/tools/index.d.ts +8 -1
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +10 -2
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/subagent.d.ts +26 -0
- package/dist/tools/subagent.d.ts.map +1 -0
- package/dist/tools/subagent.js +163 -0
- package/dist/tools/subagent.js.map +1 -0
- package/dist/tools/truncate.test.d.ts +2 -0
- package/dist/tools/truncate.test.d.ts.map +1 -0
- package/dist/tools/truncate.test.js +100 -0
- package/dist/tools/truncate.test.js.map +1 -0
- package/dist/tools/web-fetch.d.ts +9 -0
- package/dist/tools/web-fetch.d.ts.map +1 -0
- package/dist/tools/web-fetch.js +50 -0
- package/dist/tools/web-fetch.js.map +1 -0
- package/dist/tools/write.test.d.ts +2 -0
- package/dist/tools/write.test.d.ts.map +1 -0
- package/dist/tools/write.test.js +84 -0
- package/dist/tools/write.test.js.map +1 -0
- package/dist/ui/App.d.ts +82 -1
- package/dist/ui/App.d.ts.map +1 -1
- package/dist/ui/App.js +209 -28
- package/dist/ui/App.js.map +1 -1
- package/dist/ui/components/ActivityIndicator.d.ts +12 -0
- package/dist/ui/components/ActivityIndicator.d.ts.map +1 -0
- package/dist/ui/components/ActivityIndicator.js +243 -0
- package/dist/ui/components/ActivityIndicator.js.map +1 -0
- package/dist/ui/components/AssistantMessage.js +1 -1
- package/dist/ui/components/AssistantMessage.js.map +1 -1
- package/dist/ui/components/Banner.d.ts +10 -0
- package/dist/ui/components/Banner.d.ts.map +1 -0
- package/dist/ui/components/Banner.js +34 -0
- package/dist/ui/components/Banner.js.map +1 -0
- package/dist/ui/components/Markdown.d.ts.map +1 -1
- package/dist/ui/components/Markdown.js +14 -9
- package/dist/ui/components/Markdown.js.map +1 -1
- package/dist/ui/components/ModelSelector.d.ts +5 -1
- package/dist/ui/components/ModelSelector.d.ts.map +1 -1
- package/dist/ui/components/ModelSelector.js +14 -8
- package/dist/ui/components/ModelSelector.js.map +1 -1
- package/dist/ui/components/ScrollableContent.d.ts +22 -0
- package/dist/ui/components/ScrollableContent.d.ts.map +1 -0
- package/dist/ui/components/ScrollableContent.js +44 -0
- package/dist/ui/components/ScrollableContent.js.map +1 -0
- package/dist/ui/components/SelectList.d.ts +2 -1
- package/dist/ui/components/SelectList.d.ts.map +1 -1
- package/dist/ui/components/SelectList.js +2 -2
- package/dist/ui/components/SelectList.js.map +1 -1
- package/dist/ui/components/ServerToolExecution.d.ts +16 -0
- package/dist/ui/components/ServerToolExecution.d.ts.map +1 -0
- package/dist/ui/components/ServerToolExecution.js +51 -0
- package/dist/ui/components/ServerToolExecution.js.map +1 -0
- package/dist/ui/components/StreamingArea.d.ts +1 -4
- package/dist/ui/components/StreamingArea.d.ts.map +1 -1
- package/dist/ui/components/StreamingArea.js +2 -42
- package/dist/ui/components/StreamingArea.js.map +1 -1
- package/dist/ui/components/SubAgentPanel.d.ts +22 -0
- package/dist/ui/components/SubAgentPanel.d.ts.map +1 -0
- package/dist/ui/components/SubAgentPanel.js +47 -0
- package/dist/ui/components/SubAgentPanel.js.map +1 -0
- package/dist/ui/components/ToolExecution.d.ts.map +1 -1
- package/dist/ui/components/ToolExecution.js +88 -11
- package/dist/ui/components/ToolExecution.js.map +1 -1
- package/dist/ui/hooks/useAgentLoop.d.ts +17 -2
- package/dist/ui/hooks/useAgentLoop.d.ts.map +1 -1
- package/dist/ui/hooks/useAgentLoop.js +133 -7
- package/dist/ui/hooks/useAgentLoop.js.map +1 -1
- package/dist/ui/hooks/useMouseScroll.d.ts.map +1 -0
- package/dist/ui/hooks/useMouseScroll.js.map +1 -0
- package/dist/ui/hooks/useScrollViewport.d.ts +25 -0
- package/dist/ui/hooks/useScrollViewport.d.ts.map +1 -0
- package/dist/ui/hooks/useScrollViewport.js +32 -0
- package/dist/ui/hooks/useScrollViewport.js.map +1 -0
- package/dist/ui/login.d.ts +3 -0
- package/dist/ui/login.d.ts.map +1 -0
- package/dist/ui/login.js +90 -0
- package/dist/ui/login.js.map +1 -0
- package/dist/ui/render.d.ts +12 -1
- package/dist/ui/render.d.ts.map +1 -1
- package/dist/ui/render.js +7 -0
- package/dist/ui/render.js.map +1 -1
- package/dist/ui/utils/highlight.d.ts +8 -0
- package/dist/ui/utils/highlight.d.ts.map +1 -0
- package/dist/ui/utils/highlight.js +49 -0
- package/dist/ui/utils/highlight.js.map +1 -0
- package/dist/ui/utils/item-heights.d.ts +17 -0
- package/dist/ui/utils/item-heights.d.ts.map +1 -0
- package/dist/ui/utils/item-heights.js +73 -0
- package/dist/ui/utils/item-heights.js.map +1 -0
- package/package.json +6 -4
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { stream } from "@kenkaiiii/gg-ai";
|
|
2
|
-
import { estimateConversationTokens } from "./token-estimator.js";
|
|
2
|
+
import { estimateConversationTokens, estimateMessageTokens } from "./token-estimator.js";
|
|
3
3
|
/**
|
|
4
4
|
* Check if compaction should be triggered.
|
|
5
5
|
*/
|
|
@@ -7,6 +7,37 @@ export function shouldCompact(messages, contextWindow, threshold = 0.8) {
|
|
|
7
7
|
const estimated = estimateConversationTokens(messages);
|
|
8
8
|
return estimated > contextWindow * threshold;
|
|
9
9
|
}
|
|
10
|
+
/**
|
|
11
|
+
* Find the index where recent messages should start, given a token budget.
|
|
12
|
+
* Walks backward from the end, accumulating token estimates, and returns the
|
|
13
|
+
* first index that fits within the budget. Never cuts at index 0 (system message).
|
|
14
|
+
* Avoids splitting tool_call / tool_result pairs.
|
|
15
|
+
*/
|
|
16
|
+
export function findRecentCutPoint(messages, tokenBudget) {
|
|
17
|
+
if (messages.length <= 1)
|
|
18
|
+
return messages.length;
|
|
19
|
+
let accumulated = 0;
|
|
20
|
+
let cutIndex = messages.length;
|
|
21
|
+
// Walk backwards from the last message
|
|
22
|
+
for (let i = messages.length - 1; i >= 1; i--) {
|
|
23
|
+
const tokens = estimateMessageTokens(messages[i]);
|
|
24
|
+
if (accumulated + tokens > tokenBudget) {
|
|
25
|
+
break;
|
|
26
|
+
}
|
|
27
|
+
accumulated += tokens;
|
|
28
|
+
cutIndex = i;
|
|
29
|
+
}
|
|
30
|
+
// Don't split tool_call and tool_result pairs:
|
|
31
|
+
// If cut lands on a tool result message, back up to include the preceding assistant
|
|
32
|
+
if (cutIndex < messages.length && messages[cutIndex].role === "tool") {
|
|
33
|
+
// Back up to find the assistant message with the tool_call
|
|
34
|
+
if (cutIndex > 1) {
|
|
35
|
+
cutIndex--;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
// Never cut before index 1 (preserve system message at 0)
|
|
39
|
+
return Math.max(1, cutIndex);
|
|
40
|
+
}
|
|
10
41
|
/**
|
|
11
42
|
* Compact a conversation by summarizing middle messages via LLM.
|
|
12
43
|
* Returns a new messages array with summarized middle section.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compactor.js","sourceRoot":"","sources":["../../../src/core/compaction/compactor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA+B,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"compactor.js","sourceRoot":"","sources":["../../../src/core/compaction/compactor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compactor.test.d.ts","sourceRoot":"","sources":["../../../src/core/compaction/compactor.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
import { describe, it, expect } from "vitest";
|
|
2
|
+
import { shouldCompact, findRecentCutPoint } from "./compactor.js";
|
|
3
|
+
import { estimateConversationTokens } from "./token-estimator.js";
|
|
4
|
+
function makeMessage(role, content) {
|
|
5
|
+
return { role, content };
|
|
6
|
+
}
|
|
7
|
+
function makeToolCallMessage() {
|
|
8
|
+
return {
|
|
9
|
+
role: "assistant",
|
|
10
|
+
content: [{ type: "tool_call", id: "t1", name: "read", args: { path: "foo.ts" } }],
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
function makeToolResultMessage() {
|
|
14
|
+
return {
|
|
15
|
+
role: "tool",
|
|
16
|
+
content: [{ type: "tool_result", toolCallId: "t1", content: "file contents" }],
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
// ── shouldCompact ──────────────────────────────────────────
|
|
20
|
+
describe("shouldCompact", () => {
|
|
21
|
+
it("returns false when under threshold", () => {
|
|
22
|
+
const messages = [makeMessage("system", "sys"), makeMessage("user", "hello")];
|
|
23
|
+
// Estimated tokens ~= 13, contextWindow 200k, threshold 0.8 → 160k
|
|
24
|
+
expect(shouldCompact(messages, 200_000, 0.8)).toBe(false);
|
|
25
|
+
});
|
|
26
|
+
it("returns true when over threshold", () => {
|
|
27
|
+
// Create a message with enough content to exceed a small context window
|
|
28
|
+
const bigContent = "x".repeat(1000); // ~250 tokens
|
|
29
|
+
const messages = [makeMessage("system", bigContent), makeMessage("user", bigContent)];
|
|
30
|
+
// Total ~508 tokens, window=500, threshold 0.8 → 400
|
|
31
|
+
expect(shouldCompact(messages, 500, 0.8)).toBe(true);
|
|
32
|
+
});
|
|
33
|
+
it("uses default threshold of 0.8", () => {
|
|
34
|
+
const content = "x".repeat(400); // ~100 tokens + 4 overhead = 104
|
|
35
|
+
const messages = [makeMessage("user", content)];
|
|
36
|
+
const estimated = estimateConversationTokens(messages);
|
|
37
|
+
// With window = estimated / 0.7 → should be under 0.8 threshold
|
|
38
|
+
expect(shouldCompact(messages, Math.ceil(estimated / 0.7))).toBe(false);
|
|
39
|
+
// With window = estimated / 0.9 → should be over 0.8 threshold
|
|
40
|
+
expect(shouldCompact(messages, Math.ceil(estimated / 0.9))).toBe(true);
|
|
41
|
+
});
|
|
42
|
+
it("handles custom threshold", () => {
|
|
43
|
+
const content = "x".repeat(200); // ~50 tokens + 4 = 54
|
|
44
|
+
const messages = [makeMessage("user", content)];
|
|
45
|
+
const estimated = estimateConversationTokens(messages);
|
|
46
|
+
// Tight threshold: 0.5 → need window > estimated/0.5 to not compact
|
|
47
|
+
expect(shouldCompact(messages, estimated * 3, 0.5)).toBe(false);
|
|
48
|
+
expect(shouldCompact(messages, estimated, 0.5)).toBe(true);
|
|
49
|
+
});
|
|
50
|
+
});
|
|
51
|
+
// ── findRecentCutPoint ─────────────────────────────────────
|
|
52
|
+
describe("findRecentCutPoint", () => {
|
|
53
|
+
it("keeps all messages when total tokens are under budget", () => {
|
|
54
|
+
const messages = [
|
|
55
|
+
makeMessage("system", "sys"),
|
|
56
|
+
makeMessage("user", "hello"),
|
|
57
|
+
makeMessage("assistant", "hi"),
|
|
58
|
+
];
|
|
59
|
+
// All messages are small, budget is huge
|
|
60
|
+
const cut = findRecentCutPoint(messages, 100_000);
|
|
61
|
+
expect(cut).toBe(1); // Only system (index 0) is excluded
|
|
62
|
+
});
|
|
63
|
+
it("keeps only recent messages when total exceeds budget", () => {
|
|
64
|
+
const big = "x".repeat(400); // ~100 tokens each
|
|
65
|
+
const messages = [
|
|
66
|
+
makeMessage("system", "sys"),
|
|
67
|
+
makeMessage("user", big), // ~104 tokens
|
|
68
|
+
makeMessage("assistant", big), // ~104 tokens
|
|
69
|
+
makeMessage("user", big), // ~104 tokens
|
|
70
|
+
makeMessage("assistant", big), // ~104 tokens
|
|
71
|
+
makeMessage("user", "last"), // ~5 tokens
|
|
72
|
+
];
|
|
73
|
+
// Budget of 120 tokens — should keep last ~1-2 messages
|
|
74
|
+
const cut = findRecentCutPoint(messages, 120);
|
|
75
|
+
expect(cut).toBeGreaterThan(1);
|
|
76
|
+
expect(cut).toBeLessThan(messages.length);
|
|
77
|
+
});
|
|
78
|
+
it("never cuts at index 0 (system message)", () => {
|
|
79
|
+
const messages = [makeMessage("system", "sys"), makeMessage("user", "hi")];
|
|
80
|
+
const cut = findRecentCutPoint(messages, 100_000);
|
|
81
|
+
expect(cut).toBeGreaterThanOrEqual(1);
|
|
82
|
+
});
|
|
83
|
+
it("does not split tool_call and tool_result pairs", () => {
|
|
84
|
+
const big = "x".repeat(400); // ~100 tokens
|
|
85
|
+
const messages = [
|
|
86
|
+
makeMessage("system", "sys"),
|
|
87
|
+
makeMessage("user", big),
|
|
88
|
+
makeToolCallMessage(), // assistant with tool_call
|
|
89
|
+
makeToolResultMessage(), // tool result
|
|
90
|
+
makeMessage("user", "thanks"),
|
|
91
|
+
];
|
|
92
|
+
// Budget that would normally cut at the tool result (index 3)
|
|
93
|
+
// should back up to include the tool_call (index 2)
|
|
94
|
+
const cut = findRecentCutPoint(messages, 50);
|
|
95
|
+
// The cut should NOT leave a tool result as the first kept message
|
|
96
|
+
if (cut < messages.length) {
|
|
97
|
+
expect(messages[cut].role).not.toBe("tool");
|
|
98
|
+
}
|
|
99
|
+
});
|
|
100
|
+
it("handles conversation with only system message", () => {
|
|
101
|
+
const messages = [makeMessage("system", "sys")];
|
|
102
|
+
const cut = findRecentCutPoint(messages, 100);
|
|
103
|
+
expect(cut).toBe(1); // Nothing to keep beyond system
|
|
104
|
+
});
|
|
105
|
+
it("returns length when budget is 0", () => {
|
|
106
|
+
const messages = [
|
|
107
|
+
makeMessage("system", "sys"),
|
|
108
|
+
makeMessage("user", "hello"),
|
|
109
|
+
makeMessage("assistant", "hi"),
|
|
110
|
+
];
|
|
111
|
+
const cut = findRecentCutPoint(messages, 0);
|
|
112
|
+
// Can't fit anything — cut at the end
|
|
113
|
+
expect(cut).toBe(messages.length);
|
|
114
|
+
});
|
|
115
|
+
});
|
|
116
|
+
//# sourceMappingURL=compactor.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compactor.test.js","sourceRoot":"","sources":["../../../src/core/compaction/compactor.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAQlE,SAAS,WAAW,CAAC,IAAqB,EAAE,OAAe;IACzD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAa,CAAC;AACtC,CAAC;AAED,SAAS,mBAAmB;IAC1B,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC;KACnF,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB;IAC5B,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;KAC/E,CAAC;AACJ,CAAC;AAED,8DAA8D;AAE9D,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,QAAQ,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QAC9E,mEAAmE;QACnE,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,wEAAwE;QACxE,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc;QACnD,MAAM,QAAQ,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;QACtF,qDAAqD;QACrD,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACvC,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,iCAAiC;QAClE,MAAM,QAAQ,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,0BAA0B,CAAC,QAAQ,CAAC,CAAC;QACvD,gEAAgE;QAChE,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxE,+DAA+D;QAC/D,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0BAA0B,EAAE,GAAG,EAAE;QAClC,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,sBAAsB;QACvD,MAAM,QAAQ,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,0BAA0B,CAAC,QAAQ,CAAC,CAAC;QACvD,oEAAoE;QACpE,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,SAAS,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChE,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,8DAA8D;AAE9D,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,MAAM,QAAQ,GAAG;YACf,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC;YAC5B,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC;YAC5B,WAAW,CAAC,WAAW,EAAE,IAAI,CAAC;SAC/B,CAAC;QACF,yCAAyC;QACzC,MAAM,GAAG,GAAG,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,oCAAoC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAmB;QAChD,MAAM,QAAQ,GAAG;YACf,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC;YAC5B,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,cAAc;YACxC,WAAW,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,cAAc;YAC7C,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,cAAc;YACxC,WAAW,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,cAAc;YAC7C,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY;SAC1C,CAAC;QACF,wDAAwD;QACxD,MAAM,GAAG,GAAG,kBAAkB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC9C,MAAM,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,MAAM,QAAQ,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;QAC3E,MAAM,GAAG,GAAG,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,MAAM,CAAC,GAAG,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc;QAC3C,MAAM,QAAQ,GAAG;YACf,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC;YAC5B,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC;YACxB,mBAAmB,EAAE,EAAE,2BAA2B;YAClD,qBAAqB,EAAE,EAAE,cAAc;YACvC,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC;SAC9B,CAAC;QACF,8DAA8D;QAC9D,oDAAoD;QACpD,MAAM,GAAG,GAAG,kBAAkB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC7C,mEAAmE;QACnE,IAAI,GAAG,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC1B,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,QAAQ,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,kBAAkB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC9C,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,gCAAgC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,QAAQ,GAAG;YACf,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC;YAC5B,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC;YAC5B,WAAW,CAAC,WAAW,EAAE,IAAI,CAAC;SAC/B,CAAC;QACF,MAAM,GAAG,GAAG,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC5C,sCAAsC;QACtC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token-estimator.test.d.ts","sourceRoot":"","sources":["../../../src/core/compaction/token-estimator.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
import { describe, it, expect } from "vitest";
|
|
2
|
+
import { estimateTokens, estimateMessageTokens, estimateConversationTokens, } from "./token-estimator.js";
|
|
3
|
+
describe("estimateTokens", () => {
|
|
4
|
+
it("returns 0 for empty string", () => {
|
|
5
|
+
expect(estimateTokens("")).toBe(0);
|
|
6
|
+
});
|
|
7
|
+
it("estimates at ~4 chars per token", () => {
|
|
8
|
+
expect(estimateTokens("abcd")).toBe(1);
|
|
9
|
+
expect(estimateTokens("abcdefgh")).toBe(2);
|
|
10
|
+
expect(estimateTokens("abc")).toBe(1); // ceil(3/4) = 1
|
|
11
|
+
});
|
|
12
|
+
it("handles long text", () => {
|
|
13
|
+
const text = "a".repeat(1000);
|
|
14
|
+
expect(estimateTokens(text)).toBe(250);
|
|
15
|
+
});
|
|
16
|
+
});
|
|
17
|
+
describe("estimateMessageTokens", () => {
|
|
18
|
+
it("estimates string content message", () => {
|
|
19
|
+
const msg = { role: "user", content: "Hello world" };
|
|
20
|
+
const tokens = estimateMessageTokens(msg);
|
|
21
|
+
// ceil(11/4) = 3 + 4 overhead = 7
|
|
22
|
+
expect(tokens).toBe(7);
|
|
23
|
+
});
|
|
24
|
+
it("includes per-message overhead", () => {
|
|
25
|
+
const msg = { role: "user", content: "" };
|
|
26
|
+
// 0 content + 4 overhead
|
|
27
|
+
expect(estimateMessageTokens(msg)).toBe(4);
|
|
28
|
+
});
|
|
29
|
+
it("estimates text content parts", () => {
|
|
30
|
+
const msg = {
|
|
31
|
+
role: "assistant",
|
|
32
|
+
content: [{ type: "text", text: "Hello" }],
|
|
33
|
+
};
|
|
34
|
+
const tokens = estimateMessageTokens(msg);
|
|
35
|
+
// ceil(5/4) = 2 + 4 overhead = 6
|
|
36
|
+
expect(tokens).toBe(6);
|
|
37
|
+
});
|
|
38
|
+
it("estimates tool call parts", () => {
|
|
39
|
+
const msg = {
|
|
40
|
+
role: "assistant",
|
|
41
|
+
content: [
|
|
42
|
+
{
|
|
43
|
+
type: "tool_call",
|
|
44
|
+
id: "tc1",
|
|
45
|
+
name: "read_file",
|
|
46
|
+
args: { path: "/foo/bar.ts" },
|
|
47
|
+
},
|
|
48
|
+
],
|
|
49
|
+
};
|
|
50
|
+
const tokens = estimateMessageTokens(msg);
|
|
51
|
+
// name "read_file" = ceil(9/4) = 3
|
|
52
|
+
// args JSON '{"path":"/foo/bar.ts"}' = ceil(21/4) = 6
|
|
53
|
+
// + 4 overhead = 13
|
|
54
|
+
expect(tokens).toBe(13);
|
|
55
|
+
});
|
|
56
|
+
it("estimates tool result parts", () => {
|
|
57
|
+
const msg = {
|
|
58
|
+
role: "tool",
|
|
59
|
+
content: [
|
|
60
|
+
{
|
|
61
|
+
type: "tool_result",
|
|
62
|
+
toolCallId: "tc1",
|
|
63
|
+
content: "file contents here",
|
|
64
|
+
},
|
|
65
|
+
],
|
|
66
|
+
};
|
|
67
|
+
const tokens = estimateMessageTokens(msg);
|
|
68
|
+
// "file contents here" = ceil(18/4) = 5 + 4 overhead = 9
|
|
69
|
+
expect(tokens).toBe(9);
|
|
70
|
+
});
|
|
71
|
+
it("sums multiple content parts", () => {
|
|
72
|
+
const msg = {
|
|
73
|
+
role: "assistant",
|
|
74
|
+
content: [
|
|
75
|
+
{ type: "text", text: "Here is the result:" },
|
|
76
|
+
{ type: "text", text: "Done" },
|
|
77
|
+
],
|
|
78
|
+
};
|
|
79
|
+
const tokens = estimateMessageTokens(msg);
|
|
80
|
+
// ceil(19/4) = 5 + ceil(4/4) = 1 + 4 overhead = 10
|
|
81
|
+
expect(tokens).toBe(10);
|
|
82
|
+
});
|
|
83
|
+
});
|
|
84
|
+
describe("estimateConversationTokens", () => {
|
|
85
|
+
it("returns 0 for empty array", () => {
|
|
86
|
+
expect(estimateConversationTokens([])).toBe(0);
|
|
87
|
+
});
|
|
88
|
+
it("sums all message estimates", () => {
|
|
89
|
+
const messages = [
|
|
90
|
+
{ role: "system", content: "You are helpful." }, // ceil(16/4)=4 + 4 = 8
|
|
91
|
+
{ role: "user", content: "Hi" }, // ceil(2/4)=1 + 4 = 5
|
|
92
|
+
];
|
|
93
|
+
expect(estimateConversationTokens(messages)).toBe(13);
|
|
94
|
+
});
|
|
95
|
+
it("handles a full conversation with tool calls", () => {
|
|
96
|
+
const messages = [
|
|
97
|
+
{ role: "system", content: "sys" },
|
|
98
|
+
{ role: "user", content: "read foo" },
|
|
99
|
+
{
|
|
100
|
+
role: "assistant",
|
|
101
|
+
content: [{ type: "tool_call", id: "t1", name: "read", args: { p: "foo" } }],
|
|
102
|
+
},
|
|
103
|
+
{
|
|
104
|
+
role: "tool",
|
|
105
|
+
content: [{ type: "tool_result", toolCallId: "t1", content: "bar" }],
|
|
106
|
+
},
|
|
107
|
+
{ role: "assistant", content: "The file contains: bar" },
|
|
108
|
+
];
|
|
109
|
+
const total = estimateConversationTokens(messages);
|
|
110
|
+
expect(total).toBeGreaterThan(0);
|
|
111
|
+
// Each message has at least 4 overhead tokens
|
|
112
|
+
expect(total).toBeGreaterThanOrEqual(5 * 4);
|
|
113
|
+
});
|
|
114
|
+
});
|
|
115
|
+
//# sourceMappingURL=token-estimator.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token-estimator.test.js","sourceRoot":"","sources":["../../../src/core/compaction/token-estimator.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,0BAA0B,GAC3B,MAAM,sBAAsB,CAAC;AAG9B,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QACpC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC3B,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC9B,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,GAAG,GAAY,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;QAC9D,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAC1C,kCAAkC;QAClC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACvC,MAAM,GAAG,GAAY,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QACnD,yBAAyB;QACzB,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,GAAG,GAAY;YACnB,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;SAC3C,CAAC;QACF,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAC1C,iCAAiC;QACjC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,GAAG,GAAY;YACnB,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,WAAW;oBACjB,EAAE,EAAE,KAAK;oBACT,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE;iBAC9B;aACF;SACF,CAAC;QACF,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAC1C,mCAAmC;QACnC,sDAAsD;QACtD,oBAAoB;QACpB,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,MAAM,GAAG,GAAY;YACnB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,aAAa;oBACnB,UAAU,EAAE,KAAK;oBACjB,OAAO,EAAE,oBAAoB;iBAC9B;aACF;SACF,CAAC;QACF,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAC1C,yDAAyD;QACzD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,MAAM,GAAG,GAAY;YACnB,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE;gBACP,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,qBAAqB,EAAE;gBAC7C,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE;aAC/B;SACF,CAAC;QACF,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAC1C,mDAAmD;QACnD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,CAAC,0BAA0B,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QACpC,MAAM,QAAQ,GAAc;YAC1B,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,uBAAuB;YACxE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,sBAAsB;SACxD,CAAC;QACF,MAAM,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,QAAQ,GAAc;YAC1B,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE;YAClC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE;YACrC;gBACE,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;aAC7E;YACD;gBACE,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;aACrE;YACD,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,wBAAwB,EAAE;SACzD,CAAC;QACF,MAAM,KAAK,GAAG,0BAA0B,CAAC,QAAQ,CAAC,CAAC;QACnD,MAAM,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QACjC,8CAA8C;QAC9C,MAAM,CAAC,KAAK,CAAC,CAAC,sBAAsB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/dist/core/event-bus.d.ts
CHANGED
|
@@ -11,6 +11,10 @@ export interface BusEventMap {
|
|
|
11
11
|
name: string;
|
|
12
12
|
args: Record<string, unknown>;
|
|
13
13
|
};
|
|
14
|
+
tool_call_update: {
|
|
15
|
+
toolCallId: string;
|
|
16
|
+
update: unknown;
|
|
17
|
+
};
|
|
14
18
|
tool_call_end: {
|
|
15
19
|
toolCallId: string;
|
|
16
20
|
result: string;
|
|
@@ -35,6 +39,16 @@ export interface BusEventMap {
|
|
|
35
39
|
error: {
|
|
36
40
|
error: Error;
|
|
37
41
|
};
|
|
42
|
+
server_tool_call: {
|
|
43
|
+
id: string;
|
|
44
|
+
name: string;
|
|
45
|
+
input: unknown;
|
|
46
|
+
};
|
|
47
|
+
server_tool_result: {
|
|
48
|
+
toolUseId: string;
|
|
49
|
+
resultType: string;
|
|
50
|
+
data: unknown;
|
|
51
|
+
};
|
|
38
52
|
session_start: {
|
|
39
53
|
sessionId: string;
|
|
40
54
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-bus.d.ts","sourceRoot":"","sources":["../../src/core/event-bus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAItD,MAAM,WAAW,WAAW;IAE1B,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7B,cAAc,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACjC,eAAe,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC;IACrF,aAAa,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5F,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE;YAAE,WAAW,EAAE,MAAM,CAAC;YAAC,YAAY,EAAE,MAAM,CAAA;SAAE,CAAC;KACtD,CAAC;IACF,UAAU,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE;YAAE,WAAW,EAAE,MAAM,CAAC;YAAC,YAAY,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;IAC9F,KAAK,EAAE;QAAE,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC;IAGxB,aAAa,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,YAAY,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAClD,gBAAgB,EAAE;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,cAAc,EAAE;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IAG5D,UAAU,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAChC,aAAa,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/C;AAED,KAAK,QAAQ,GAAG,MAAM,WAAW,CAAC;AAClC,KAAK,YAAY,CAAC,CAAC,SAAS,QAAQ,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;AAI1E,qBAAa,QAAQ;IAEnB,OAAO,CAAC,SAAS,CAAoD;IAErE,EAAE,CAAC,CAAC,SAAS,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI;IAQtE,GAAG,CAAC,CAAC,SAAS,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI;IAIjE,IAAI,CAAC,CAAC,SAAS,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI;IAQjE,IAAI,CAAC,CAAC,SAAS,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI;IAQxE,iBAAiB,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"event-bus.d.ts","sourceRoot":"","sources":["../../src/core/event-bus.ts"],"names":[],"mappings":"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"}
|
package/dist/core/event-bus.js
CHANGED
|
@@ -42,6 +42,12 @@ export class EventBus {
|
|
|
42
42
|
args: event.args,
|
|
43
43
|
});
|
|
44
44
|
break;
|
|
45
|
+
case "tool_call_update":
|
|
46
|
+
this.emit("tool_call_update", {
|
|
47
|
+
toolCallId: event.toolCallId,
|
|
48
|
+
update: event.update,
|
|
49
|
+
});
|
|
50
|
+
break;
|
|
45
51
|
case "tool_call_end":
|
|
46
52
|
this.emit("tool_call_end", {
|
|
47
53
|
toolCallId: event.toolCallId,
|
|
@@ -63,6 +69,20 @@ export class EventBus {
|
|
|
63
69
|
totalUsage: event.totalUsage,
|
|
64
70
|
});
|
|
65
71
|
break;
|
|
72
|
+
case "server_tool_call":
|
|
73
|
+
this.emit("server_tool_call", {
|
|
74
|
+
id: event.id,
|
|
75
|
+
name: event.name,
|
|
76
|
+
input: event.input,
|
|
77
|
+
});
|
|
78
|
+
break;
|
|
79
|
+
case "server_tool_result":
|
|
80
|
+
this.emit("server_tool_result", {
|
|
81
|
+
toolUseId: event.toolUseId,
|
|
82
|
+
resultType: event.resultType,
|
|
83
|
+
data: event.data,
|
|
84
|
+
});
|
|
85
|
+
break;
|
|
66
86
|
case "error":
|
|
67
87
|
this.emit("error", { error: event.error });
|
|
68
88
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-bus.js","sourceRoot":"","sources":["../../src/core/event-bus.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"event-bus.js","sourceRoot":"","sources":["../../src/core/event-bus.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { Provider, ThinkingLevel } from "@kenkaiiii/gg-ai";
|
|
2
|
+
export interface JsonModeOptions {
|
|
3
|
+
message: string;
|
|
4
|
+
provider: Provider;
|
|
5
|
+
model: string;
|
|
6
|
+
baseUrl?: string;
|
|
7
|
+
systemPrompt?: string;
|
|
8
|
+
cwd: string;
|
|
9
|
+
thinkingLevel?: ThinkingLevel;
|
|
10
|
+
maxTurns?: number;
|
|
11
|
+
}
|
|
12
|
+
export declare function runJsonMode(options: JsonModeOptions): Promise<void>;
|
|
13
|
+
//# sourceMappingURL=json-mode.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"json-mode.d.ts","sourceRoot":"","sources":["../../src/modes/json-mode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIhE,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAMD,wBAAsB,WAAW,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAiEzE"}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { AgentSession } from "../core/agent-session.js";
|
|
2
|
+
import { formatUserError } from "../utils/error-handler.js";
|
|
3
|
+
function emitJson(payload) {
|
|
4
|
+
process.stdout.write(JSON.stringify(payload) + "\n");
|
|
5
|
+
}
|
|
6
|
+
export async function runJsonMode(options) {
|
|
7
|
+
const ac = new AbortController();
|
|
8
|
+
const onSigint = () => ac.abort();
|
|
9
|
+
process.on("SIGINT", onSigint);
|
|
10
|
+
const sessionOpts = {
|
|
11
|
+
provider: options.provider,
|
|
12
|
+
model: options.model,
|
|
13
|
+
baseUrl: options.baseUrl,
|
|
14
|
+
systemPrompt: options.systemPrompt,
|
|
15
|
+
cwd: options.cwd,
|
|
16
|
+
thinkingLevel: options.thinkingLevel,
|
|
17
|
+
maxTurns: options.maxTurns,
|
|
18
|
+
signal: ac.signal,
|
|
19
|
+
enableSubAgents: false, // Prevent infinite recursion
|
|
20
|
+
};
|
|
21
|
+
const session = new AgentSession(sessionOpts);
|
|
22
|
+
// Forward all agent events as NDJSON to stdout
|
|
23
|
+
session.eventBus.on("text_delta", (payload) => {
|
|
24
|
+
emitJson({ type: "text_delta", ...payload });
|
|
25
|
+
});
|
|
26
|
+
session.eventBus.on("thinking_delta", (payload) => {
|
|
27
|
+
emitJson({ type: "thinking_delta", ...payload });
|
|
28
|
+
});
|
|
29
|
+
session.eventBus.on("tool_call_start", (payload) => {
|
|
30
|
+
emitJson({ type: "tool_call_start", ...payload });
|
|
31
|
+
});
|
|
32
|
+
session.eventBus.on("tool_call_update", (payload) => {
|
|
33
|
+
emitJson({ type: "tool_call_update", ...payload });
|
|
34
|
+
});
|
|
35
|
+
session.eventBus.on("tool_call_end", (payload) => {
|
|
36
|
+
emitJson({ type: "tool_call_end", ...payload });
|
|
37
|
+
});
|
|
38
|
+
session.eventBus.on("turn_end", (payload) => {
|
|
39
|
+
emitJson({ type: "turn_end", ...payload });
|
|
40
|
+
});
|
|
41
|
+
session.eventBus.on("agent_done", (payload) => {
|
|
42
|
+
emitJson({ type: "agent_done", ...payload });
|
|
43
|
+
});
|
|
44
|
+
session.eventBus.on("server_tool_call", (payload) => {
|
|
45
|
+
emitJson({ type: "server_tool_call", ...payload });
|
|
46
|
+
});
|
|
47
|
+
session.eventBus.on("server_tool_result", (payload) => {
|
|
48
|
+
emitJson({ type: "server_tool_result", ...payload });
|
|
49
|
+
});
|
|
50
|
+
session.eventBus.on("error", ({ error }) => {
|
|
51
|
+
emitJson({ type: "error", message: error.message });
|
|
52
|
+
});
|
|
53
|
+
try {
|
|
54
|
+
await session.initialize();
|
|
55
|
+
await session.prompt(options.message);
|
|
56
|
+
}
|
|
57
|
+
catch (err) {
|
|
58
|
+
if (err instanceof Error && err.name === "AbortError") {
|
|
59
|
+
emitJson({ type: "error", message: "Interrupted" });
|
|
60
|
+
process.exit(130);
|
|
61
|
+
}
|
|
62
|
+
process.stderr.write(formatUserError(err) + "\n");
|
|
63
|
+
process.exit(1);
|
|
64
|
+
}
|
|
65
|
+
finally {
|
|
66
|
+
process.removeListener("SIGINT", onSigint);
|
|
67
|
+
await session.dispose();
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
//# sourceMappingURL=json-mode.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"json-mode.js","sourceRoot":"","sources":["../../src/modes/json-mode.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/index.d.ts
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
import type { AgentTool } from "@kenkaiiii/gg-agent";
|
|
2
|
-
|
|
2
|
+
import type { AgentDefinition } from "../core/agents.js";
|
|
3
|
+
export interface CreateToolsOptions {
|
|
4
|
+
agents?: AgentDefinition[];
|
|
5
|
+
provider?: string;
|
|
6
|
+
model?: string;
|
|
7
|
+
}
|
|
8
|
+
export declare function createTools(cwd: string, opts?: CreateToolsOptions): AgentTool[];
|
|
3
9
|
export { createReadTool } from "./read.js";
|
|
4
10
|
export { createWriteTool } from "./write.js";
|
|
5
11
|
export { createEditTool } from "./edit.js";
|
|
@@ -7,4 +13,5 @@ export { createBashTool } from "./bash.js";
|
|
|
7
13
|
export { createFindTool } from "./find.js";
|
|
8
14
|
export { createGrepTool } from "./grep.js";
|
|
9
15
|
export { createLsTool } from "./ls.js";
|
|
16
|
+
export { createWebFetchTool } from "./web-fetch.js";
|
|
10
17
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAUrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,EAAE,CAkB/E;AAED,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC"}
|
package/dist/tools/index.js
CHANGED
|
@@ -5,9 +5,11 @@ import { createBashTool } from "./bash.js";
|
|
|
5
5
|
import { createFindTool } from "./find.js";
|
|
6
6
|
import { createGrepTool } from "./grep.js";
|
|
7
7
|
import { createLsTool } from "./ls.js";
|
|
8
|
-
|
|
8
|
+
import { createSubAgentTool } from "./subagent.js";
|
|
9
|
+
import { createWebFetchTool } from "./web-fetch.js";
|
|
10
|
+
export function createTools(cwd, opts) {
|
|
9
11
|
const readFiles = new Set();
|
|
10
|
-
|
|
12
|
+
const tools = [
|
|
11
13
|
createReadTool(cwd, readFiles),
|
|
12
14
|
createWriteTool(cwd, readFiles),
|
|
13
15
|
createEditTool(cwd, readFiles),
|
|
@@ -15,7 +17,12 @@ export function createTools(cwd) {
|
|
|
15
17
|
createFindTool(cwd),
|
|
16
18
|
createGrepTool(cwd),
|
|
17
19
|
createLsTool(cwd),
|
|
20
|
+
createWebFetchTool(),
|
|
18
21
|
];
|
|
22
|
+
if (opts?.agents && opts.agents.length > 0 && opts.provider && opts.model) {
|
|
23
|
+
tools.push(createSubAgentTool(cwd, opts.agents, opts.provider, opts.model));
|
|
24
|
+
}
|
|
25
|
+
return tools;
|
|
19
26
|
}
|
|
20
27
|
export { createReadTool } from "./read.js";
|
|
21
28
|
export { createWriteTool } from "./write.js";
|
|
@@ -24,4 +31,5 @@ export { createBashTool } from "./bash.js";
|
|
|
24
31
|
export { createFindTool } from "./find.js";
|
|
25
32
|
export { createGrepTool } from "./grep.js";
|
|
26
33
|
export { createLsTool } from "./ls.js";
|
|
34
|
+
export { createWebFetchTool } from "./web-fetch.js";
|
|
27
35
|
//# sourceMappingURL=index.js.map
|
package/dist/tools/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AASpD,MAAM,UAAU,WAAW,CAAC,GAAW,EAAE,IAAyB;IAChE,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,MAAM,KAAK,GAAgB;QACzB,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC;QAC9B,eAAe,CAAC,GAAG,EAAE,SAAS,CAAC;QAC/B,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC;QAC9B,cAAc,CAAC,GAAG,CAAC;QACnB,cAAc,CAAC,GAAG,CAAC;QACnB,cAAc,CAAC,GAAG,CAAC;QACnB,YAAY,CAAC,GAAG,CAAC;QACjB,kBAAkB,EAAE;KACrB,CAAC;IAEF,IAAI,IAAI,EAAE,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1E,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { z } from "zod";
|
|
2
|
+
import type { AgentTool } from "@kenkaiiii/gg-agent";
|
|
3
|
+
import type { AgentDefinition } from "../core/agents.js";
|
|
4
|
+
declare const SubAgentParams: z.ZodObject<{
|
|
5
|
+
task: z.ZodString;
|
|
6
|
+
agent: z.ZodOptional<z.ZodString>;
|
|
7
|
+
}, z.core.$strip>;
|
|
8
|
+
export interface SubAgentUpdate {
|
|
9
|
+
toolUseCount: number;
|
|
10
|
+
tokenUsage: {
|
|
11
|
+
input: number;
|
|
12
|
+
output: number;
|
|
13
|
+
};
|
|
14
|
+
currentActivity?: string;
|
|
15
|
+
}
|
|
16
|
+
export interface SubAgentDetails {
|
|
17
|
+
toolUseCount: number;
|
|
18
|
+
tokenUsage: {
|
|
19
|
+
input: number;
|
|
20
|
+
output: number;
|
|
21
|
+
};
|
|
22
|
+
durationMs: number;
|
|
23
|
+
}
|
|
24
|
+
export declare function createSubAgentTool(cwd: string, agents: AgentDefinition[], parentProvider: string, parentModel: string): AgentTool<typeof SubAgentParams>;
|
|
25
|
+
export {};
|
|
26
|
+
//# sourceMappingURL=subagent.d.ts.map
|
|
@@ -0,0 +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;AAOzD,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,CAgKlC"}
|