@phuetz/code-buddy 0.1.0 → 0.1.2
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/.codebuddy/skills/bundled/brave-search/SKILL.md +490 -0
- package/.codebuddy/skills/bundled/exa-search/SKILL.md +1122 -0
- package/.codebuddy/skills/bundled/perplexity/SKILL.md +748 -0
- package/.codebuddy/skills/bundled/playwright/SKILL.md +520 -0
- package/.codebuddy/skills/bundled/puppeteer/SKILL.md +708 -0
- package/.codebuddy/skills/bundled/web-fetch/SKILL.md +1003 -0
- package/README.md +56 -0
- package/dist/agent/agent-state.d.ts +3 -3
- package/dist/agent/agent-state.js +6 -6
- package/dist/agent/agent-state.js.map +1 -1
- package/dist/agent/base-agent.d.ts +4 -4
- package/dist/agent/base-agent.js +22 -9
- package/dist/agent/base-agent.js.map +1 -1
- package/dist/agent/cache-trace.d.ts +56 -0
- package/dist/agent/cache-trace.js +98 -0
- package/dist/agent/cache-trace.js.map +1 -0
- package/dist/agent/codebuddy-agent.js +4 -2
- package/dist/agent/codebuddy-agent.js.map +1 -1
- package/dist/agent/execution/agent-executor.d.ts +4 -4
- package/dist/agent/execution/agent-executor.js +46 -14
- package/dist/agent/execution/agent-executor.js.map +1 -1
- package/dist/agent/facades/agent-context-facade.js +1 -3
- package/dist/agent/facades/agent-context-facade.js.map +1 -1
- package/dist/agent/facades/message-history-manager.js +14 -12
- package/dist/agent/facades/message-history-manager.js.map +1 -1
- package/dist/agent/facades/session-facade.d.ts +3 -3
- package/dist/agent/facades/session-facade.js +6 -6
- package/dist/agent/facades/session-facade.js.map +1 -1
- package/dist/agent/history-repair.d.ts +37 -0
- package/dist/agent/history-repair.js +124 -0
- package/dist/agent/history-repair.js.map +1 -0
- package/dist/agent/index.d.ts +3 -3
- package/dist/agent/index.js +3 -3
- package/dist/agent/index.js.map +1 -1
- package/dist/agent/isolation/agent-workspace.d.ts +1 -0
- package/dist/agent/isolation/agent-workspace.js +10 -0
- package/dist/agent/isolation/agent-workspace.js.map +1 -1
- package/dist/agent/specialized/archive-agent.d.ts +3 -0
- package/dist/agent/specialized/archive-agent.js +71 -31
- package/dist/agent/specialized/archive-agent.js.map +1 -1
- package/dist/agent/specialized/index.d.ts +9 -8
- package/dist/agent/specialized/index.js +16 -8
- package/dist/agent/specialized/index.js.map +1 -1
- package/dist/agent/specialized/security-review/agent.js +19 -8
- package/dist/agent/specialized/security-review/agent.js.map +1 -1
- package/dist/agent/tool-executor.js +5 -0
- package/dist/agent/tool-executor.js.map +1 -1
- package/dist/agent/turn-diff-tracker.d.ts +79 -0
- package/dist/agent/turn-diff-tracker.js +195 -0
- package/dist/agent/turn-diff-tracker.js.map +1 -0
- package/dist/browser/controller.js +8 -4
- package/dist/browser/controller.js.map +1 -1
- package/dist/browser-automation/browser-manager.js +8 -1
- package/dist/browser-automation/browser-manager.js.map +1 -1
- package/dist/checkpoints/checkpoint-versioning.js +78 -20
- package/dist/checkpoints/checkpoint-versioning.js.map +1 -1
- package/dist/cli/config-loader.js +2 -4
- package/dist/cli/config-loader.js.map +1 -1
- package/dist/codebuddy/client.js +70 -11
- package/dist/codebuddy/client.js.map +1 -1
- package/dist/codebuddy/tools.d.ts +1 -7
- package/dist/codebuddy/tools.js +2 -30
- package/dist/codebuddy/tools.js.map +1 -1
- package/dist/commands/cli/daemon-commands.d.ts +14 -0
- package/dist/commands/cli/daemon-commands.js +166 -0
- package/dist/commands/cli/daemon-commands.js.map +1 -0
- package/dist/commands/cli/speak-command.d.ts +10 -0
- package/dist/commands/cli/speak-command.js +97 -0
- package/dist/commands/cli/speak-command.js.map +1 -0
- package/dist/commands/cli/utility-commands.d.ts +10 -0
- package/dist/commands/cli/utility-commands.js +88 -0
- package/dist/commands/cli/utility-commands.js.map +1 -0
- package/dist/commands/handlers/fcs-handlers.js +1 -1
- package/dist/commands/handlers/fcs-handlers.js.map +1 -1
- package/dist/commands/handlers/memory-handlers.js +2 -1
- package/dist/commands/handlers/memory-handlers.js.map +1 -1
- package/dist/commands/handlers/vibe-handlers.js +0 -1
- package/dist/commands/handlers/vibe-handlers.js.map +1 -1
- package/dist/commands/handlers/worktree-handlers.js +11 -0
- package/dist/commands/handlers/worktree-handlers.js.map +1 -1
- package/dist/commands/index.d.ts +8 -7
- package/dist/commands/index.js +10 -8
- package/dist/commands/index.js.map +1 -1
- package/dist/commands/mcp.d.ts +1 -0
- package/dist/commands/mcp.js +66 -7
- package/dist/commands/mcp.js.map +1 -1
- package/dist/commands/pipeline.js +25 -13
- package/dist/commands/pipeline.js.map +1 -1
- package/dist/config/hot-reload/watcher.js +4 -4
- package/dist/config/hot-reload/watcher.js.map +1 -1
- package/dist/config/model-tools.d.ts +41 -0
- package/dist/config/model-tools.js +194 -0
- package/dist/config/model-tools.js.map +1 -0
- package/dist/context/context-manager-v2.d.ts +2 -1
- package/dist/context/context-manager-v2.js +34 -5
- package/dist/context/context-manager-v2.js.map +1 -1
- package/dist/context/index.d.ts +12 -12
- package/dist/context/index.js +25 -12
- package/dist/context/index.js.map +1 -1
- package/dist/daemon/daemon-manager.js +23 -19
- package/dist/daemon/daemon-manager.js.map +1 -1
- package/dist/database/database-manager.d.ts +4 -0
- package/dist/database/database-manager.js +16 -7
- package/dist/database/database-manager.js.map +1 -1
- package/dist/desktop-automation/nutjs-provider.js +89 -0
- package/dist/desktop-automation/nutjs-provider.js.map +1 -1
- package/dist/errors/index.d.ts +4 -4
- package/dist/errors/index.js +8 -4
- package/dist/errors/index.js.map +1 -1
- package/dist/fcs/builtins.d.ts +2 -6
- package/dist/fcs/builtins.js +2 -568
- package/dist/fcs/builtins.js.map +1 -1
- package/dist/fcs/codebuddy-bindings.d.ts +3 -43
- package/dist/fcs/codebuddy-bindings.js +2 -606
- package/dist/fcs/codebuddy-bindings.js.map +1 -1
- package/dist/fcs/index.d.ts +2 -27
- package/dist/fcs/index.js +2 -53
- package/dist/fcs/index.js.map +1 -1
- package/dist/fcs/lexer.d.ts +2 -37
- package/dist/fcs/lexer.js +2 -459
- package/dist/fcs/lexer.js.map +1 -1
- package/dist/fcs/parser.d.ts +2 -68
- package/dist/fcs/parser.js +2 -893
- package/dist/fcs/parser.js.map +1 -1
- package/dist/fcs/runtime.d.ts +2 -59
- package/dist/fcs/runtime.js +2 -623
- package/dist/fcs/runtime.js.map +1 -1
- package/dist/fcs/script-registry.d.ts +3 -69
- package/dist/fcs/script-registry.js +2 -219
- package/dist/fcs/script-registry.js.map +1 -1
- package/dist/fcs/sync-bindings.d.ts +3 -101
- package/dist/fcs/sync-bindings.js +2 -410
- package/dist/fcs/sync-bindings.js.map +1 -1
- package/dist/fcs/types.d.ts +2 -285
- package/dist/fcs/types.js +2 -103
- package/dist/fcs/types.js.map +1 -1
- package/dist/hooks/index.d.ts +4 -4
- package/dist/hooks/index.js +4 -4
- package/dist/hooks/index.js.map +1 -1
- package/dist/hooks/use-input-handler.d.ts +1 -1
- package/dist/index.js +20 -330
- package/dist/index.js.map +1 -1
- package/dist/input/voice-control.js +11 -5
- package/dist/input/voice-control.js.map +1 -1
- package/dist/integrations/json-rpc/server.d.ts +9 -0
- package/dist/integrations/json-rpc/server.js +43 -13
- package/dist/integrations/json-rpc/server.js.map +1 -1
- package/dist/integrations/mcp/mcp-server.js +1 -1
- package/dist/integrations/mcp/mcp-server.js.map +1 -1
- package/dist/integrations/notification-integrations.d.ts +1 -0
- package/dist/integrations/notification-integrations.js +6 -1
- package/dist/integrations/notification-integrations.js.map +1 -1
- package/dist/mcp/client.js +2 -1
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/config.js +89 -5
- package/dist/mcp/config.js.map +1 -1
- package/dist/mcp/mcp-client.js +65 -14
- package/dist/mcp/mcp-client.js.map +1 -1
- package/dist/mcp/transports.d.ts +0 -1
- package/dist/mcp/transports.js +1 -5
- package/dist/mcp/transports.js.map +1 -1
- package/dist/mcp/types.d.ts +2 -0
- package/dist/memory/index.d.ts +2 -2
- package/dist/memory/index.js +2 -2
- package/dist/memory/index.js.map +1 -1
- package/dist/persistence/session-lock.d.ts +42 -0
- package/dist/persistence/session-lock.js +165 -0
- package/dist/persistence/session-lock.js.map +1 -0
- package/dist/persistence/session-store.d.ts +18 -3
- package/dist/persistence/session-store.js +90 -21
- package/dist/persistence/session-store.js.map +1 -1
- package/dist/plugins/conflict-detection.js +2 -1
- package/dist/plugins/conflict-detection.js.map +1 -1
- package/dist/plugins/index.d.ts +3 -3
- package/dist/plugins/index.js +3 -3
- package/dist/plugins/index.js.map +1 -1
- package/dist/plugins/isolated-plugin-runner.d.ts +6 -0
- package/dist/plugins/isolated-plugin-runner.js +19 -1
- package/dist/plugins/isolated-plugin-runner.js.map +1 -1
- package/dist/providers/local-llm-provider.js +28 -8
- package/dist/providers/local-llm-provider.js.map +1 -1
- package/dist/sandbox/docker-sandbox.js +7 -4
- package/dist/sandbox/docker-sandbox.js.map +1 -1
- package/dist/scripting/builtins.d.ts +8 -3
- package/dist/scripting/builtins.js +506 -355
- package/dist/scripting/builtins.js.map +1 -1
- package/dist/scripting/codebuddy-bindings.d.ts +47 -0
- package/dist/scripting/codebuddy-bindings.js +488 -0
- package/dist/scripting/codebuddy-bindings.js.map +1 -0
- package/dist/scripting/index.d.ts +33 -30
- package/dist/scripting/index.js +41 -36
- package/dist/scripting/index.js.map +1 -1
- package/dist/scripting/lexer.d.ts +31 -13
- package/dist/scripting/lexer.js +379 -292
- package/dist/scripting/lexer.js.map +1 -1
- package/dist/scripting/parser.d.ts +63 -44
- package/dist/scripting/parser.js +700 -473
- package/dist/scripting/parser.js.map +1 -1
- package/dist/scripting/runtime.d.ts +55 -24
- package/dist/scripting/runtime.js +600 -288
- package/dist/scripting/runtime.js.map +1 -1
- package/dist/scripting/script-registry.d.ts +54 -0
- package/dist/scripting/script-registry.js +202 -0
- package/dist/scripting/script-registry.js.map +1 -0
- package/dist/scripting/sync-bindings.d.ts +105 -0
- package/dist/scripting/sync-bindings.js +353 -0
- package/dist/scripting/sync-bindings.js.map +1 -0
- package/dist/scripting/types.d.ts +297 -199
- package/dist/scripting/types.js +86 -60
- package/dist/scripting/types.js.map +1 -1
- package/dist/search/usearch-index.js +42 -7
- package/dist/search/usearch-index.js.map +1 -1
- package/dist/security/bash-parser.d.ts +51 -0
- package/dist/security/bash-parser.js +327 -0
- package/dist/security/bash-parser.js.map +1 -0
- package/dist/security/index.d.ts +7 -5
- package/dist/security/index.js +8 -7
- package/dist/security/index.js.map +1 -1
- package/dist/security/skill-scanner.d.ts +36 -0
- package/dist/security/skill-scanner.js +149 -0
- package/dist/security/skill-scanner.js.map +1 -0
- package/dist/security/trust-folders.d.ts +1 -0
- package/dist/security/trust-folders.js +19 -1
- package/dist/security/trust-folders.js.map +1 -1
- package/dist/server/auth/index.d.ts +2 -2
- package/dist/server/auth/index.js +2 -2
- package/dist/server/auth/index.js.map +1 -1
- package/dist/server/middleware/index.d.ts +5 -5
- package/dist/server/middleware/index.js +5 -5
- package/dist/server/middleware/index.js.map +1 -1
- package/dist/server/middleware/rate-limit.js +15 -3
- package/dist/server/middleware/rate-limit.js.map +1 -1
- package/dist/server/websocket/handler.js +54 -6
- package/dist/server/websocket/handler.js.map +1 -1
- package/dist/skills/eligibility.js +26 -4
- package/dist/skills/eligibility.js.map +1 -1
- package/dist/tasks/background-tasks.js +5 -1
- package/dist/tasks/background-tasks.js.map +1 -1
- package/dist/tools/apply-patch.d.ts +55 -0
- package/dist/tools/apply-patch.js +273 -0
- package/dist/tools/apply-patch.js.map +1 -0
- package/dist/tools/hooks/default-hooks.d.ts +1 -1
- package/dist/tools/hooks/default-hooks.js +2 -1
- package/dist/tools/hooks/default-hooks.js.map +1 -1
- package/dist/tools/index.d.ts +10 -10
- package/dist/tools/index.js +11 -11
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/registry/bash-tools.js +6 -3
- package/dist/tools/registry/bash-tools.js.map +1 -1
- package/dist/tools/registry/misc-tools.js +1 -2
- package/dist/tools/registry/misc-tools.js.map +1 -1
- package/dist/tools/registry/search-tools.js +1 -1
- package/dist/tools/registry/search-tools.js.map +1 -1
- package/dist/tools/registry/text-editor-tools.js +1 -1
- package/dist/tools/registry/text-editor-tools.js.map +1 -1
- package/dist/tools/registry/todo-tools.js +37 -5
- package/dist/tools/registry/todo-tools.js.map +1 -1
- package/dist/tools/registry/tool-registry.js +5 -4
- package/dist/tools/registry/tool-registry.js.map +1 -1
- package/dist/tools/registry/web-tools.d.ts +1 -1
- package/dist/tools/registry/web-tools.js +28 -8
- package/dist/tools/registry/web-tools.js.map +1 -1
- package/dist/tools/text-editor.d.ts +1 -1
- package/dist/tools/text-editor.js +23 -5
- package/dist/tools/text-editor.js.map +1 -1
- package/dist/tools/web-search.d.ts +52 -37
- package/dist/tools/web-search.js +368 -163
- package/dist/tools/web-search.js.map +1 -1
- package/dist/types/errors.d.ts +1 -1
- package/dist/types/errors.js +2 -8
- package/dist/types/errors.js.map +1 -1
- package/dist/types/index.d.ts +2 -1
- package/dist/types/index.js +1 -2
- package/dist/types/index.js.map +1 -1
- package/dist/ui/components/ChatInterface.d.ts +1 -1
- package/dist/ui/index.d.ts +17 -21
- package/dist/ui/index.js +25 -22
- package/dist/ui/index.js.map +1 -1
- package/dist/utils/config-validation/schema.d.ts +15 -15
- package/dist/utils/head-tail-truncation.d.ts +34 -0
- package/dist/utils/head-tail-truncation.js +98 -0
- package/dist/utils/head-tail-truncation.js.map +1 -0
- package/dist/utils/logger.js +3 -9
- package/dist/utils/logger.js.map +1 -1
- package/dist/utils/sanitize.d.ts +5 -0
- package/dist/utils/sanitize.js +19 -0
- package/dist/utils/sanitize.js.map +1 -1
- package/dist/utils/settings-manager.js +4 -4
- package/dist/utils/settings-manager.js.map +1 -1
- package/dist/workflows/index.d.ts +4 -279
- package/dist/workflows/index.js +8 -822
- package/dist/workflows/index.js.map +1 -1
- package/dist/workflows/state-manager.d.ts +77 -0
- package/dist/workflows/state-manager.js +198 -0
- package/dist/workflows/state-manager.js.map +1 -0
- package/dist/workflows/step-manager.d.ts +39 -0
- package/dist/workflows/step-manager.js +196 -0
- package/dist/workflows/step-manager.js.map +1 -0
- package/dist/workflows/types.d.ts +87 -0
- package/dist/workflows/types.js +5 -0
- package/dist/workflows/types.js.map +1 -0
- package/dist/workflows/workflow-engine.d.ts +34 -0
- package/dist/workflows/workflow-engine.js +354 -0
- package/dist/workflows/workflow-engine.js.map +1 -0
- package/package.json +5 -1
|
@@ -51,10 +51,10 @@ export interface ExecutorConfig {
|
|
|
51
51
|
recordSessionCost: (input: number, output: number) => void;
|
|
52
52
|
/** Returns true if session cost limit has been reached */
|
|
53
53
|
isSessionCostLimitReached: () => boolean;
|
|
54
|
-
/**
|
|
55
|
-
|
|
56
|
-
/**
|
|
57
|
-
|
|
54
|
+
/** Returns current accumulated session cost in USD */
|
|
55
|
+
getSessionCost: () => number;
|
|
56
|
+
/** Returns maximum allowed session cost in USD */
|
|
57
|
+
getSessionCostLimit: () => number;
|
|
58
58
|
}
|
|
59
59
|
/**
|
|
60
60
|
* AgentExecutor implements the core agentic loop
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
*/
|
|
10
10
|
import { logger } from "../../utils/logger.js";
|
|
11
11
|
import { getErrorMessage } from "../../errors/index.js";
|
|
12
|
+
import { sanitizeToolResult } from "../../utils/sanitize.js";
|
|
12
13
|
/**
|
|
13
14
|
* AgentExecutor implements the core agentic loop
|
|
14
15
|
*
|
|
@@ -36,8 +37,8 @@ export class AgentExecutor {
|
|
|
36
37
|
return {
|
|
37
38
|
toolRound,
|
|
38
39
|
maxToolRounds: this.config.maxToolRounds,
|
|
39
|
-
sessionCost: this.config.
|
|
40
|
-
sessionCostLimit: this.config.
|
|
40
|
+
sessionCost: this.config.getSessionCost(),
|
|
41
|
+
sessionCostLimit: this.config.getSessionCostLimit(),
|
|
41
42
|
inputTokens,
|
|
42
43
|
outputTokens,
|
|
43
44
|
history,
|
|
@@ -128,6 +129,21 @@ export class AgentExecutor {
|
|
|
128
129
|
content: assistantMessage.content || "",
|
|
129
130
|
tool_calls: assistantMessage.tool_calls,
|
|
130
131
|
});
|
|
132
|
+
// Pre-check cost limit before executing tools
|
|
133
|
+
this.config.recordSessionCost(inputTokens, totalOutputTokens);
|
|
134
|
+
if (this.config.isSessionCostLimitReached()) {
|
|
135
|
+
const sessionCost = this.config.getSessionCost();
|
|
136
|
+
const sessionCostLimit = this.config.getSessionCostLimit();
|
|
137
|
+
const costEntry = {
|
|
138
|
+
type: "assistant",
|
|
139
|
+
content: `Session cost limit reached ($${sessionCost.toFixed(2)} / $${sessionCostLimit.toFixed(2)}). Stopping before tool execution.`,
|
|
140
|
+
timestamp: new Date(),
|
|
141
|
+
};
|
|
142
|
+
history.push(costEntry);
|
|
143
|
+
messages.push({ role: "assistant", content: costEntry.content });
|
|
144
|
+
newEntries.push(costEntry);
|
|
145
|
+
break;
|
|
146
|
+
}
|
|
131
147
|
// Execute tool calls
|
|
132
148
|
for (const toolCall of assistantMessage.tool_calls) {
|
|
133
149
|
const toolCallEntry = {
|
|
@@ -136,7 +152,9 @@ export class AgentExecutor {
|
|
|
136
152
|
timestamp: new Date(),
|
|
137
153
|
toolCall: toolCall,
|
|
138
154
|
};
|
|
155
|
+
const histIdx = history.length;
|
|
139
156
|
history.push(toolCallEntry);
|
|
157
|
+
const newIdx = newEntries.length;
|
|
140
158
|
newEntries.push(toolCallEntry);
|
|
141
159
|
const result = await this.executeToolViaLane(toolCall);
|
|
142
160
|
// Update entry with result
|
|
@@ -146,18 +164,14 @@ export class AgentExecutor {
|
|
|
146
164
|
content: result.success ? result.output || "Success" : result.error || "Error occurred",
|
|
147
165
|
toolResult: result,
|
|
148
166
|
};
|
|
149
|
-
// Replace in history and newEntries
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
history[histIdx] = updatedEntry;
|
|
153
|
-
const newIdx = newEntries.indexOf(toolCallEntry);
|
|
154
|
-
if (newIdx !== -1)
|
|
155
|
-
newEntries[newIdx] = updatedEntry;
|
|
167
|
+
// Replace in history and newEntries using tracked indices (O(1))
|
|
168
|
+
history[histIdx] = updatedEntry;
|
|
169
|
+
newEntries[newIdx] = updatedEntry;
|
|
156
170
|
// Add tool result to messages
|
|
157
171
|
// Note: 'name' is required for Gemini API to match functionResponse with functionCall
|
|
158
172
|
messages.push({
|
|
159
173
|
role: "tool",
|
|
160
|
-
content: result.success ? result.output || "Success" : result.error || "Error",
|
|
174
|
+
content: sanitizeToolResult(result.success ? result.output || "Success" : result.error || "Error"),
|
|
161
175
|
tool_call_id: toolCall.id,
|
|
162
176
|
name: toolCall.function.name,
|
|
163
177
|
});
|
|
@@ -197,9 +211,11 @@ export class AgentExecutor {
|
|
|
197
211
|
// Record session cost
|
|
198
212
|
this.config.recordSessionCost(inputTokens, totalOutputTokens);
|
|
199
213
|
if (this.config.isSessionCostLimitReached()) {
|
|
214
|
+
const sessionCost = this.config.getSessionCost();
|
|
215
|
+
const sessionCostLimit = this.config.getSessionCostLimit();
|
|
200
216
|
const costEntry = {
|
|
201
217
|
type: "assistant",
|
|
202
|
-
content: `💸 Session cost limit reached ($${
|
|
218
|
+
content: `💸 Session cost limit reached ($${sessionCost.toFixed(2)} / $${sessionCostLimit.toFixed(2)}). Please start a new session.`,
|
|
203
219
|
timestamp: new Date(),
|
|
204
220
|
};
|
|
205
221
|
history.push(costEntry);
|
|
@@ -321,6 +337,15 @@ export class AgentExecutor {
|
|
|
321
337
|
messages.push({ role: "assistant", content: content, tool_calls: toolCalls });
|
|
322
338
|
if (toolCalls && toolCalls.length > 0) {
|
|
323
339
|
toolRounds++;
|
|
340
|
+
// Pre-check cost limit before executing tools
|
|
341
|
+
this.config.recordSessionCost(inputTokens, totalOutputTokens);
|
|
342
|
+
if (this.config.isSessionCostLimitReached()) {
|
|
343
|
+
const sessionCost = this.config.getSessionCost();
|
|
344
|
+
const sessionCostLimit = this.config.getSessionCostLimit();
|
|
345
|
+
yield { type: "content", content: `\n\nSession cost limit reached ($${sessionCost.toFixed(2)} / $${sessionCostLimit.toFixed(2)}). Stopping before tool execution.` };
|
|
346
|
+
yield { type: "done" };
|
|
347
|
+
return;
|
|
348
|
+
}
|
|
324
349
|
if (!this.deps.streamingHandler.hasYieldedToolCalls()) {
|
|
325
350
|
yield { type: "tool_calls", toolCalls: toolCalls };
|
|
326
351
|
}
|
|
@@ -363,7 +388,7 @@ export class AgentExecutor {
|
|
|
363
388
|
// Note: 'name' is required for Gemini API to match functionResponse with functionCall
|
|
364
389
|
messages.push({
|
|
365
390
|
role: "tool",
|
|
366
|
-
content: result.success ? result.output || "Success" : result.error || "Error",
|
|
391
|
+
content: sanitizeToolResult(result.success ? result.output || "Success" : result.error || "Error"),
|
|
367
392
|
tool_call_id: toolCall.id,
|
|
368
393
|
name: toolCall.function.name,
|
|
369
394
|
});
|
|
@@ -390,9 +415,11 @@ export class AgentExecutor {
|
|
|
390
415
|
// Legacy inline cost check when no pipeline
|
|
391
416
|
this.config.recordSessionCost(inputTokens, totalOutputTokens);
|
|
392
417
|
if (this.config.isSessionCostLimitReached()) {
|
|
418
|
+
const sessionCost = this.config.getSessionCost();
|
|
419
|
+
const sessionCostLimit = this.config.getSessionCostLimit();
|
|
393
420
|
yield {
|
|
394
421
|
type: "content",
|
|
395
|
-
content: `\n\n💸 Session cost limit reached ($${
|
|
422
|
+
content: `\n\n💸 Session cost limit reached ($${sessionCost.toFixed(2)} / $${sessionCostLimit.toFixed(2)}).`,
|
|
396
423
|
};
|
|
397
424
|
yield { type: "done" };
|
|
398
425
|
return;
|
|
@@ -408,7 +435,12 @@ export class AgentExecutor {
|
|
|
408
435
|
}
|
|
409
436
|
this.config.recordSessionCost(inputTokens, totalOutputTokens);
|
|
410
437
|
if (this.config.isSessionCostLimitReached()) {
|
|
411
|
-
|
|
438
|
+
const sessionCost = this.config.getSessionCost();
|
|
439
|
+
const sessionCostLimit = this.config.getSessionCostLimit();
|
|
440
|
+
yield {
|
|
441
|
+
type: "content",
|
|
442
|
+
content: `\n\n💸 Session cost limit reached ($${sessionCost.toFixed(2)} / $${sessionCostLimit.toFixed(2)}).`,
|
|
443
|
+
};
|
|
412
444
|
}
|
|
413
445
|
yield { type: "done" };
|
|
414
446
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-executor.js","sourceRoot":"","sources":["../../../src/agent/execution/agent-executor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agent-executor.js","sourceRoot":"","sources":["../../../src/agent/execution/agent-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -159,7 +159,7 @@ export class AgentContextFacade {
|
|
|
159
159
|
* Get memory statistics
|
|
160
160
|
*/
|
|
161
161
|
getMemoryStats() {
|
|
162
|
-
if (!this.memoryEnabled
|
|
162
|
+
if (!this.memoryEnabled)
|
|
163
163
|
return null;
|
|
164
164
|
return this.memory.getStats();
|
|
165
165
|
}
|
|
@@ -169,8 +169,6 @@ export class AgentContextFacade {
|
|
|
169
169
|
formatMemoryStatus() {
|
|
170
170
|
if (!this.memoryEnabled)
|
|
171
171
|
return '🧠 Memory: Disabled';
|
|
172
|
-
if (!this._memory)
|
|
173
|
-
return '🧠 Memory: Not initialized';
|
|
174
172
|
return this.memory.formatStatus();
|
|
175
173
|
}
|
|
176
174
|
// ============================================================================
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-context-facade.js","sourceRoot":"","sources":["../../../src/agent/facades/agent-context-facade.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"agent-context-facade.js","sourceRoot":"","sources":["../../../src/agent/facades/agent-context-facade.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ import { logger } from '../../utils/logger.js';
|
|
|
14
14
|
*/
|
|
15
15
|
const DEFAULT_CONFIG = {
|
|
16
16
|
maxHistorySize: 1000,
|
|
17
|
-
maxMessagesSize:
|
|
17
|
+
maxMessagesSize: 1000,
|
|
18
18
|
recentEntriesToKeepFull: 100,
|
|
19
19
|
maxContentLength: 500,
|
|
20
20
|
maxOutputLength: 200,
|
|
@@ -198,20 +198,22 @@ export class MessageHistoryManager {
|
|
|
198
198
|
* Trim LLM messages, preserving system message
|
|
199
199
|
*/
|
|
200
200
|
trimMessages() {
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
const
|
|
201
|
+
const hasSystemMessage = this.messages[0]?.role === 'system';
|
|
202
|
+
if (hasSystemMessage) {
|
|
203
|
+
const systemMessage = this.messages[0];
|
|
204
|
+
const conversationMessages = this.messages.slice(1);
|
|
205
|
+
if (conversationMessages.length > this.config.maxMessagesSize) {
|
|
206
|
+
const trimCount = conversationMessages.length - this.config.maxMessagesSize;
|
|
207
|
+
const recentMessages = conversationMessages.slice(-this.config.maxMessagesSize);
|
|
207
208
|
this.messages = [systemMessage, ...recentMessages];
|
|
208
209
|
logger.debug(`Trimmed ${trimCount} old LLM messages (system message preserved)`);
|
|
209
210
|
}
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
211
|
+
return;
|
|
212
|
+
}
|
|
213
|
+
if (this.messages.length > this.config.maxMessagesSize) {
|
|
214
|
+
const trimCount = this.messages.length - this.config.maxMessagesSize;
|
|
215
|
+
this.messages = this.messages.slice(trimCount);
|
|
216
|
+
logger.debug(`Trimmed ${trimCount} old LLM messages`);
|
|
215
217
|
}
|
|
216
218
|
}
|
|
217
219
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-history-manager.js","sourceRoot":"","sources":["../../../src/agent/facades/message-history-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AA4B/C;;GAEG;AACH,MAAM,cAAc,GAAkB;IACpC,cAAc,EAAE,IAAI;IACpB,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"message-history-manager.js","sourceRoot":"","sources":["../../../src/agent/facades/message-history-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AA4B/C;;GAEG;AACH,MAAM,cAAc,GAAkB;IACpC,cAAc,EAAE,IAAI;IACpB,eAAe,EAAE,IAAI;IACrB,uBAAuB,EAAE,GAAG;IAC5B,gBAAgB,EAAE,GAAG;IACrB,eAAe,EAAE,GAAG;CACrB,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,OAAO,qBAAqB;IACxB,WAAW,GAAgB,EAAE,CAAC;IAC9B,QAAQ,GAAuB,EAAE,CAAC;IACzB,MAAM,CAAgB;IAEvC,YAAY,SAAiC,EAAE;QAC7C,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,MAAM,EAAE,CAAC;IACjD,CAAC;IAED,+EAA+E;IAC/E,0BAA0B;IAC1B,+EAA+E;IAE/E;;OAEG;IACH,cAAc;QACZ,OAAO,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,iBAAiB;QACf,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,YAAY,CAAC,KAAgB;QAC3B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,OAAoB;QACjC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;QAClC,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,OAAoB;QACjC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;QAC3B,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,gBAAgB;QACd,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,+EAA+E;IAC/E,yBAAyB;IACzB,+EAA+E;IAE/E;;OAEG;IACH,WAAW;QACT,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5B,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,OAAyB;QAClC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,QAA4B;QACtC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QAChC,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,QAA4B;QACtC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,wBAAiC,IAAI;QACjD,IAAI,qBAAqB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC5F,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACrB,CAAC;IACH,CAAC;IAED;;OAEG;IACH,gBAAgB;QACd,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACnE,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC1B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,gBAAgB,CAAC,OAAe;QAC9B,MAAM,aAAa,GAAqB,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpE,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACnE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAED,+EAA+E;IAC/E,YAAY;IACZ,+EAA+E;IAE/E;;OAEG;IACH,QAAQ,CAAC,wBAAiC,IAAI;QAC5C,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IAC5C,CAAC;IAED,+EAA+E;IAC/E,aAAa;IACb,+EAA+E;IAE/E;;OAEG;IACH,QAAQ;QACN,OAAO;YACL,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM;YACxC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;YAClC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;YACtC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe;SACzC,CAAC;IACJ,CAAC;IAED,+EAA+E;IAC/E,+BAA+B;IAC/B,+EAA+E;IAE/E;;;;;;OAMG;IACK,WAAW;QACjB,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,yBAAyB,EAAE,CAAC;IACnC,CAAC;IAED;;OAEG;IACK,eAAe;QACrB,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YACzD,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;YACvE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACrD,MAAM,CAAC,KAAK,CAAC,WAAW,SAAS,2BAA2B,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAED;;OAEG;IACK,YAAY;QAClB,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,QAAQ,CAAC;QAE7D,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,oBAAoB,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACpD,IAAI,oBAAoB,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;gBAC9D,MAAM,SAAS,GAAG,oBAAoB,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;gBAC5E,MAAM,cAAc,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;gBAChF,IAAI,CAAC,QAAQ,GAAG,CAAC,aAAa,EAAE,GAAG,cAAc,CAAC,CAAC;gBACnD,MAAM,CAAC,KAAK,CAAC,WAAW,SAAS,8CAA8C,CAAC,CAAC;YACnF,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YACvD,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;YACrE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC/C,MAAM,CAAC,KAAK,CAAC,WAAW,SAAS,mBAAmB,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,yBAAyB;QAC/B,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,CAAC;YACnE,OAAO;QACT,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;QAErF,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;YACjC,0CAA0C;YAC1C,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;gBACzE,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,iBAAiB,CAAC;YAC/F,CAAC;YAED,+BAA+B;YAC/B,IAAI,KAAK,CAAC,UAAU,EAAE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;gBAC7F,KAAK,CAAC,UAAU,CAAC,MAAM;oBACrB,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,iBAAiB,CAAC;YAC1F,CAAC;QACH,CAAC;IACH,CAAC;IAED,+EAA+E;IAC/E,WAAW;IACX,+EAA+E;IAE/E;;OAEG;IACH,OAAO;QACL,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACrB,CAAC;CACF"}
|
|
@@ -59,16 +59,16 @@ export declare class SessionFacade {
|
|
|
59
59
|
/**
|
|
60
60
|
* Save the current chat history to the session
|
|
61
61
|
*/
|
|
62
|
-
saveCurrentSession(chatHistory: ChatEntry[]): Promise<void
|
|
62
|
+
saveCurrentSession(chatHistory: ChatEntry[]): Promise<void> | void;
|
|
63
63
|
/**
|
|
64
64
|
* Get formatted list of sessions
|
|
65
65
|
*/
|
|
66
|
-
getSessionList(): Promise<string
|
|
66
|
+
getSessionList(): Promise<string> | string;
|
|
67
67
|
/**
|
|
68
68
|
* Export current session to a file
|
|
69
69
|
* @returns The path to the exported file, or null if no current session
|
|
70
70
|
*/
|
|
71
|
-
exportCurrentSession(outputPath?: string): Promise<string | null
|
|
71
|
+
exportCurrentSession(outputPath?: string): Promise<string | null> | string | null;
|
|
72
72
|
/**
|
|
73
73
|
* Get the current session ID
|
|
74
74
|
*/
|
|
@@ -73,24 +73,24 @@ export class SessionFacade {
|
|
|
73
73
|
/**
|
|
74
74
|
* Save the current chat history to the session
|
|
75
75
|
*/
|
|
76
|
-
|
|
77
|
-
|
|
76
|
+
saveCurrentSession(chatHistory) {
|
|
77
|
+
return this.sessionStore.updateCurrentSession(chatHistory);
|
|
78
78
|
}
|
|
79
79
|
/**
|
|
80
80
|
* Get formatted list of sessions
|
|
81
81
|
*/
|
|
82
|
-
|
|
83
|
-
return
|
|
82
|
+
getSessionList() {
|
|
83
|
+
return this.sessionStore.formatSessionList();
|
|
84
84
|
}
|
|
85
85
|
/**
|
|
86
86
|
* Export current session to a file
|
|
87
87
|
* @returns The path to the exported file, or null if no current session
|
|
88
88
|
*/
|
|
89
|
-
|
|
89
|
+
exportCurrentSession(outputPath) {
|
|
90
90
|
const currentId = this.sessionStore.getCurrentSessionId();
|
|
91
91
|
if (!currentId)
|
|
92
92
|
return null;
|
|
93
|
-
return
|
|
93
|
+
return this.sessionStore.exportSessionToFile(currentId, outputPath);
|
|
94
94
|
}
|
|
95
95
|
/**
|
|
96
96
|
* Get the current session ID
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-facade.js","sourceRoot":"","sources":["../../../src/agent/facades/session-facade.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAsBH;;;;;;;GAOG;AACH,MAAM,OAAO,aAAa;IACP,iBAAiB,CAAoB;IACrC,YAAY,CAAe;IAE5C,YAAY,IAAuB;QACjC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAChD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;IACxC,CAAC;IAED,+EAA+E;IAC/E,wBAAwB;IACxB,+EAA+E;IAE/E;;OAEG;IACH,gBAAgB,CAAC,WAAmB;QAClC,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACvD,CAAC;IAED;;OAEG;IACH,sBAAsB;QACpB,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;QACrD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,MAAM,CAAC,UAAU;oBACxB,CAAC,CAAC,eAAe,MAAM,CAAC,UAAU,CAAC,WAAW,eAAe,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACzF,CAAC,CAAC,qBAAqB;aAC1B,CAAC;QACJ,CAAC;QACD,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,kBAAkB;SACxD,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,iBAAiB;QACf,OAAO,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;IACvD,CAAC;IAED;;OAEG;IACH,oBAAoB;QAClB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,+EAA+E;IAC/E,qBAAqB;IACrB,+EAA+E;IAE/E;;OAEG;IACH,eAAe;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,
|
|
1
|
+
{"version":3,"file":"session-facade.js","sourceRoot":"","sources":["../../../src/agent/facades/session-facade.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAsBH;;;;;;;GAOG;AACH,MAAM,OAAO,aAAa;IACP,iBAAiB,CAAoB;IACrC,YAAY,CAAe;IAE5C,YAAY,IAAuB;QACjC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAChD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;IACxC,CAAC;IAED,+EAA+E;IAC/E,wBAAwB;IACxB,+EAA+E;IAE/E;;OAEG;IACH,gBAAgB,CAAC,WAAmB;QAClC,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACvD,CAAC;IAED;;OAEG;IACH,sBAAsB;QACpB,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;QACrD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,MAAM,CAAC,UAAU;oBACxB,CAAC,CAAC,eAAe,MAAM,CAAC,UAAU,CAAC,WAAW,eAAe,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACzF,CAAC,CAAC,qBAAqB;aAC1B,CAAC;QACJ,CAAC;QACD,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,kBAAkB;SACxD,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,iBAAiB;QACf,OAAO,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;IACvD,CAAC;IAED;;OAEG;IACH,oBAAoB;QAClB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED,+EAA+E;IAC/E,qBAAqB;IACrB,+EAA+E;IAE/E;;OAEG;IACH,eAAe;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,WAAwB;QACzC,OAAO,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,OAAO,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE,CAAC;IAC/C,CAAC;IAED;;;OAGG;IACH,oBAAoB,CAAC,UAAmB;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC;QAC1D,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC;QAC5B,OAAO,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACtE,CAAC;IAED;;OAEG;IACH,mBAAmB;QACjB,OAAO,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC;IACjD,CAAC;CACF"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Message History Self-Repair (Vibe-inspired)
|
|
3
|
+
*
|
|
4
|
+
* Cleans and repairs malformed message sequences before sending to the LLM.
|
|
5
|
+
* Fixes orphaned tool results, missing assistant messages, duplicate roles,
|
|
6
|
+
* and other common issues that cause API errors.
|
|
7
|
+
*/
|
|
8
|
+
export interface LLMMessage {
|
|
9
|
+
role: 'system' | 'user' | 'assistant' | 'tool';
|
|
10
|
+
content: string | null;
|
|
11
|
+
tool_call_id?: string;
|
|
12
|
+
tool_calls?: Array<{
|
|
13
|
+
id: string;
|
|
14
|
+
type: 'function';
|
|
15
|
+
function: {
|
|
16
|
+
name: string;
|
|
17
|
+
arguments: string;
|
|
18
|
+
};
|
|
19
|
+
}>;
|
|
20
|
+
name?: string;
|
|
21
|
+
}
|
|
22
|
+
export interface RepairResult {
|
|
23
|
+
messages: LLMMessage[];
|
|
24
|
+
repaired: boolean;
|
|
25
|
+
repairs: string[];
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Repair a message history to ensure it's valid for LLM API calls.
|
|
29
|
+
*
|
|
30
|
+
* Fixes:
|
|
31
|
+
* 1. Orphaned tool results (tool message without preceding assistant tool_call)
|
|
32
|
+
* 2. Missing tool results (assistant with tool_calls but no following tool messages)
|
|
33
|
+
* 3. Consecutive same-role messages (merge or insert bridge)
|
|
34
|
+
* 4. Empty content messages
|
|
35
|
+
* 5. First message must be system or user
|
|
36
|
+
*/
|
|
37
|
+
export declare function repairMessageHistory(messages: LLMMessage[]): RepairResult;
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Message History Self-Repair (Vibe-inspired)
|
|
3
|
+
*
|
|
4
|
+
* Cleans and repairs malformed message sequences before sending to the LLM.
|
|
5
|
+
* Fixes orphaned tool results, missing assistant messages, duplicate roles,
|
|
6
|
+
* and other common issues that cause API errors.
|
|
7
|
+
*/
|
|
8
|
+
import { logger } from '../utils/logger.js';
|
|
9
|
+
/**
|
|
10
|
+
* Repair a message history to ensure it's valid for LLM API calls.
|
|
11
|
+
*
|
|
12
|
+
* Fixes:
|
|
13
|
+
* 1. Orphaned tool results (tool message without preceding assistant tool_call)
|
|
14
|
+
* 2. Missing tool results (assistant with tool_calls but no following tool messages)
|
|
15
|
+
* 3. Consecutive same-role messages (merge or insert bridge)
|
|
16
|
+
* 4. Empty content messages
|
|
17
|
+
* 5. First message must be system or user
|
|
18
|
+
*/
|
|
19
|
+
export function repairMessageHistory(messages) {
|
|
20
|
+
if (messages.length === 0) {
|
|
21
|
+
return { messages: [], repaired: false, repairs: [] };
|
|
22
|
+
}
|
|
23
|
+
const repairs = [];
|
|
24
|
+
let result = [...messages.map(m => ({ ...m }))]; // deep-ish copy
|
|
25
|
+
// Pass 1: Remove empty content messages (except tool_calls assistants)
|
|
26
|
+
result = result.filter((msg, i) => {
|
|
27
|
+
if (msg.role === 'assistant' && msg.tool_calls && msg.tool_calls.length > 0) {
|
|
28
|
+
return true; // Keep even if content is null
|
|
29
|
+
}
|
|
30
|
+
if (msg.content === null || msg.content === undefined || msg.content === '') {
|
|
31
|
+
if (msg.role !== 'assistant') {
|
|
32
|
+
repairs.push(`Removed empty ${msg.role} message at position ${i}`);
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return true;
|
|
37
|
+
});
|
|
38
|
+
// Pass 2: Fix orphaned tool messages
|
|
39
|
+
const fixed = [];
|
|
40
|
+
for (let i = 0; i < result.length; i++) {
|
|
41
|
+
const msg = result[i];
|
|
42
|
+
if (msg.role === 'tool') {
|
|
43
|
+
// Check if there's a preceding assistant with matching tool_call
|
|
44
|
+
const hasParent = fixed.some(m => m.role === 'assistant' &&
|
|
45
|
+
m.tool_calls?.some(tc => tc.id === msg.tool_call_id));
|
|
46
|
+
if (!hasParent) {
|
|
47
|
+
// Insert a synthetic assistant message with the tool call
|
|
48
|
+
const toolCallId = msg.tool_call_id || `synthetic_${Date.now()}_${i}`;
|
|
49
|
+
msg.tool_call_id = toolCallId;
|
|
50
|
+
fixed.push({
|
|
51
|
+
role: 'assistant',
|
|
52
|
+
content: null,
|
|
53
|
+
tool_calls: [{
|
|
54
|
+
id: toolCallId,
|
|
55
|
+
type: 'function',
|
|
56
|
+
function: {
|
|
57
|
+
name: msg.name || 'unknown_tool',
|
|
58
|
+
arguments: '{}',
|
|
59
|
+
},
|
|
60
|
+
}],
|
|
61
|
+
});
|
|
62
|
+
repairs.push(`Inserted synthetic assistant for orphaned tool result at position ${i}`);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
fixed.push(msg);
|
|
66
|
+
}
|
|
67
|
+
result = fixed;
|
|
68
|
+
// Pass 3: Fill missing tool results (idempotent - won't duplicate synthetic results)
|
|
69
|
+
const SYNTHETIC_MARKER = '[No result recorded]';
|
|
70
|
+
for (let i = 0; i < result.length; i++) {
|
|
71
|
+
const msg = result[i];
|
|
72
|
+
if (msg.role === 'assistant' && msg.tool_calls) {
|
|
73
|
+
for (const tc of msg.tool_calls) {
|
|
74
|
+
// Check if there's a corresponding tool result after this message (real or synthetic)
|
|
75
|
+
const hasResult = result.slice(i + 1).some(m => m.role === 'tool' && m.tool_call_id === tc.id);
|
|
76
|
+
if (!hasResult) {
|
|
77
|
+
// Find where to insert (right after current assistant or after last tool result)
|
|
78
|
+
let insertIdx = i + 1;
|
|
79
|
+
while (insertIdx < result.length && result[insertIdx].role === 'tool') {
|
|
80
|
+
insertIdx++;
|
|
81
|
+
}
|
|
82
|
+
result.splice(insertIdx, 0, {
|
|
83
|
+
role: 'tool',
|
|
84
|
+
content: SYNTHETIC_MARKER,
|
|
85
|
+
tool_call_id: tc.id,
|
|
86
|
+
name: tc.function.name,
|
|
87
|
+
});
|
|
88
|
+
repairs.push(`Inserted missing tool result for ${tc.function.name} (${tc.id})`);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
// Pass 4: Merge consecutive user messages
|
|
94
|
+
const merged = [];
|
|
95
|
+
for (const msg of result) {
|
|
96
|
+
const prev = merged[merged.length - 1];
|
|
97
|
+
if (prev && prev.role === 'user' && msg.role === 'user') {
|
|
98
|
+
prev.content = (prev.content || '') + '\n' + (msg.content || '');
|
|
99
|
+
repairs.push('Merged consecutive user messages');
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
merged.push(msg);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
result = merged;
|
|
106
|
+
// Pass 5: Ensure first non-system message is user
|
|
107
|
+
const firstNonSystem = result.findIndex(m => m.role !== 'system');
|
|
108
|
+
if (firstNonSystem >= 0 && result[firstNonSystem].role !== 'user') {
|
|
109
|
+
result.splice(firstNonSystem, 0, {
|
|
110
|
+
role: 'user',
|
|
111
|
+
content: '[Session resumed]',
|
|
112
|
+
});
|
|
113
|
+
repairs.push('Inserted user message at start of conversation');
|
|
114
|
+
}
|
|
115
|
+
if (repairs.length > 0) {
|
|
116
|
+
logger.debug('Message history repaired', { repairCount: repairs.length, repairs });
|
|
117
|
+
}
|
|
118
|
+
return {
|
|
119
|
+
messages: result,
|
|
120
|
+
repaired: repairs.length > 0,
|
|
121
|
+
repairs,
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
//# sourceMappingURL=history-repair.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"history-repair.js","sourceRoot":"","sources":["../../src/agent/history-repair.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/index.d.ts
CHANGED
|
@@ -17,9 +17,9 @@ export { MessageProcessor, sanitizeLLMOutput, extractCommentaryToolCalls, type C
|
|
|
17
17
|
export { AgentState, DEFAULT_AGENT_CONFIG, YOLO_CONFIG, type AgentConfig, } from "./agent-state.js";
|
|
18
18
|
export { CodeBuddyAgent } from "./codebuddy-agent.js";
|
|
19
19
|
export type * from "./types.js";
|
|
20
|
-
export
|
|
21
|
-
export
|
|
22
|
-
export
|
|
20
|
+
export { StreamingHandler, reduceStreamChunk, type StreamingConfig, type RawStreamingChunk, type ProcessedChunk, type ExtractedToolCallsResult, type AccumulatedMessage, type ExtractedToolCall, } from "./streaming/index.js";
|
|
21
|
+
export { ToolSelectionStrategy, getToolSelectionStrategy, resetToolSelectionStrategy, RepairCoordinator, createRepairCoordinator, getRepairCoordinator, resetRepairCoordinator, DEFAULT_REPAIR_CONFIG, DEFAULT_REPAIR_PATTERNS, ToolExecutionOrchestrator, createToolOrchestrator, getToolOrchestrator, resetToolOrchestrator, DEFAULT_ORCHESTRATOR_CONFIG, ToolDependencyGraph, createToolDependencyGraph, getToolDependencyGraph, resetToolDependencyGraph, TOOL_METADATA, type ToolSelectionConfig, type SelectionResult, type ToolCategory, type QueryClassification, type ToolSelectionResult, type ToolSelectionMetrics, type RepairConfig, type RepairResult, type RepairCoordinatorEvents, type TestExecutor, type CommandExecutor, type FileReader, type FileWriter, type OrchestratorConfig, type BatchExecutionResult, type ExecutionMetrics, type OrchestratorEvents, type ResourceType, type AccessMode, type ResourceAccess, type ToolMetadata, type GraphNode, type ExecutionPlan, } from "./execution/index.js";
|
|
22
|
+
export { MemoryContextBuilder, createMemoryContextBuilder, getMemoryContextBuilder, resetMemoryContextBuilder, DEFAULT_MEMORY_CONTEXT_CONFIG, type MemoryContextConfig, type ContextItem, type BuiltContext, type MemoryContextEvents, } from "./context/index.js";
|
|
23
23
|
import { ToolResult, AgentState as LegacyAgentState } from '../types/index.js';
|
|
24
24
|
/**
|
|
25
25
|
* Legacy Agent class - kept for backwards compatibility.
|
package/dist/agent/index.js
CHANGED
|
@@ -17,11 +17,11 @@ export { MessageProcessor, sanitizeLLMOutput, extractCommentaryToolCalls, } from
|
|
|
17
17
|
export { AgentState, DEFAULT_AGENT_CONFIG, YOLO_CONFIG, } from "./agent-state.js";
|
|
18
18
|
export { CodeBuddyAgent } from "./codebuddy-agent.js";
|
|
19
19
|
// Streaming Module
|
|
20
|
-
export
|
|
20
|
+
export { StreamingHandler, reduceStreamChunk, } from "./streaming/index.js";
|
|
21
21
|
// Execution Module
|
|
22
|
-
export
|
|
22
|
+
export { ToolSelectionStrategy, getToolSelectionStrategy, resetToolSelectionStrategy, RepairCoordinator, createRepairCoordinator, getRepairCoordinator, resetRepairCoordinator, DEFAULT_REPAIR_CONFIG, DEFAULT_REPAIR_PATTERNS, ToolExecutionOrchestrator, createToolOrchestrator, getToolOrchestrator, resetToolOrchestrator, DEFAULT_ORCHESTRATOR_CONFIG, ToolDependencyGraph, createToolDependencyGraph, getToolDependencyGraph, resetToolDependencyGraph, TOOL_METADATA, } from "./execution/index.js";
|
|
23
23
|
// Context Module
|
|
24
|
-
export
|
|
24
|
+
export { MemoryContextBuilder, createMemoryContextBuilder, getMemoryContextBuilder, resetMemoryContextBuilder, DEFAULT_MEMORY_CONTEXT_CONFIG, } from "./context/index.js";
|
|
25
25
|
// Legacy imports
|
|
26
26
|
import { TextEditorTool, BashTool } from '../tools/index.js';
|
|
27
27
|
/**
|