@oni.bot/core 0.8.0 → 1.0.1
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/CHANGELOG.md +15 -0
- package/README.md +59 -373
- package/dist/checkpointers/sqlite.d.ts.map +1 -1
- package/dist/checkpointers/sqlite.js +23 -8
- package/dist/checkpointers/sqlite.js.map +1 -1
- package/dist/cli/build.d.ts +11 -0
- package/dist/cli/build.d.ts.map +1 -0
- package/dist/cli/build.js +61 -0
- package/dist/cli/build.js.map +1 -0
- package/dist/cli/dev.d.ts +5 -0
- package/dist/cli/dev.d.ts.map +1 -0
- package/dist/cli/dev.js +54 -0
- package/dist/cli/dev.js.map +1 -0
- package/dist/cli/index.js +16 -27
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/init.d.ts +2 -0
- package/dist/cli/init.d.ts.map +1 -1
- package/dist/cli/init.js +18 -1
- package/dist/cli/init.js.map +1 -1
- package/dist/cli/inspect.d.ts +5 -0
- package/dist/cli/inspect.d.ts.map +1 -0
- package/dist/cli/inspect.js +85 -0
- package/dist/cli/inspect.js.map +1 -0
- package/dist/cli/router.d.ts +14 -0
- package/dist/cli/router.d.ts.map +1 -0
- package/dist/cli/router.js +107 -0
- package/dist/cli/router.js.map +1 -0
- package/dist/cli/run.d.ts +5 -0
- package/dist/cli/run.d.ts.map +1 -0
- package/dist/cli/run.js +53 -0
- package/dist/cli/run.js.map +1 -0
- package/dist/cli/templates.d.ts +1 -0
- package/dist/cli/templates.d.ts.map +1 -1
- package/dist/cli/templates.js +106 -66
- package/dist/cli/templates.js.map +1 -1
- package/dist/cli/test.d.ts +3 -0
- package/dist/cli/test.d.ts.map +1 -0
- package/dist/cli/test.js +29 -0
- package/dist/cli/test.js.map +1 -0
- package/dist/config/index.d.ts +3 -0
- package/dist/config/index.d.ts.map +1 -0
- package/dist/config/index.js +3 -0
- package/dist/config/index.js.map +1 -0
- package/dist/config/loader.d.ts +37 -0
- package/dist/config/loader.d.ts.map +1 -0
- package/dist/config/loader.js +180 -0
- package/dist/config/loader.js.map +1 -0
- package/dist/config/types.d.ts +74 -0
- package/dist/config/types.d.ts.map +1 -0
- package/dist/config/types.js +5 -0
- package/dist/config/types.js.map +1 -0
- package/dist/coordination/pubsub.d.ts +4 -0
- package/dist/coordination/pubsub.d.ts.map +1 -1
- package/dist/coordination/pubsub.js +8 -0
- package/dist/coordination/pubsub.js.map +1 -1
- package/dist/coordination/request-reply.d.ts +3 -1
- package/dist/coordination/request-reply.d.ts.map +1 -1
- package/dist/coordination/request-reply.js +11 -2
- package/dist/coordination/request-reply.js.map +1 -1
- package/dist/errors.d.ts +7 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +18 -3
- package/dist/errors.js.map +1 -1
- package/dist/events/bridge.d.ts +17 -0
- package/dist/events/bridge.d.ts.map +1 -0
- package/dist/events/bridge.js +67 -0
- package/dist/events/bridge.js.map +1 -0
- package/dist/events/bus.d.ts +9 -0
- package/dist/events/bus.d.ts.map +1 -1
- package/dist/events/bus.js +39 -4
- package/dist/events/bus.js.map +1 -1
- package/dist/events/index.d.ts +2 -1
- package/dist/events/index.d.ts.map +1 -1
- package/dist/events/index.js +2 -0
- package/dist/events/index.js.map +1 -1
- package/dist/events/types.d.ts +123 -1
- package/dist/events/types.d.ts.map +1 -1
- package/dist/graph.d.ts.map +1 -1
- package/dist/graph.js +16 -8
- package/dist/graph.js.map +1 -1
- package/dist/guardrails/types.d.ts +1 -1
- package/dist/guardrails/types.d.ts.map +1 -1
- package/dist/harness/agent-loop.d.ts.map +1 -1
- package/dist/harness/agent-loop.js +226 -29
- package/dist/harness/agent-loop.js.map +1 -1
- package/dist/harness/context-compactor.d.ts +21 -2
- package/dist/harness/context-compactor.d.ts.map +1 -1
- package/dist/harness/context-compactor.js +45 -6
- package/dist/harness/context-compactor.js.map +1 -1
- package/dist/harness/hooks-engine.d.ts +7 -1
- package/dist/harness/hooks-engine.d.ts.map +1 -1
- package/dist/harness/hooks-engine.js.map +1 -1
- package/dist/harness/index.d.ts +3 -2
- package/dist/harness/index.d.ts.map +1 -1
- package/dist/harness/index.js +2 -0
- package/dist/harness/index.js.map +1 -1
- package/dist/harness/skill-loader.d.ts +14 -1
- package/dist/harness/skill-loader.d.ts.map +1 -1
- package/dist/harness/skill-loader.js +33 -3
- package/dist/harness/skill-loader.js.map +1 -1
- package/dist/harness/types.d.ts +24 -2
- package/dist/harness/types.d.ts.map +1 -1
- package/dist/harness/types.js.map +1 -1
- package/dist/harness/validate-args.d.ts +16 -0
- package/dist/harness/validate-args.d.ts.map +1 -0
- package/dist/harness/validate-args.js +132 -0
- package/dist/harness/validate-args.js.map +1 -0
- package/dist/index.d.ts +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +12 -12
- package/dist/index.js.map +1 -1
- package/dist/internal/timeout.d.ts +2 -0
- package/dist/internal/timeout.d.ts.map +1 -0
- package/dist/internal/timeout.js +16 -0
- package/dist/internal/timeout.js.map +1 -0
- package/dist/lsp/client.d.ts +70 -0
- package/dist/lsp/client.d.ts.map +1 -0
- package/dist/lsp/client.js +421 -0
- package/dist/lsp/client.js.map +1 -0
- package/dist/lsp/index.d.ts +77 -0
- package/dist/lsp/index.d.ts.map +1 -0
- package/dist/lsp/index.js +183 -0
- package/dist/lsp/index.js.map +1 -0
- package/dist/lsp/servers.d.ts +48 -0
- package/dist/lsp/servers.d.ts.map +1 -0
- package/dist/lsp/servers.js +108 -0
- package/dist/lsp/servers.js.map +1 -0
- package/dist/lsp/types.d.ts +142 -0
- package/dist/lsp/types.d.ts.map +1 -0
- package/dist/lsp/types.js +16 -0
- package/dist/lsp/types.js.map +1 -0
- package/dist/mcp/client.d.ts +56 -0
- package/dist/mcp/client.d.ts.map +1 -0
- package/dist/mcp/client.js +170 -0
- package/dist/mcp/client.js.map +1 -0
- package/dist/mcp/convert.d.ts +26 -0
- package/dist/mcp/convert.d.ts.map +1 -0
- package/dist/mcp/convert.js +56 -0
- package/dist/mcp/convert.js.map +1 -0
- package/dist/mcp/index.d.ts +21 -0
- package/dist/mcp/index.d.ts.map +1 -0
- package/dist/mcp/index.js +19 -0
- package/dist/mcp/index.js.map +1 -0
- package/dist/mcp/transport.d.ts +56 -0
- package/dist/mcp/transport.d.ts.map +1 -0
- package/dist/mcp/transport.js +204 -0
- package/dist/mcp/transport.js.map +1 -0
- package/dist/mcp/types.d.ts +96 -0
- package/dist/mcp/types.d.ts.map +1 -0
- package/dist/mcp/types.js +11 -0
- package/dist/mcp/types.js.map +1 -0
- package/dist/models/anthropic.d.ts.map +1 -1
- package/dist/models/anthropic.js +78 -41
- package/dist/models/anthropic.js.map +1 -1
- package/dist/models/google.d.ts.map +1 -1
- package/dist/models/google.js +47 -46
- package/dist/models/google.js.map +1 -1
- package/dist/models/http-error.d.ts +16 -0
- package/dist/models/http-error.d.ts.map +1 -0
- package/dist/models/http-error.js +67 -0
- package/dist/models/http-error.js.map +1 -0
- package/dist/models/index.d.ts +3 -0
- package/dist/models/index.d.ts.map +1 -1
- package/dist/models/index.js +2 -0
- package/dist/models/index.js.map +1 -1
- package/dist/models/ollama.d.ts.map +1 -1
- package/dist/models/ollama.js +4 -3
- package/dist/models/ollama.js.map +1 -1
- package/dist/models/openai.d.ts.map +1 -1
- package/dist/models/openai.js +36 -44
- package/dist/models/openai.js.map +1 -1
- package/dist/models/openrouter.d.ts +13 -0
- package/dist/models/openrouter.d.ts.map +1 -1
- package/dist/models/openrouter.js +86 -47
- package/dist/models/openrouter.js.map +1 -1
- package/dist/models/sse.d.ts +9 -0
- package/dist/models/sse.d.ts.map +1 -0
- package/dist/models/sse.js +45 -0
- package/dist/models/sse.js.map +1 -0
- package/dist/models/types.d.ts +10 -0
- package/dist/models/types.d.ts.map +1 -1
- package/dist/pregel.d.ts +4 -0
- package/dist/pregel.d.ts.map +1 -1
- package/dist/pregel.js +121 -54
- package/dist/pregel.js.map +1 -1
- package/dist/retry.d.ts.map +1 -1
- package/dist/retry.js +10 -3
- package/dist/retry.js.map +1 -1
- package/dist/store/index.d.ts +3 -0
- package/dist/store/index.d.ts.map +1 -1
- package/dist/store/index.js +17 -0
- package/dist/store/index.js.map +1 -1
- package/dist/streaming.d.ts +4 -1
- package/dist/streaming.d.ts.map +1 -1
- package/dist/streaming.js +21 -7
- package/dist/streaming.js.map +1 -1
- package/dist/swarm/graph.d.ts +81 -2
- package/dist/swarm/graph.d.ts.map +1 -1
- package/dist/swarm/graph.js +517 -32
- package/dist/swarm/graph.js.map +1 -1
- package/dist/swarm/index.d.ts +10 -2
- package/dist/swarm/index.d.ts.map +1 -1
- package/dist/swarm/index.js +6 -1
- package/dist/swarm/index.js.map +1 -1
- package/dist/swarm/mermaid.d.ts +10 -0
- package/dist/swarm/mermaid.d.ts.map +1 -0
- package/dist/swarm/mermaid.js +64 -0
- package/dist/swarm/mermaid.js.map +1 -0
- package/dist/swarm/pool.d.ts +9 -1
- package/dist/swarm/pool.d.ts.map +1 -1
- package/dist/swarm/pool.js +58 -10
- package/dist/swarm/pool.js.map +1 -1
- package/dist/swarm/registry.d.ts +11 -1
- package/dist/swarm/registry.d.ts.map +1 -1
- package/dist/swarm/registry.js +17 -3
- package/dist/swarm/registry.js.map +1 -1
- package/dist/swarm/scaling.d.ts +95 -0
- package/dist/swarm/scaling.d.ts.map +1 -0
- package/dist/swarm/scaling.js +214 -0
- package/dist/swarm/scaling.js.map +1 -0
- package/dist/swarm/snapshot.d.ts +51 -0
- package/dist/swarm/snapshot.d.ts.map +1 -0
- package/dist/swarm/snapshot.js +115 -0
- package/dist/swarm/snapshot.js.map +1 -0
- package/dist/swarm/supervisor.d.ts.map +1 -1
- package/dist/swarm/supervisor.js +82 -0
- package/dist/swarm/supervisor.js.map +1 -1
- package/dist/swarm/tracer.d.ts +57 -0
- package/dist/swarm/tracer.d.ts.map +1 -0
- package/dist/swarm/tracer.js +138 -0
- package/dist/swarm/tracer.js.map +1 -0
- package/dist/swarm/types.d.ts +23 -1
- package/dist/swarm/types.d.ts.map +1 -1
- package/dist/swarm/types.js.map +1 -1
- package/dist/tools/types.d.ts +2 -0
- package/dist/tools/types.d.ts.map +1 -1
- package/package.json +160 -141
|
@@ -24,7 +24,7 @@ export interface GuardrailsConfig {
|
|
|
24
24
|
export interface AuditEntry {
|
|
25
25
|
timestamp: number;
|
|
26
26
|
agent: string;
|
|
27
|
-
action: "llm.request" | "llm.response" | "tool.call" | "tool.result" | "filter.blocked" | "budget.warning" | "budget.exceeded";
|
|
27
|
+
action: "llm.request" | "llm.response" | "tool.call" | "tool.result" | "filter.blocked" | "budget.warning" | "budget.exceeded" | "budget.unknown_pricing";
|
|
28
28
|
data: Record<string, unknown>;
|
|
29
29
|
}
|
|
30
30
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/guardrails/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,MAAM,WAAW,YAAY;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,WAAW,GAAG,OAAO,GAAG,MAAM,CAAC;CACnD;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;IACnC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,mBAAmB,CAAC;CACjD;AAED,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,aAAa,GAAG,cAAc,GAAG,WAAW,GAAG,aAAa,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/guardrails/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,MAAM,WAAW,YAAY;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,WAAW,GAAG,OAAO,GAAG,MAAM,CAAC;CACnD;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;IACnC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,mBAAmB,CAAC;CACjD;AAED,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,aAAa,GAAG,cAAc,GAAG,WAAW,GAAG,aAAa,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,iBAAiB,GAAG,wBAAwB,CAAC;IAC1J,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-loop.d.ts","sourceRoot":"","sources":["../../src/harness/agent-loop.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EAIZ,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-loop.d.ts","sourceRoot":"","sources":["../../src/harness/agent-loop.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EAIZ,MAAM,YAAY,CAAC;AAMpB,wBAAuB,SAAS,CAC9B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,GACtB,cAAc,CAAC,WAAW,CAAC,CAse7B;AAID,wBAAgB,iBAAiB,CAC/B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC,EACD,MAAM,EAAE,eAAe,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAsB5D"}
|
|
@@ -3,12 +3,15 @@
|
|
|
3
3
|
// Think → Act → Observe async generator driving each agent node
|
|
4
4
|
// ============================================================
|
|
5
5
|
import { generateId } from "./types.js";
|
|
6
|
+
import { validateToolArgs } from "./validate-args.js";
|
|
6
7
|
// ─── agentLoop ─────────────────────────────────────────────────────────────
|
|
7
8
|
export async function* agentLoop(prompt, config) {
|
|
8
9
|
const sessionId = generateId("ses");
|
|
9
10
|
const threadId = config.threadId ?? generateId("thr");
|
|
10
11
|
const maxTurns = config.maxTurns ?? 10;
|
|
11
|
-
const messages =
|
|
12
|
+
const messages = config.initialMessages
|
|
13
|
+
? [...config.initialMessages]
|
|
14
|
+
: [];
|
|
12
15
|
let turn = 0;
|
|
13
16
|
// ── 1. Session Init ──────────────────────────────────────────────────
|
|
14
17
|
if (config.hooksEngine) {
|
|
@@ -49,24 +52,77 @@ export async function* agentLoop(prompt, config) {
|
|
|
49
52
|
return;
|
|
50
53
|
}
|
|
51
54
|
// ── 3b. Context Compaction ───────────────────────────────────────
|
|
52
|
-
if (config.compactor
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
55
|
+
if (config.compactor) {
|
|
56
|
+
const compactionCheck = config.compactor.checkCompaction(messages);
|
|
57
|
+
if (compactionCheck.needed) {
|
|
58
|
+
const beforeCount = messages.length;
|
|
59
|
+
yield makeMessage("system", sessionId, turn, {
|
|
60
|
+
subtype: "compact_start",
|
|
61
|
+
content: "Context compaction starting",
|
|
62
|
+
metadata: {
|
|
63
|
+
beforeCount,
|
|
64
|
+
estimatedTokens: compactionCheck.estimatedTokens,
|
|
65
|
+
threshold: compactionCheck.threshold,
|
|
66
|
+
maxTokens: compactionCheck.maxTokens,
|
|
67
|
+
percentUsed: compactionCheck.percentUsed,
|
|
68
|
+
},
|
|
58
69
|
});
|
|
70
|
+
try {
|
|
71
|
+
if (config.hooksEngine) {
|
|
72
|
+
await config.hooksEngine.fire("PreCompact", {
|
|
73
|
+
sessionId,
|
|
74
|
+
messageCount: beforeCount,
|
|
75
|
+
estimatedTokens: compactionCheck.estimatedTokens,
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
const compacted = await config.compactor.compact(messages, { skipInitialCheck: true });
|
|
79
|
+
const estimatedTokensAfter = config.compactor.estimateTokens(compacted);
|
|
80
|
+
const percentUsedAfter = compactionCheck.maxTokens > 0
|
|
81
|
+
? estimatedTokensAfter / compactionCheck.maxTokens
|
|
82
|
+
: 0;
|
|
83
|
+
const afterCount = compacted.length;
|
|
84
|
+
const summarized = afterCount <= 2 && beforeCount > 2;
|
|
85
|
+
messages.length = 0;
|
|
86
|
+
messages.push(...compacted);
|
|
87
|
+
yield makeMessage("system", sessionId, turn, {
|
|
88
|
+
subtype: "compact_boundary",
|
|
89
|
+
content: "Context compacted",
|
|
90
|
+
metadata: {
|
|
91
|
+
beforeCount,
|
|
92
|
+
afterCount,
|
|
93
|
+
summarized,
|
|
94
|
+
estimatedTokensBefore: compactionCheck.estimatedTokens,
|
|
95
|
+
estimatedTokensAfter,
|
|
96
|
+
threshold: compactionCheck.threshold,
|
|
97
|
+
maxTokens: compactionCheck.maxTokens,
|
|
98
|
+
percentUsedBefore: compactionCheck.percentUsed,
|
|
99
|
+
percentUsedAfter,
|
|
100
|
+
},
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
catch (err) {
|
|
104
|
+
const errorMsg = err instanceof Error ? err.message : String(err);
|
|
105
|
+
yield makeMessage("system", sessionId, turn, {
|
|
106
|
+
subtype: "compact_error",
|
|
107
|
+
content: `Context compaction failed: ${errorMsg}`,
|
|
108
|
+
metadata: {
|
|
109
|
+
beforeCount,
|
|
110
|
+
afterCount: beforeCount,
|
|
111
|
+
estimatedTokensBefore: compactionCheck.estimatedTokens,
|
|
112
|
+
threshold: compactionCheck.threshold,
|
|
113
|
+
maxTokens: compactionCheck.maxTokens,
|
|
114
|
+
percentUsedBefore: compactionCheck.percentUsed,
|
|
115
|
+
error: errorMsg,
|
|
116
|
+
},
|
|
117
|
+
});
|
|
118
|
+
}
|
|
59
119
|
}
|
|
60
|
-
const compacted = await config.compactor.compact(messages);
|
|
61
|
-
messages.length = 0;
|
|
62
|
-
messages.push(...compacted);
|
|
63
|
-
yield makeMessage("system", sessionId, turn, {
|
|
64
|
-
subtype: "compact_boundary",
|
|
65
|
-
content: "Context compacted",
|
|
66
|
-
});
|
|
67
120
|
}
|
|
68
121
|
// ── 3c. Build system prompt ──────────────────────────────────────
|
|
69
122
|
let systemPrompt = config.systemPrompt;
|
|
123
|
+
// Inject remaining turns so the model knows its budget
|
|
124
|
+
const remaining = maxTurns - turn;
|
|
125
|
+
systemPrompt += `\n\nYou have ${remaining} turns remaining. Each turn lets you call multiple tools. Do NOT stop early — use your tools and complete the task autonomously.`;
|
|
70
126
|
if (config.env) {
|
|
71
127
|
const envLines = [];
|
|
72
128
|
if (config.env.cwd)
|
|
@@ -92,23 +148,74 @@ export async function* agentLoop(prompt, config) {
|
|
|
92
148
|
config.skillLoader.clearPendingInjection();
|
|
93
149
|
}
|
|
94
150
|
}
|
|
95
|
-
// ── 3e.
|
|
151
|
+
// ── 3e. Yield step_start ─────────────────────────────────────────
|
|
152
|
+
const stepStartTime = Date.now();
|
|
153
|
+
yield makeMessage("step_start", sessionId, turn, {
|
|
154
|
+
metadata: { step: turn },
|
|
155
|
+
});
|
|
156
|
+
// ── 3f. Inference (with retry on transient errors) ───────────────
|
|
96
157
|
let response;
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
158
|
+
const maxRetries = 3;
|
|
159
|
+
let lastInferenceError = null;
|
|
160
|
+
let succeeded = false;
|
|
161
|
+
for (let attempt = 0; attempt <= maxRetries; attempt++) {
|
|
162
|
+
try {
|
|
163
|
+
response = await config.model.chat({
|
|
164
|
+
messages,
|
|
165
|
+
tools: llmTools.length > 0 ? llmTools : undefined,
|
|
166
|
+
systemPrompt,
|
|
167
|
+
maxTokens: config.maxTokens ?? 8192,
|
|
168
|
+
});
|
|
169
|
+
succeeded = true;
|
|
170
|
+
break;
|
|
171
|
+
}
|
|
172
|
+
catch (err) {
|
|
173
|
+
lastInferenceError = err;
|
|
174
|
+
const isRetryable = isRetryableError(err);
|
|
175
|
+
if (!isRetryable || attempt >= maxRetries) {
|
|
176
|
+
break;
|
|
177
|
+
}
|
|
178
|
+
// Check abort signal before retrying
|
|
179
|
+
if (config.signal?.aborted) {
|
|
180
|
+
break;
|
|
181
|
+
}
|
|
182
|
+
// Yield inference_retry so the conductor can emit events and update the UI
|
|
183
|
+
const delayMs = getRetryDelay(err, attempt);
|
|
184
|
+
yield makeMessage("system", sessionId, turn, {
|
|
185
|
+
subtype: "inference_retry",
|
|
186
|
+
content: `Retrying inference (attempt ${attempt + 1}/${maxRetries}): ${err instanceof Error ? err.message : String(err)}`,
|
|
187
|
+
metadata: {
|
|
188
|
+
attempt: attempt + 1,
|
|
189
|
+
maxRetries,
|
|
190
|
+
delayMs,
|
|
191
|
+
error: err instanceof Error ? err.message : String(err),
|
|
192
|
+
},
|
|
193
|
+
});
|
|
194
|
+
if (delayMs > 0) {
|
|
195
|
+
// Abort-aware delay: resolve early if signal fires
|
|
196
|
+
await new Promise((resolve) => {
|
|
197
|
+
const timer = setTimeout(resolve, delayMs);
|
|
198
|
+
if (config.signal) {
|
|
199
|
+
const onAbort = () => { clearTimeout(timer); resolve(); };
|
|
200
|
+
if (config.signal.aborted) {
|
|
201
|
+
clearTimeout(timer);
|
|
202
|
+
resolve();
|
|
203
|
+
return;
|
|
204
|
+
}
|
|
205
|
+
config.signal.addEventListener("abort", onAbort, { once: true });
|
|
206
|
+
}
|
|
207
|
+
});
|
|
208
|
+
}
|
|
209
|
+
}
|
|
104
210
|
}
|
|
105
|
-
|
|
211
|
+
if (!succeeded) {
|
|
106
212
|
yield makeMessage("error", sessionId, turn, {
|
|
107
|
-
content: `Inference error: ${
|
|
213
|
+
content: `Inference error: ${lastInferenceError instanceof Error ? lastInferenceError.message : String(lastInferenceError)}`,
|
|
214
|
+
metadata: { finalMessages: messages },
|
|
108
215
|
});
|
|
109
216
|
return;
|
|
110
217
|
}
|
|
111
|
-
// ──
|
|
218
|
+
// ── 3g. Yield assistant message ──────────────────────────────────
|
|
112
219
|
yield makeMessage("assistant", sessionId, turn, {
|
|
113
220
|
content: response.content,
|
|
114
221
|
toolCalls: response.toolCalls,
|
|
@@ -117,7 +224,16 @@ export async function* agentLoop(prompt, config) {
|
|
|
117
224
|
stopReason: response.stopReason,
|
|
118
225
|
},
|
|
119
226
|
});
|
|
120
|
-
// ──
|
|
227
|
+
// ── 3g2. Yield step_finish with usage (for parent stats merge) ──
|
|
228
|
+
yield makeMessage("step_finish", sessionId, turn, {
|
|
229
|
+
metadata: {
|
|
230
|
+
stepDurationMs: Date.now() - stepStartTime,
|
|
231
|
+
usage: response.usage,
|
|
232
|
+
stopReason: response.stopReason,
|
|
233
|
+
toolCount: response.toolCalls?.length ?? 0,
|
|
234
|
+
},
|
|
235
|
+
});
|
|
236
|
+
// ── 3h. Stop condition ───────────────────────────────────────────
|
|
121
237
|
if (!response.toolCalls || response.toolCalls.length === 0) {
|
|
122
238
|
if (config.hooksEngine) {
|
|
123
239
|
const stopResult = await config.hooksEngine.fire("Stop", {
|
|
@@ -147,13 +263,15 @@ export async function* agentLoop(prompt, config) {
|
|
|
147
263
|
turns: turn + 1,
|
|
148
264
|
});
|
|
149
265
|
}
|
|
266
|
+
// Include the assistant's final message in history before emitting
|
|
267
|
+
messages.push({ role: "assistant", content: response.content });
|
|
150
268
|
yield makeMessage("result", sessionId, turn, {
|
|
151
269
|
content: response.content,
|
|
152
|
-
metadata: { totalTurns: turn + 1 },
|
|
270
|
+
metadata: { totalTurns: turn + 1, finalMessages: messages },
|
|
153
271
|
});
|
|
154
272
|
return;
|
|
155
273
|
}
|
|
156
|
-
// ──
|
|
274
|
+
// ── 3i. Tool execution ───────────────────────────────────────────
|
|
157
275
|
const toolResults = [];
|
|
158
276
|
for (const toolCall of response.toolCalls) {
|
|
159
277
|
// Fire PreToolUse hook
|
|
@@ -205,6 +323,28 @@ export async function* agentLoop(prompt, config) {
|
|
|
205
323
|
});
|
|
206
324
|
continue;
|
|
207
325
|
}
|
|
326
|
+
// Validate tool arguments before execution
|
|
327
|
+
if (toolDef.schema) {
|
|
328
|
+
const validationError = validateToolArgs(toolCall.args, toolDef.schema, toolCall.name);
|
|
329
|
+
if (validationError) {
|
|
330
|
+
toolResults.push({
|
|
331
|
+
toolCallId: toolCall.id,
|
|
332
|
+
toolName: toolCall.name,
|
|
333
|
+
content: `${validationError}. Please retry with correct arguments.`,
|
|
334
|
+
isError: true,
|
|
335
|
+
});
|
|
336
|
+
continue;
|
|
337
|
+
}
|
|
338
|
+
}
|
|
339
|
+
// Yield tool_start so the conductor can emit tool.call events
|
|
340
|
+
yield makeMessage("tool_start", sessionId, turn, {
|
|
341
|
+
metadata: {
|
|
342
|
+
toolName: toolCall.name,
|
|
343
|
+
toolArgs: toolCall.args,
|
|
344
|
+
toolCallId: toolCall.id,
|
|
345
|
+
},
|
|
346
|
+
});
|
|
347
|
+
const metadataUpdates = [];
|
|
208
348
|
const toolCtx = {
|
|
209
349
|
config: {},
|
|
210
350
|
store: null,
|
|
@@ -215,6 +355,9 @@ export async function* agentLoop(prompt, config) {
|
|
|
215
355
|
agentName: config.agentName,
|
|
216
356
|
turn,
|
|
217
357
|
signal: config.signal,
|
|
358
|
+
metadata: (update) => {
|
|
359
|
+
metadataUpdates.push(update);
|
|
360
|
+
},
|
|
218
361
|
};
|
|
219
362
|
try {
|
|
220
363
|
const startTime = Date.now();
|
|
@@ -235,7 +378,19 @@ export async function* agentLoop(prompt, config) {
|
|
|
235
378
|
toolCallId: toolCall.id,
|
|
236
379
|
toolName: toolCall.name,
|
|
237
380
|
content,
|
|
381
|
+
durationMs,
|
|
238
382
|
});
|
|
383
|
+
// Yield collected metadata updates from ctx.metadata() calls
|
|
384
|
+
for (const mu of metadataUpdates) {
|
|
385
|
+
yield makeMessage("tool_metadata", sessionId, turn, {
|
|
386
|
+
metadata: {
|
|
387
|
+
toolCallId: toolCall.id,
|
|
388
|
+
toolName: toolCall.name,
|
|
389
|
+
title: mu.title,
|
|
390
|
+
data: mu.metadata,
|
|
391
|
+
},
|
|
392
|
+
});
|
|
393
|
+
}
|
|
239
394
|
}
|
|
240
395
|
catch (err) {
|
|
241
396
|
const errorMsg = err instanceof Error ? err.message : String(err);
|
|
@@ -256,7 +411,7 @@ export async function* agentLoop(prompt, config) {
|
|
|
256
411
|
});
|
|
257
412
|
}
|
|
258
413
|
}
|
|
259
|
-
// ──
|
|
414
|
+
// ── 3j. Update messages ──────────────────────────────────────────
|
|
260
415
|
messages.push({
|
|
261
416
|
role: "assistant",
|
|
262
417
|
content: response.content,
|
|
@@ -292,6 +447,7 @@ export async function* agentLoop(prompt, config) {
|
|
|
292
447
|
// ── 4. maxTurns exceeded ─────────────────────────────────────────────
|
|
293
448
|
yield makeMessage("error", sessionId, turn, {
|
|
294
449
|
content: `Agent loop exceeded maxTurns (${maxTurns})`,
|
|
450
|
+
metadata: { finalMessages: messages },
|
|
295
451
|
});
|
|
296
452
|
}
|
|
297
453
|
// ─── wrapWithAgentLoop ─────────────────────────────────────────────────────
|
|
@@ -324,4 +480,45 @@ function makeMessage(type, sessionId, turn, overrides = {}) {
|
|
|
324
480
|
...overrides,
|
|
325
481
|
};
|
|
326
482
|
}
|
|
483
|
+
/** Check if an error is retryable (rate limits, transient server errors). */
|
|
484
|
+
function isRetryableError(err) {
|
|
485
|
+
if (err && typeof err === "object" && "isRetryable" in err) {
|
|
486
|
+
return !!err.isRetryable;
|
|
487
|
+
}
|
|
488
|
+
if (err && typeof err === "object") {
|
|
489
|
+
const status = err.status;
|
|
490
|
+
if (status === 429 || status === 503 || status === 502 || status === 500) {
|
|
491
|
+
return true;
|
|
492
|
+
}
|
|
493
|
+
}
|
|
494
|
+
if (err instanceof Error) {
|
|
495
|
+
const msg = err.message.toLowerCase();
|
|
496
|
+
if (msg.includes("rate limit") || msg.includes("429") || msg.includes("503") || msg.includes("overloaded")) {
|
|
497
|
+
return true;
|
|
498
|
+
}
|
|
499
|
+
}
|
|
500
|
+
return false;
|
|
501
|
+
}
|
|
502
|
+
/** Get retry delay with exponential backoff. */
|
|
503
|
+
function getRetryDelay(err, attempt) {
|
|
504
|
+
if (err && typeof err === "object") {
|
|
505
|
+
// Respect retryAfterMs if provided by the model adapter
|
|
506
|
+
if ("retryAfterMs" in err) {
|
|
507
|
+
const after = err.retryAfterMs;
|
|
508
|
+
if (typeof after === "number" && after > 0)
|
|
509
|
+
return after;
|
|
510
|
+
}
|
|
511
|
+
// Check headers for retry-after-ms (common in HTTP error responses)
|
|
512
|
+
const headers = err.headers;
|
|
513
|
+
if (headers) {
|
|
514
|
+
const headerMs = headers["retry-after-ms"];
|
|
515
|
+
if (headerMs) {
|
|
516
|
+
const parsed = parseInt(headerMs, 10);
|
|
517
|
+
if (!isNaN(parsed) && parsed > 0)
|
|
518
|
+
return parsed;
|
|
519
|
+
}
|
|
520
|
+
}
|
|
521
|
+
}
|
|
522
|
+
return Math.min(1000 * Math.pow(2, attempt), 10_000);
|
|
523
|
+
}
|
|
327
524
|
//# sourceMappingURL=agent-loop.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-loop.js","sourceRoot":"","sources":["../../src/harness/agent-loop.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,oCAAoC;AACpC,gEAAgE;AAChE,+DAA+D;AAiB/D,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,8EAA8E;AAE9E,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,SAAS,CAC9B,MAAc,EACd,MAAuB;IAEvB,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;IACvC,MAAM,QAAQ,GAAsB,EAAE,CAAC;IACvC,IAAI,IAAI,GAAG,CAAC,CAAC;IAEb,wEAAwE;IAExE,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QACvB,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,EAAE;YAC/D,SAAS;YACT,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SACvC,CAAC,CAAC;QAEH,IAAI,UAAU,EAAE,iBAAiB,EAAE,CAAC;YAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,iBAAiB,EAAE,CAAC,CAAC;YACvE,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED,mBAAmB;IACnB,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAEjD,MAAM,WAAW,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE;QAC3C,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,WAAW,SAAS,uBAAuB,MAAM,CAAC,SAAS,GAAG;KACxE,CAAC,CAAC;IAEH,wEAAwE;IAExE,MAAM,QAAQ,GAAiB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACtD,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,UAAU,EAAE,CAAC,CAAC,MAAM;KACrB,CAAC,CAAC,CAAC;IAEJ,kBAAkB;IAClB,MAAM,OAAO,GAAG,IAAI,GAAG,EAA0B,CAAC;IAClD,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QAC7B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACzB,CAAC;IAED,wEAAwE;IAExE,OAAO,IAAI,GAAG,QAAQ,EAAE,CAAC;QACvB,oEAAoE;QACpE,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;YAC3B,MAAM,WAAW,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE;gBAC1C,OAAO,EAAE,8BAA8B;aACxC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,oEAAoE;QACpE,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjE,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;gBACvB,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE;oBAC1C,SAAS;oBACT,YAAY,EAAE,QAAQ,CAAC,MAAM;oBAC7B,eAAe,EAAE,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC;iBAC3D,CAAC,CAAC;YACL,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC3D,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;YACpB,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;YAE5B,MAAM,WAAW,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE;gBAC3C,OAAO,EAAE,kBAAkB;gBAC3B,OAAO,EAAE,mBAAmB;aAC7B,CAAC,CAAC;QACL,CAAC;QAED,oEAAoE;QACpE,IAAI,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QAEvC,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;YACf,MAAM,QAAQ,GAAa,EAAE,CAAC;YAC9B,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG;gBAAE,QAAQ,CAAC,IAAI,CAAC,sBAAsB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;YAC1E,IAAI,MAAM,CAAC,GAAG,CAAC,QAAQ;gBAAE,QAAQ,CAAC,IAAI,CAAC,aAAa,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC3E,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI;gBAAE,QAAQ,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YAC/D,IAAI,MAAM,CAAC,GAAG,CAAC,SAAS;gBAAE,QAAQ,CAAC,IAAI,CAAC,eAAe,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;YAC/E,IAAI,MAAM,CAAC,GAAG,CAAC,SAAS;gBAAE,QAAQ,CAAC,IAAI,CAAC,eAAe,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;YAC/E,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,YAAY,IAAI,cAAc,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;YAC9D,CAAC;QACH,CAAC;QAED,oEAAoE;QACpE,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;YACzD,IAAI,OAAO,EAAE,CAAC;gBACZ,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;gBAClD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC,CAAC;gBAC5E,MAAM,CAAC,WAAW,CAAC,qBAAqB,EAAE,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,oEAAoE;QACpE,IAAI,QAAsB,CAAC;QAC3B,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;gBACjC,QAAQ;gBACR,KAAK,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;gBACjD,YAAY;gBACZ,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,WAAW,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE;gBAC1C,OAAO,EAAE,oBAAoB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;aAChF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,oEAAoE;QACpE,MAAM,WAAW,CAAC,WAAW,EAAE,SAAS,EAAE,IAAI,EAAE;YAC9C,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,QAAQ,EAAE;gBACR,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,UAAU,EAAE,QAAQ,CAAC,UAAU;aAChC;SACF,CAAC,CAAC;QAEH,oEAAoE;QACpE,IAAI,CAAC,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3D,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;gBACvB,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE;oBACvD,SAAS;oBACT,QAAQ,EAAE,QAAQ,CAAC,OAAO;iBAC3B,CAAC,CAAC;gBAEH,IAAI,UAAU,EAAE,QAAQ,KAAK,OAAO,EAAE,CAAC;oBACrC,4DAA4D;oBAC5D,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,IAAI,0CAA0C,CAAC;oBACjF,QAAQ,CAAC,IAAI,CAAC;wBACZ,IAAI,EAAE,WAAW;wBACjB,OAAO,EAAE,QAAQ,CAAC,OAAO;qBAC1B,CAAC,CAAC;oBACH,QAAQ,CAAC,IAAI,CAAC;wBACZ,IAAI,EAAE,MAAM;wBACZ,OAAO,EAAE,QAAQ;qBAClB,CAAC,CAAC;oBACH,IAAI,EAAE,CAAC;oBACP,SAAS;gBACX,CAAC;YACH,CAAC;YAED,mCAAmC;YACnC,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;gBACvB,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE;oBAC1C,SAAS;oBACT,MAAM,EAAE,WAAW;oBACnB,KAAK,EAAE,IAAI,GAAG,CAAC;iBAChB,CAAC,CAAC;YACL,CAAC;YAED,MAAM,WAAW,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE;gBAC3C,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,GAAG,CAAC,EAAE;aACnC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,oEAAoE;QACpE,MAAM,WAAW,GAAqB,EAAE,CAAC;QAEzC,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;YAC1C,uBAAuB;YACvB,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;gBACvB,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE;oBAC5D,SAAS;oBACT,QAAQ,EAAE,QAAQ,CAAC,IAAI;oBACvB,KAAK,EAAE,QAAQ,CAAC,IAAI;iBACrB,CAAC,CAAC;gBAEH,IAAI,SAAS,EAAE,QAAQ,KAAK,MAAM,EAAE,CAAC;oBACnC,WAAW,CAAC,IAAI,CAAC;wBACf,UAAU,EAAE,QAAQ,CAAC,EAAE;wBACvB,QAAQ,EAAE,QAAQ,CAAC,IAAI;wBACvB,OAAO,EAAE,oBAAoB,SAAS,CAAC,MAAM,IAAI,iBAAiB,EAAE;wBACpE,OAAO,EAAE,IAAI;qBACd,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;gBAED,2CAA2C;gBAC3C,IAAI,SAAS,EAAE,aAAa,EAAE,CAAC;oBAC7B,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;gBACxD,CAAC;YACH,CAAC;YAED,oBAAoB;YACpB,IAAI,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxE,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;oBACjD,EAAE,EAAE,QAAQ,CAAC,EAAE;oBACf,IAAI,EAAE,QAAQ,CAAC,IAAI;oBACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;iBACpB,CAAC,CAAC;gBAEH,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;oBAC3B,WAAW,CAAC,IAAI,CAAC;wBACf,UAAU,EAAE,QAAQ,CAAC,EAAE;wBACvB,QAAQ,EAAE,QAAQ,CAAC,IAAI;wBACvB,OAAO,EAAE,gCAAgC,YAAY,CAAC,MAAM,IAAI,kBAAkB,EAAE;wBACpF,OAAO,EAAE,IAAI;qBACd,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;YACH,CAAC;YAED,wBAAwB;YACxB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC3C,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,WAAW,CAAC,IAAI,CAAC;oBACf,UAAU,EAAE,QAAQ,CAAC,EAAE;oBACvB,QAAQ,EAAE,QAAQ,CAAC,IAAI;oBACvB,OAAO,EAAE,iBAAiB,QAAQ,CAAC,IAAI,EAAE;oBACzC,OAAO,EAAE,IAAI;iBACd,CAAC,CAAC;gBACH,SAAS;YACX,CAAC;YAED,MAAM,OAAO,GAAuB;gBAClC,MAAM,EAAE,EAAE;gBACV,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,EAAE;gBACT,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;gBACd,SAAS;gBACT,QAAQ;gBACR,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,IAAI;gBACJ,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,CAAC;YAEF,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC7B,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAChE,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;gBAC1C,MAAM,OAAO,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBAEtF,mBAAmB;gBACnB,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;oBACvB,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,EAAE;wBAC3C,SAAS;wBACT,QAAQ,EAAE,QAAQ,CAAC,IAAI;wBACvB,KAAK,EAAE,QAAQ,CAAC,IAAI;wBACpB,MAAM,EAAE,SAAS;wBACjB,UAAU;qBACX,CAAC,CAAC;gBACL,CAAC;gBAED,WAAW,CAAC,IAAI,CAAC;oBACf,UAAU,EAAE,QAAQ,CAAC,EAAE;oBACvB,QAAQ,EAAE,QAAQ,CAAC,IAAI;oBACvB,OAAO;iBACR,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,QAAQ,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAElE,0BAA0B;gBAC1B,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;oBACvB,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,oBAAoB,EAAE;wBAClD,SAAS;wBACT,QAAQ,EAAE,QAAQ,CAAC,IAAI;wBACvB,KAAK,EAAE,QAAQ,CAAC,IAAI;wBACpB,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ;qBAC7C,CAAC,CAAC;gBACL,CAAC;gBAED,WAAW,CAAC,IAAI,CAAC;oBACf,UAAU,EAAE,QAAQ,CAAC,EAAE;oBACvB,QAAQ,EAAE,QAAQ,CAAC,IAAI;oBACvB,OAAO,EAAE,eAAe,QAAQ,EAAE;oBAClC,OAAO,EAAE,IAAI;iBACd,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,oEAAoE;QACpE,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,SAAS,EAAE,QAAQ,CAAC,SAAS;SAC9B,CAAC,CAAC;QAEH,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE,CAAC;YAC7B,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,EAAE,CAAC,OAAO;gBACnB,UAAU,EAAE,EAAE,CAAC,UAAU;gBACzB,IAAI,EAAE,EAAE,CAAC,QAAQ;aAClB,CAAC,CAAC;QACL,CAAC;QAED,oEAAoE;QACpE,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC/C,IAAI,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC;gBACrD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB,QAAQ,sBAAsB,EAAE,CAAC,CAAC;gBAC/F,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAExD,MAAM,WAAW,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE;oBAC3C,OAAO,EAAE,eAAe;oBACxB,OAAO,EAAE,QAAQ;iBAClB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,mEAAmE;QACnE,MAAM,WAAW,CAAC,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE;YAChD,WAAW;SACZ,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC;IAED,wEAAwE;IACxE,MAAM,WAAW,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE;QAC1C,OAAO,EAAE,iCAAiC,QAAQ,GAAG;KACtD,CAAC,CAAC;AACL,CAAC;AAED,8EAA8E;AAE9E,MAAM,UAAU,iBAAiB,CAM/B,MAAuB;IACvB,OAAO,KAAK,EAAE,KAAQ,EAAuB,EAAE;QAC7C,MAAM,MAAM,GACT,KAAK,CAAC,IAA2B;YACjC,KAAK,CAAC,OAA8B;YACrC,EAAE,CAAC;QAEL,IAAI,WAAW,GAAG,EAAE,CAAC;QAErB,IAAI,KAAK,EAAE,MAAM,GAAG,IAAI,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;YAClD,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC1B,WAAW,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;YAClC,CAAC;QACH,CAAC;QAED,OAAO;YACL,YAAY,EAAE;gBACZ,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC;gBAC7B,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,WAAW;aAChC;SACY,CAAC;IAClB,CAAC,CAAC;AACJ,CAAC;AAED,8EAA8E;AAE9E,SAAS,WAAW,CAClB,IAAqB,EACrB,SAAiB,EACjB,IAAY,EACZ,YAAkC,EAAE;IAEpC,OAAO;QACL,IAAI;QACJ,SAAS;QACT,IAAI;QACJ,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,GAAG,SAAS;KACb,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"agent-loop.js","sourceRoot":"","sources":["../../src/harness/agent-loop.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
import type { ONIModel, ONIModelMessage } from "../models/types.js";
|
|
2
|
+
export interface CompactionBudgetSnapshot {
|
|
3
|
+
estimatedTokens: number;
|
|
4
|
+
percentUsed: number;
|
|
5
|
+
threshold: number;
|
|
6
|
+
maxTokens: number;
|
|
7
|
+
}
|
|
8
|
+
export interface CompactionCheck extends CompactionBudgetSnapshot {
|
|
9
|
+
needed: boolean;
|
|
10
|
+
}
|
|
2
11
|
export interface CompactorConfig {
|
|
3
12
|
/** Model used to generate the summary (typically a fast/cheap model) */
|
|
4
13
|
summaryModel: ONIModel;
|
|
@@ -39,10 +48,17 @@ export declare class ContextCompactor {
|
|
|
39
48
|
* Returns true when estimated usage exceeds the compaction threshold.
|
|
40
49
|
*/
|
|
41
50
|
shouldCompact(messages: ONIModelMessage[]): boolean;
|
|
51
|
+
/**
|
|
52
|
+
* Check if compaction is needed and return details.
|
|
53
|
+
*/
|
|
54
|
+
checkCompaction(messages: ONIModelMessage[]): CompactionCheck;
|
|
42
55
|
/**
|
|
43
56
|
* Current usage as a fraction of maxTokens (0–1+).
|
|
44
57
|
*/
|
|
45
58
|
usageFraction(messages: ONIModelMessage[]): number;
|
|
59
|
+
getThreshold(): number;
|
|
60
|
+
getMaxTokens(): number;
|
|
61
|
+
getBudgetSnapshot(messages: ONIModelMessage[]): CompactionBudgetSnapshot;
|
|
46
62
|
/**
|
|
47
63
|
* Two-stage compaction:
|
|
48
64
|
* 1. Clear old tool results (less lossy)
|
|
@@ -50,7 +66,9 @@ export declare class ContextCompactor {
|
|
|
50
66
|
*
|
|
51
67
|
* Returns the compacted message array.
|
|
52
68
|
*/
|
|
53
|
-
compact(messages: ONIModelMessage[]
|
|
69
|
+
compact(messages: ONIModelMessage[], opts?: {
|
|
70
|
+
skipInitialCheck?: boolean;
|
|
71
|
+
}): Promise<ONIModelMessage[]>;
|
|
54
72
|
/**
|
|
55
73
|
* Remove tool-role messages from the older portion of the conversation,
|
|
56
74
|
* keeping the most recent `keepRecent` messages intact.
|
|
@@ -62,7 +80,8 @@ export declare class ContextCompactor {
|
|
|
62
80
|
*/
|
|
63
81
|
private summarize;
|
|
64
82
|
/**
|
|
65
|
-
* Fallback when the summary model fails —
|
|
83
|
+
* Fallback when the summary model fails — keep the most recent messages
|
|
84
|
+
* that fit within the token budget and prepend a truncation notice.
|
|
66
85
|
*/
|
|
67
86
|
private fallbackTruncation;
|
|
68
87
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-compactor.d.ts","sourceRoot":"","sources":["../../src/harness/context-compactor.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAIpE,MAAM,WAAW,eAAe;IAC9B,wEAAwE;IACxE,YAAY,EAAE,QAAQ,CAAC;IAEvB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAID,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAW;IACxC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAS;gBAElC,MAAM,EAAE,eAAe;IAUnC;;;OAGG;IACH,cAAc,CAAC,QAAQ,EAAE,eAAe,EAAE,GAAG,MAAM;IAQnD;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,eAAe,EAAE,GAAG,OAAO;IAInD;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,eAAe,EAAE,GAAG,MAAM;IAKlD;;;;;;OAMG;IACG,OAAO,CAAC,QAAQ,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"context-compactor.d.ts","sourceRoot":"","sources":["../../src/harness/context-compactor.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAIpE,MAAM,WAAW,wBAAwB;IACvC,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAgB,SAAQ,wBAAwB;IAC/D,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,wEAAwE;IACxE,YAAY,EAAE,QAAQ,CAAC;IAEvB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAID,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAW;IACxC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAS;gBAElC,MAAM,EAAE,eAAe;IAUnC;;;OAGG;IACH,cAAc,CAAC,QAAQ,EAAE,eAAe,EAAE,GAAG,MAAM;IAQnD;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,eAAe,EAAE,GAAG,OAAO;IAInD;;OAEG;IACH,eAAe,CAAC,QAAQ,EAAE,eAAe,EAAE,GAAG,eAAe;IAQ7D;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,eAAe,EAAE,GAAG,MAAM;IAKlD,YAAY,IAAI,MAAM;IAItB,YAAY,IAAI,MAAM;IAItB,iBAAiB,CAAC,QAAQ,EAAE,eAAe,EAAE,GAAG,wBAAwB;IAUxE;;;;;;OAMG;IACG,OAAO,CAAC,QAAQ,EAAE,eAAe,EAAE,EAAE,IAAI,CAAC,EAAE;QAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAsB7G;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAiB3B;;;OAGG;YACW,SAAS;IAoDvB;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IA4B1B;;OAEG;IACH,OAAO,CAAC,aAAa;CAYtB"}
|
|
@@ -35,6 +35,16 @@ export class ContextCompactor {
|
|
|
35
35
|
shouldCompact(messages) {
|
|
36
36
|
return this.usageFraction(messages) >= this.threshold;
|
|
37
37
|
}
|
|
38
|
+
/**
|
|
39
|
+
* Check if compaction is needed and return details.
|
|
40
|
+
*/
|
|
41
|
+
checkCompaction(messages) {
|
|
42
|
+
const budget = this.getBudgetSnapshot(messages);
|
|
43
|
+
return {
|
|
44
|
+
...budget,
|
|
45
|
+
needed: budget.percentUsed >= budget.threshold,
|
|
46
|
+
};
|
|
47
|
+
}
|
|
38
48
|
/**
|
|
39
49
|
* Current usage as a fraction of maxTokens (0–1+).
|
|
40
50
|
*/
|
|
@@ -43,6 +53,21 @@ export class ContextCompactor {
|
|
|
43
53
|
return 0;
|
|
44
54
|
return this.estimateTokens(messages) / this.maxTokens;
|
|
45
55
|
}
|
|
56
|
+
getThreshold() {
|
|
57
|
+
return this.threshold;
|
|
58
|
+
}
|
|
59
|
+
getMaxTokens() {
|
|
60
|
+
return this.maxTokens;
|
|
61
|
+
}
|
|
62
|
+
getBudgetSnapshot(messages) {
|
|
63
|
+
const estimatedTokens = this.estimateTokens(messages);
|
|
64
|
+
return {
|
|
65
|
+
estimatedTokens,
|
|
66
|
+
percentUsed: this.maxTokens > 0 ? estimatedTokens / this.maxTokens : 0,
|
|
67
|
+
threshold: this.threshold,
|
|
68
|
+
maxTokens: this.maxTokens,
|
|
69
|
+
};
|
|
70
|
+
}
|
|
46
71
|
/**
|
|
47
72
|
* Two-stage compaction:
|
|
48
73
|
* 1. Clear old tool results (less lossy)
|
|
@@ -50,8 +75,8 @@ export class ContextCompactor {
|
|
|
50
75
|
*
|
|
51
76
|
* Returns the compacted message array.
|
|
52
77
|
*/
|
|
53
|
-
async compact(messages) {
|
|
54
|
-
if (!this.shouldCompact(messages)) {
|
|
78
|
+
async compact(messages, opts) {
|
|
79
|
+
if (!opts?.skipInitialCheck && !this.shouldCompact(messages)) {
|
|
55
80
|
return messages;
|
|
56
81
|
}
|
|
57
82
|
// Stage 1: clear old tool results
|
|
@@ -64,8 +89,8 @@ export class ContextCompactor {
|
|
|
64
89
|
return await this.summarize(cleaned);
|
|
65
90
|
}
|
|
66
91
|
catch {
|
|
67
|
-
// Fallback:
|
|
68
|
-
return this.fallbackTruncation();
|
|
92
|
+
// Fallback: keep recent messages to preserve context
|
|
93
|
+
return this.fallbackTruncation(cleaned);
|
|
69
94
|
}
|
|
70
95
|
}
|
|
71
96
|
// ── Private ─────────────────────────────────────────────────────────────
|
|
@@ -105,6 +130,7 @@ export class ContextCompactor {
|
|
|
105
130
|
role: "user",
|
|
106
131
|
content: `Summarize the following conversation history into a concise summary. ` +
|
|
107
132
|
`Preserve key decisions, code context, file paths, and task progress. ` +
|
|
133
|
+
`Current state and Files modified should be preserved verbatim when possible. ` +
|
|
108
134
|
`Wrap your summary in <summary></summary> tags.${instructions}\n\n` +
|
|
109
135
|
`--- CONVERSATION HISTORY ---\n${historyText}`,
|
|
110
136
|
};
|
|
@@ -128,9 +154,21 @@ export class ContextCompactor {
|
|
|
128
154
|
];
|
|
129
155
|
}
|
|
130
156
|
/**
|
|
131
|
-
* Fallback when the summary model fails —
|
|
157
|
+
* Fallback when the summary model fails — keep the most recent messages
|
|
158
|
+
* that fit within the token budget and prepend a truncation notice.
|
|
132
159
|
*/
|
|
133
|
-
fallbackTruncation() {
|
|
160
|
+
fallbackTruncation(messages) {
|
|
161
|
+
const budget = Math.floor(this.maxTokens * this.threshold * this.charsPerToken);
|
|
162
|
+
const kept = [];
|
|
163
|
+
let totalChars = 0;
|
|
164
|
+
// Walk backwards to keep the most recent messages that fit in the budget
|
|
165
|
+
for (let i = messages.length - 1; i >= 0; i--) {
|
|
166
|
+
const len = this.contentLength(messages[i]);
|
|
167
|
+
if (totalChars + len > budget)
|
|
168
|
+
break;
|
|
169
|
+
totalChars += len;
|
|
170
|
+
kept.unshift(messages[i]);
|
|
171
|
+
}
|
|
134
172
|
return [
|
|
135
173
|
{
|
|
136
174
|
role: "user",
|
|
@@ -141,6 +179,7 @@ export class ContextCompactor {
|
|
|
141
179
|
role: "assistant",
|
|
142
180
|
content: "Context loaded.",
|
|
143
181
|
},
|
|
182
|
+
...kept,
|
|
144
183
|
];
|
|
145
184
|
}
|
|
146
185
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-compactor.js","sourceRoot":"","sources":["../../src/harness/context-compactor.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,2CAA2C;AAC3C,yDAAyD;AACzD,gEAAgE;AAChE,+DAA+D;
|
|
1
|
+
{"version":3,"file":"context-compactor.js","sourceRoot":"","sources":["../../src/harness/context-compactor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export type HookEvent = "SessionStart" | "SessionEnd" | "UserPromptSubmit" | "PreToolUse" | "PermissionRequest" | "PostToolUse" | "PostToolUseFailure" | "SubagentStart" | "SubagentStop" | "Stop" | "Notification" | "PreCompact";
|
|
1
|
+
export type HookEvent = "SessionStart" | "SessionEnd" | "UserPromptSubmit" | "PreToolUse" | "PermissionRequest" | "PostToolUse" | "PostToolUseFailure" | "SubagentStart" | "SubagentStop" | "Stop" | "Notification" | "PreCompact" | "PostCompact";
|
|
2
2
|
export interface BasePayload {
|
|
3
3
|
sessionId: string;
|
|
4
4
|
[key: string]: unknown;
|
|
@@ -36,6 +36,12 @@ export interface PreCompactPayload extends BasePayload {
|
|
|
36
36
|
messageCount: number;
|
|
37
37
|
estimatedTokens: number;
|
|
38
38
|
}
|
|
39
|
+
export interface PostCompactPayload extends BasePayload {
|
|
40
|
+
beforeCount: number;
|
|
41
|
+
afterCount: number;
|
|
42
|
+
estimatedTokensAfter?: number;
|
|
43
|
+
summarized?: boolean;
|
|
44
|
+
}
|
|
39
45
|
export interface SubagentPayload extends BasePayload {
|
|
40
46
|
agentName: string;
|
|
41
47
|
parentSessionId?: string;
|