repoburg 1.3.319 → 1.3.321
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/agent-pane/backend/dist/index.js +510 -159
- package/agent-pane/backend/dist/server.js +510 -159
- package/agent-pane/frontend/dist/assets/{TerminalView-D5Hg3Fzf.js → TerminalView-Z7ZJ436H.js} +1 -1
- package/agent-pane/frontend/dist/assets/{index-Cckb2tlY.js → index-CjwvHfxy.js} +12 -2
- package/agent-pane/frontend/dist/index.html +1 -1
- package/backend/dist/src/agent-runtime/agent-runtime-event-emitter.d.ts +2 -1
- package/backend/dist/src/agent-runtime/agent-runtime-event-emitter.js +10 -0
- package/backend/dist/src/agent-runtime/agent-runtime-event-emitter.js.map +1 -1
- package/backend/dist/src/agent-runtime/agent-runtime.types.d.ts +12 -1
- package/backend/dist/src/ai-actions/ai-action-batch.service.js +6 -3
- package/backend/dist/src/ai-actions/ai-action-batch.service.js.map +1 -1
- package/backend/dist/src/app.module.js +2 -9
- package/backend/dist/src/app.module.js.map +1 -1
- package/backend/dist/src/application-state/application-state.service.d.ts +3 -4
- package/backend/dist/src/application-state/application-state.service.js +21 -25
- package/backend/dist/src/application-state/application-state.service.js.map +1 -1
- package/backend/dist/src/context-generation/context-generation.service.js +3 -0
- package/backend/dist/src/context-generation/context-generation.service.js.map +1 -1
- package/backend/dist/src/context-generation/project-guidance.d.ts +12 -0
- package/backend/dist/src/context-generation/project-guidance.js +103 -0
- package/backend/dist/src/context-generation/project-guidance.js.map +1 -0
- package/backend/dist/src/core-entities/mcp-config.entity.d.ts +3 -1
- package/backend/dist/src/core-entities/mcp-config.entity.js +17 -1
- package/backend/dist/src/core-entities/mcp-config.entity.js.map +1 -1
- package/backend/dist/src/global-config/dto/update-global-config.dto.d.ts +2 -0
- package/backend/dist/src/global-config/dto/update-global-config.dto.js +12 -0
- package/backend/dist/src/global-config/dto/update-global-config.dto.js.map +1 -1
- package/backend/dist/src/global-config/global-config.service.d.ts +2 -0
- package/backend/dist/src/global-config/global-config.service.js.map +1 -1
- package/backend/dist/src/interactive-chat/auto-compact.service.d.ts +34 -0
- package/backend/dist/src/interactive-chat/auto-compact.service.js +259 -0
- package/backend/dist/src/interactive-chat/auto-compact.service.js.map +1 -0
- package/backend/dist/src/interactive-chat/chat.module.js +2 -5
- package/backend/dist/src/interactive-chat/chat.module.js.map +1 -1
- package/backend/dist/src/interactive-chat/chat.service.d.ts +12 -4
- package/backend/dist/src/interactive-chat/chat.service.js +102 -39
- package/backend/dist/src/interactive-chat/chat.service.js.map +1 -1
- package/backend/dist/src/llm-orchestration/action-handlers/execute-code.handler.d.ts +1 -1
- package/backend/dist/src/llm-orchestration/action-handlers/execute-code.handler.js +8 -2
- package/backend/dist/src/llm-orchestration/action-handlers/execute-code.handler.js.map +1 -1
- package/backend/dist/src/llm-orchestration/action-handlers/mcp-tool-action.handler.d.ts +5 -2
- package/backend/dist/src/llm-orchestration/action-handlers/mcp-tool-action.handler.js +50 -17
- package/backend/dist/src/llm-orchestration/action-handlers/mcp-tool-action.handler.js.map +1 -1
- package/backend/dist/src/llm-orchestration/action-handlers/run-command.handler.js +9 -1
- package/backend/dist/src/llm-orchestration/action-handlers/run-command.handler.js.map +1 -1
- package/backend/dist/src/llm-orchestration/hooks/follow-up-post-execution.hook.js +8 -0
- package/backend/dist/src/llm-orchestration/hooks/follow-up-post-execution.hook.js.map +1 -1
- package/backend/dist/src/llm-orchestration/hooks/yolo-mode-post-execution.hook.js +2 -1
- package/backend/dist/src/llm-orchestration/hooks/yolo-mode-post-execution.hook.js.map +1 -1
- package/backend/dist/src/llm-orchestration/llm-orchestration.interfaces.d.ts +2 -0
- package/backend/dist/src/llm-orchestration/llm-orchestration.interfaces.js.map +1 -1
- package/backend/dist/src/llm-orchestration/llm-orchestration.module.js +0 -2
- package/backend/dist/src/llm-orchestration/llm-orchestration.module.js.map +1 -1
- package/backend/dist/src/llm-orchestration/llm-turn-processor.service.d.ts +8 -1
- package/backend/dist/src/llm-orchestration/llm-turn-processor.service.js +237 -194
- package/backend/dist/src/llm-orchestration/llm-turn-processor.service.js.map +1 -1
- package/backend/dist/src/llm-orchestration/turn-execution-plan.d.ts +18 -0
- package/backend/dist/src/llm-orchestration/turn-execution-plan.js +53 -0
- package/backend/dist/src/llm-orchestration/turn-execution-plan.js.map +1 -0
- package/backend/dist/src/llm-provider/ollama-llm.provider.d.ts +1 -0
- package/backend/dist/src/llm-provider/ollama-llm.provider.js +21 -5
- package/backend/dist/src/llm-provider/ollama-llm.provider.js.map +1 -1
- package/backend/dist/src/llm-provider/openrouter-llm.provider.d.ts +3 -0
- package/backend/dist/src/llm-provider/openrouter-llm.provider.js +8 -0
- package/backend/dist/src/llm-provider/openrouter-llm.provider.js.map +1 -1
- package/backend/dist/src/llm-responses/llm-responses.module.js +0 -4
- package/backend/dist/src/llm-responses/llm-responses.module.js.map +1 -1
- package/backend/dist/src/llm-responses/llm-responses.service.d.ts +12 -4
- package/backend/dist/src/llm-responses/llm-responses.service.js +4 -45
- package/backend/dist/src/llm-responses/llm-responses.service.js.map +1 -1
- package/backend/dist/src/main.js +4 -0
- package/backend/dist/src/main.js.map +1 -1
- package/backend/dist/src/mcp/marketplace/dto/initiate-connect.dto.d.ts +3 -1
- package/backend/dist/src/mcp/marketplace/dto/initiate-connect.dto.js +19 -0
- package/backend/dist/src/mcp/marketplace/dto/initiate-connect.dto.js.map +1 -1
- package/backend/dist/src/mcp/marketplace/marketplace.controller.js +7 -0
- package/backend/dist/src/mcp/marketplace/marketplace.controller.js.map +1 -1
- package/backend/dist/src/mcp/marketplace/marketplace.service.d.ts +9 -0
- package/backend/dist/src/mcp/marketplace/marketplace.service.js +68 -13
- package/backend/dist/src/mcp/marketplace/marketplace.service.js.map +1 -1
- package/backend/dist/src/mcp/marketplace/oauth-provider.d.ts +3 -0
- package/backend/dist/src/mcp/marketplace/oauth-provider.js.map +1 -1
- package/backend/dist/src/mcp/mcp-result.d.ts +12 -0
- package/backend/dist/src/mcp/mcp-result.js +125 -0
- package/backend/dist/src/mcp/mcp-result.js.map +1 -0
- package/backend/dist/src/mcp/mcp.service.d.ts +33 -1
- package/backend/dist/src/mcp/mcp.service.js +364 -79
- package/backend/dist/src/mcp/mcp.service.js.map +1 -1
- package/backend/dist/src/metadata-store/schemas/metadata-schemas.d.ts +3 -1
- package/backend/dist/src/metadata-store/schemas/metadata-schemas.js +11 -1
- package/backend/dist/src/metadata-store/schemas/metadata-schemas.js.map +1 -1
- package/backend/dist/src/seeding/data/shared/project-guidance-section.d.ts +1 -0
- package/backend/dist/src/seeding/data/shared/project-guidance-section.js +22 -0
- package/backend/dist/src/seeding/data/shared/project-guidance-section.js.map +1 -0
- package/backend/dist/src/seeding/data/system-prompts/default_native_tool_agent.d.ts +1 -1
- package/backend/dist/src/seeding/data/system-prompts/default_native_tool_agent.js +10 -38
- package/backend/dist/src/seeding/data/system-prompts/default_native_tool_agent.js.map +1 -1
- package/backend/dist/src/seeding/data/system-prompts/explore-codebase-agent.d.ts +1 -1
- package/backend/dist/src/seeding/data/system-prompts/explore-codebase-agent.js +3 -1
- package/backend/dist/src/seeding/data/system-prompts/explore-codebase-agent.js.map +1 -1
- package/backend/dist/src/seeding/data/system-prompts/general-purpose-agent.d.ts +1 -1
- package/backend/dist/src/seeding/data/system-prompts/general-purpose-agent.js +3 -1
- package/backend/dist/src/seeding/data/system-prompts/general-purpose-agent.js.map +1 -1
- package/backend/dist/src/session-cancellation/session-cancellation.module.d.ts +2 -0
- package/backend/dist/src/{message-bus/message-bus.module.js → session-cancellation/session-cancellation.module.js} +10 -11
- package/backend/dist/src/session-cancellation/session-cancellation.module.js.map +1 -0
- package/backend/dist/src/session-cancellation/session-cancellation.service.d.ts +13 -0
- package/backend/dist/src/session-cancellation/session-cancellation.service.js +75 -0
- package/backend/dist/src/session-cancellation/session-cancellation.service.js.map +1 -0
- package/backend/dist/src/session-inputs/session-inputs.service.js +3 -1
- package/backend/dist/src/session-inputs/session-inputs.service.js.map +1 -1
- package/backend/dist/src/sessions/sessions.module.js +0 -2
- package/backend/dist/src/sessions/sessions.module.js.map +1 -1
- package/backend/dist/src/sessions/sessions.service.d.ts +1 -3
- package/backend/dist/src/sessions/sessions.service.js +1 -5
- package/backend/dist/src/sessions/sessions.service.js.map +1 -1
- package/backend/dist/src/tool-hooks/hook-runtime.d.ts +1 -1
- package/backend/dist/src/tool-hooks/hook-runtime.js +17 -16
- package/backend/dist/src/tool-hooks/hook-runtime.js.map +1 -1
- package/backend/dist/src/utils/spawn-with-kill.d.ts +2 -0
- package/backend/dist/src/utils/spawn-with-kill.js +18 -3
- package/backend/dist/src/utils/spawn-with-kill.js.map +1 -1
- package/backend/dist/tsconfig.build.tsbuildinfo +1 -1
- package/daemon/dist/index.js +1 -17
- package/package.json +2 -8
- package/platform-cli.js +0 -316
- package/tabtape/extension/dist/build-info.json +3 -3
- package/tabtape/extension/dist/manifest.json +1 -1
- package/tabtape/ui/dist/build-info.json +3 -3
- package/backend/dist/src/llm-responses/dto/submit-llm-response.dto.d.ts +0 -9
- package/backend/dist/src/llm-responses/dto/submit-llm-response.dto.js +0 -80
- package/backend/dist/src/llm-responses/dto/submit-llm-response.dto.js.map +0 -1
- package/backend/dist/src/llm-responses/llm-responses.controller.d.ts +0 -8
- package/backend/dist/src/llm-responses/llm-responses.controller.js +0 -51
- package/backend/dist/src/llm-responses/llm-responses.controller.js.map +0 -1
- package/backend/dist/src/mcp-server/mcp-internal.controller.d.ts +0 -12
- package/backend/dist/src/mcp-server/mcp-internal.controller.js +0 -50
- package/backend/dist/src/mcp-server/mcp-internal.controller.js.map +0 -1
- package/backend/dist/src/mcp-server/mcp-server.bootstrap.d.ts +0 -2
- package/backend/dist/src/mcp-server/mcp-server.bootstrap.js +0 -166
- package/backend/dist/src/mcp-server/mcp-server.bootstrap.js.map +0 -1
- package/backend/dist/src/mcp-server/mcp-server.constants.d.ts +0 -8
- package/backend/dist/src/mcp-server/mcp-server.constants.js +0 -12
- package/backend/dist/src/mcp-server/mcp-server.constants.js.map +0 -1
- package/backend/dist/src/mcp-server/mcp-server.controller.d.ts +0 -19
- package/backend/dist/src/mcp-server/mcp-server.controller.js +0 -72
- package/backend/dist/src/mcp-server/mcp-server.controller.js.map +0 -1
- package/backend/dist/src/mcp-server/mcp-server.module.d.ts +0 -2
- package/backend/dist/src/mcp-server/mcp-server.module.js +0 -29
- package/backend/dist/src/mcp-server/mcp-server.module.js.map +0 -1
- package/backend/dist/src/mcp-server/mcp-server.process.service.d.ts +0 -23
- package/backend/dist/src/mcp-server/mcp-server.process.service.js +0 -130
- package/backend/dist/src/mcp-server/mcp-server.process.service.js.map +0 -1
- package/backend/dist/src/mcp-server/mcp-server.service.d.ts +0 -34
- package/backend/dist/src/mcp-server/mcp-server.service.js +0 -260
- package/backend/dist/src/mcp-server/mcp-server.service.js.map +0 -1
- package/backend/dist/src/message-bus/dto/submit-message.dto.d.ts +0 -4
- package/backend/dist/src/message-bus/dto/submit-message.dto.js +0 -22
- package/backend/dist/src/message-bus/dto/submit-message.dto.js.map +0 -1
- package/backend/dist/src/message-bus/message-bus.controller.d.ts +0 -13
- package/backend/dist/src/message-bus/message-bus.controller.js +0 -50
- package/backend/dist/src/message-bus/message-bus.controller.js.map +0 -1
- package/backend/dist/src/message-bus/message-bus.module.d.ts +0 -2
- package/backend/dist/src/message-bus/message-bus.module.js.map +0 -1
- package/backend/dist/src/message-bus/message-bus.service.d.ts +0 -7
- package/backend/dist/src/message-bus/message-bus.service.js +0 -32
- package/backend/dist/src/message-bus/message-bus.service.js.map +0 -1
- package/backend/dist/src/visual-editor/visual-editor.controller.d.ts +0 -14
- package/backend/dist/src/visual-editor/visual-editor.controller.js +0 -101
- package/backend/dist/src/visual-editor/visual-editor.controller.js.map +0 -1
- package/backend/dist/src/visual-editor/visual-editor.dto.d.ts +0 -5
- package/backend/dist/src/visual-editor/visual-editor.dto.js +0 -32
- package/backend/dist/src/visual-editor/visual-editor.dto.js.map +0 -1
- package/backend/dist/src/visual-editor/visual-editor.module.d.ts +0 -2
- package/backend/dist/src/visual-editor/visual-editor.module.js +0 -24
- package/backend/dist/src/visual-editor/visual-editor.module.js.map +0 -1
- package/daemon/dist/mcp-gateway.js +0 -401
- package/daemon/dist/mcp-gateway.spec.js +0 -295
- package/visual-editor-proxy/client/dist/main.js +0 -89
- package/visual-editor-proxy/client/tsconfig.json +0 -14
- package/visual-editor-proxy/dist/client/src/inspector.d.ts +0 -9
- package/visual-editor-proxy/dist/client/src/inspector.js +0 -96
- package/visual-editor-proxy/dist/client/src/inspector.js.map +0 -1
- package/visual-editor-proxy/dist/client/src/main.d.ts +0 -6
- package/visual-editor-proxy/dist/client/src/main.js +0 -108
- package/visual-editor-proxy/dist/client/src/main.js.map +0 -1
- package/visual-editor-proxy/dist/client/src/ui.d.ts +0 -6
- package/visual-editor-proxy/dist/client/src/ui.js +0 -153
- package/visual-editor-proxy/dist/client/src/ui.js.map +0 -1
- package/visual-editor-proxy/dist/src/main.d.ts +0 -1
- package/visual-editor-proxy/dist/src/main.js +0 -61
- package/visual-editor-proxy/dist/src/main.js.map +0 -1
- package/visual-editor-proxy/dist/tsconfig.tsbuildinfo +0 -1
- package/visual-editor-proxy/package.json +0 -21
- package/visual-editor-proxy/tsconfig.json +0 -21
|
@@ -0,0 +1,259 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
14
|
+
var AutoCompactService_1;
|
|
15
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
exports.AutoCompactService = exports.AUTO_COMPACT_SYSTEM_PROMPT = void 0;
|
|
17
|
+
exports.estimatePostTokens = estimatePostTokens;
|
|
18
|
+
exports.renderTranscript = renderTranscript;
|
|
19
|
+
const common_1 = require("@nestjs/common");
|
|
20
|
+
const typeorm_1 = require("@nestjs/typeorm");
|
|
21
|
+
const typeorm_2 = require("typeorm");
|
|
22
|
+
const session_input_entity_1 = require("../core-entities/session-input.entity");
|
|
23
|
+
const llm_provider_interface_1 = require("../llm-provider/llm-provider.interface");
|
|
24
|
+
const inference_registry_1 = require("../llm-provider/inference-registry");
|
|
25
|
+
const application_state_service_1 = require("../application-state/application-state.service");
|
|
26
|
+
const agent_runtime_event_emitter_1 = require("../agent-runtime/agent-runtime-event-emitter");
|
|
27
|
+
const events_gateway_1 = require("../events/events.gateway");
|
|
28
|
+
const get_messages_handler_1 = require("../llm-orchestration/action-handlers/get-messages.handler");
|
|
29
|
+
const TRANSCRIPT_LIMITS = {
|
|
30
|
+
user: 6_000,
|
|
31
|
+
model: 4_000,
|
|
32
|
+
tool: 1_500,
|
|
33
|
+
toolArguments: 800,
|
|
34
|
+
};
|
|
35
|
+
const CHARS_PER_TOKEN = 4;
|
|
36
|
+
const TRANSCRIPT_WINDOW_SHARE = 0.5;
|
|
37
|
+
exports.AUTO_COMPACT_SYSTEM_PROMPT = `You compact the conversation of a coding agent. You get the older part of the conversation as a transcript; it will be replaced by your summary, and the agent continues the work from that summary and the recent messages, which it keeps.
|
|
38
|
+
|
|
39
|
+
Write a self-contained summary that lets the agent continue without the transcript. Use these sections where they apply:
|
|
40
|
+
|
|
41
|
+
### Goal
|
|
42
|
+
What the user is trying to accomplish.
|
|
43
|
+
### User Constraints
|
|
44
|
+
Requirements, preferences and prohibitions from the user, with exact wording where it matters. Never drop one because it is old.
|
|
45
|
+
### Confirmed Facts
|
|
46
|
+
What the user said, what files showed and what tools returned. No assumptions.
|
|
47
|
+
### Decisions
|
|
48
|
+
What was decided or implemented; mark proposals that were not accepted as proposals.
|
|
49
|
+
### Rejected Approaches
|
|
50
|
+
What was tried or proposed and rejected, and why.
|
|
51
|
+
### Current Code or File State
|
|
52
|
+
File paths, functions, commands and settings that changed, and how. Only changes that were applied.
|
|
53
|
+
### Validation Performed
|
|
54
|
+
Tests, builds and checks that actually ran, with their results. Say when something was not run.
|
|
55
|
+
### Unresolved Work
|
|
56
|
+
Open tasks, bugs and questions, and the next step.
|
|
57
|
+
|
|
58
|
+
Rules:
|
|
59
|
+
- Keep exact file paths, identifiers, error messages and commands that the work still needs.
|
|
60
|
+
- Keep the order of events when decisions changed over time.
|
|
61
|
+
- Do not copy secrets (API keys, tokens, passwords); write [credential omitted].
|
|
62
|
+
- Do not claim work was done or tests passed unless the transcript shows it.
|
|
63
|
+
- End with: "Re-read the files before editing them: they may have changed since this summary."
|
|
64
|
+
- Reply with the summary only: no preamble, no tool calls.`;
|
|
65
|
+
let AutoCompactService = AutoCompactService_1 = class AutoCompactService {
|
|
66
|
+
constructor(sessionInputsRepository, dataSource, llmProvider, inferenceRegistry, applicationStateService, agentRuntimeEmitter, eventsGateway) {
|
|
67
|
+
this.sessionInputsRepository = sessionInputsRepository;
|
|
68
|
+
this.dataSource = dataSource;
|
|
69
|
+
this.llmProvider = llmProvider;
|
|
70
|
+
this.inferenceRegistry = inferenceRegistry;
|
|
71
|
+
this.applicationStateService = applicationStateService;
|
|
72
|
+
this.agentRuntimeEmitter = agentRuntimeEmitter;
|
|
73
|
+
this.eventsGateway = eventsGateway;
|
|
74
|
+
this.logger = new common_1.Logger(AutoCompactService_1.name);
|
|
75
|
+
}
|
|
76
|
+
async compactIfNeeded(session, signal) {
|
|
77
|
+
try {
|
|
78
|
+
const fill = session.last_input_token_count ?? 0;
|
|
79
|
+
if (!session.model_id || fill <= 0)
|
|
80
|
+
return null;
|
|
81
|
+
if (!(await this.applicationStateService.getAutoCompactEnabled())) {
|
|
82
|
+
return null;
|
|
83
|
+
}
|
|
84
|
+
const window = await this.contextWindowOf(session.model_id);
|
|
85
|
+
if (!window)
|
|
86
|
+
return null;
|
|
87
|
+
const threshold = await this.applicationStateService.getAutoCompactThreshold();
|
|
88
|
+
if (fill < (window * threshold) / 100)
|
|
89
|
+
return null;
|
|
90
|
+
this.logger.log(`Session ${session.id}: context at ${fill}/${window} tokens (threshold ${threshold}%), compacting.`);
|
|
91
|
+
return await this.compact(session.id, session.model_id, window, fill, {
|
|
92
|
+
signal,
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
catch (error) {
|
|
96
|
+
if (signal?.aborted)
|
|
97
|
+
return null;
|
|
98
|
+
this.logger.warn(`Auto-compact of session ${session.id} failed; the run goes on with the full history: ${error.message}`);
|
|
99
|
+
return null;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
async contextWindowOf(modelId) {
|
|
103
|
+
try {
|
|
104
|
+
const models = await this.inferenceRegistry.forModel(modelId).getModels();
|
|
105
|
+
const model = models.find((m) => m.id === modelId || m.aliases?.includes(modelId));
|
|
106
|
+
return model?.context_window ?? null;
|
|
107
|
+
}
|
|
108
|
+
catch {
|
|
109
|
+
return null;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
async compact(sessionId, modelId, contextWindow, preTokens, options = {}) {
|
|
113
|
+
const inputs = await this.sessionInputsRepository.find({
|
|
114
|
+
where: { session_id: sessionId, is_discarded: false },
|
|
115
|
+
relations: ['aiActions', 'aiActions.executionLogs'],
|
|
116
|
+
order: { sequence_number: 'ASC' },
|
|
117
|
+
});
|
|
118
|
+
let keepFrom = -1;
|
|
119
|
+
for (let i = inputs.length - 1; i >= 0; i--) {
|
|
120
|
+
if (inputs[i].role === 'user' && !inputs[i].is_summary) {
|
|
121
|
+
keepFrom = i;
|
|
122
|
+
break;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
const older = keepFrom > 0 ? inputs.slice(0, keepFrom) : [];
|
|
126
|
+
if (older.length < 2) {
|
|
127
|
+
this.logger.log(`Session ${sessionId}: nothing before the current turn to compact.`);
|
|
128
|
+
return null;
|
|
129
|
+
}
|
|
130
|
+
const transcript = renderTranscript((0, get_messages_handler_1.buildHistory)(older).history, Math.floor(contextWindow * TRANSCRIPT_WINDOW_SHARE * CHARS_PER_TOKEN));
|
|
131
|
+
const abortController = new AbortController();
|
|
132
|
+
if (options.signal?.aborted)
|
|
133
|
+
abortController.abort();
|
|
134
|
+
options.signal?.addEventListener('abort', () => abortController.abort(), {
|
|
135
|
+
once: true,
|
|
136
|
+
});
|
|
137
|
+
const response = await this.llmProvider.generateContent({
|
|
138
|
+
prompt: `Summarize this conversation transcript.\n\n<transcript>\n${transcript}\n</transcript>`,
|
|
139
|
+
systemInstruction: exports.AUTO_COMPACT_SYSTEM_PROMPT,
|
|
140
|
+
history: [],
|
|
141
|
+
modelId,
|
|
142
|
+
abortController,
|
|
143
|
+
});
|
|
144
|
+
const summary = (response.text || '').trim();
|
|
145
|
+
if (!summary) {
|
|
146
|
+
this.logger.warn(`Session ${sessionId}: the model wrote an empty summary; not compacting.`);
|
|
147
|
+
return null;
|
|
148
|
+
}
|
|
149
|
+
if (options.signal?.aborted)
|
|
150
|
+
return null;
|
|
151
|
+
const olderChars = charSize((0, get_messages_handler_1.buildHistory)(older).history);
|
|
152
|
+
if (summary.length >= olderChars) {
|
|
153
|
+
this.logger.log(`Session ${sessionId}: the summary (${summary.length} characters) is not shorter than the messages it would replace (${olderChars}); not compacting.`);
|
|
154
|
+
return null;
|
|
155
|
+
}
|
|
156
|
+
const summaryInputId = await this.saveSummary(sessionId, older, summary);
|
|
157
|
+
const before = charSize((0, get_messages_handler_1.buildHistory)(inputs).history);
|
|
158
|
+
const remaining = await this.sessionInputsRepository.find({
|
|
159
|
+
where: { session_id: sessionId, is_discarded: false },
|
|
160
|
+
relations: ['aiActions', 'aiActions.executionLogs'],
|
|
161
|
+
order: { sequence_number: 'ASC' },
|
|
162
|
+
});
|
|
163
|
+
const after = charSize((0, get_messages_handler_1.buildHistory)(remaining).history);
|
|
164
|
+
const postTokens = estimatePostTokens(preTokens, before, after);
|
|
165
|
+
this.logger.log(`Session ${sessionId}: compacted ${older.length} message(s) into a summary (~${preTokens} → ~${postTokens} tokens).`);
|
|
166
|
+
this.agentRuntimeEmitter.emitCompactBoundary(sessionId, {
|
|
167
|
+
trigger: 'auto',
|
|
168
|
+
pre_tokens: preTokens,
|
|
169
|
+
post_tokens: postTokens,
|
|
170
|
+
messages: older.length,
|
|
171
|
+
});
|
|
172
|
+
this.eventsGateway.sendToAll('refresh-ui', { sessionId });
|
|
173
|
+
return {
|
|
174
|
+
replaced: older.length,
|
|
175
|
+
summaryInputId,
|
|
176
|
+
preTokens,
|
|
177
|
+
postTokens,
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
async saveSummary(sessionId, replaced, summary) {
|
|
181
|
+
return this.dataSource.transaction(async (manager) => {
|
|
182
|
+
const saved = await manager.save(manager.create(session_input_entity_1.SessionInput, {
|
|
183
|
+
session_id: sessionId,
|
|
184
|
+
role: 'user',
|
|
185
|
+
user_prompt: summary,
|
|
186
|
+
generated_context_string: `<conversation_summary>\n${summary}\n</conversation_summary>`,
|
|
187
|
+
execution_strategy: replaced[0].execution_strategy || null,
|
|
188
|
+
is_summary: true,
|
|
189
|
+
is_discarded: false,
|
|
190
|
+
sequence_number: replaced[0].sequence_number ?? 0,
|
|
191
|
+
}));
|
|
192
|
+
for (const input of replaced) {
|
|
193
|
+
await manager.update(session_input_entity_1.SessionInput, { id: input.id }, { is_discarded: true, replaced_by_summary_input_id: saved.id });
|
|
194
|
+
}
|
|
195
|
+
return saved.id;
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
};
|
|
199
|
+
exports.AutoCompactService = AutoCompactService;
|
|
200
|
+
exports.AutoCompactService = AutoCompactService = AutoCompactService_1 = __decorate([
|
|
201
|
+
(0, common_1.Injectable)(),
|
|
202
|
+
__param(0, (0, typeorm_1.InjectRepository)(session_input_entity_1.SessionInput)),
|
|
203
|
+
__param(2, (0, common_1.Inject)(llm_provider_interface_1.LLM_PROVIDER)),
|
|
204
|
+
__metadata("design:paramtypes", [typeorm_2.Repository,
|
|
205
|
+
typeorm_2.DataSource, Object, inference_registry_1.InferenceRegistry,
|
|
206
|
+
application_state_service_1.ApplicationStateService,
|
|
207
|
+
agent_runtime_event_emitter_1.AgentRuntimeEventEmitter,
|
|
208
|
+
events_gateway_1.EventsGateway])
|
|
209
|
+
], AutoCompactService);
|
|
210
|
+
function cut(text, limit) {
|
|
211
|
+
if (text.length <= limit)
|
|
212
|
+
return text;
|
|
213
|
+
return `${text.slice(0, limit)} [... ${text.length - limit} more characters]`;
|
|
214
|
+
}
|
|
215
|
+
function estimatePostTokens(preTokens, beforeChars, afterChars) {
|
|
216
|
+
if (beforeChars <= 0)
|
|
217
|
+
return preTokens;
|
|
218
|
+
const scaled = Math.round((preTokens * afterChars) / beforeChars);
|
|
219
|
+
const removed = Math.round((beforeChars - afterChars) / CHARS_PER_TOKEN);
|
|
220
|
+
return Math.min(preTokens, Math.max(scaled, preTokens - removed));
|
|
221
|
+
}
|
|
222
|
+
function charSize(history) {
|
|
223
|
+
return history.reduce((sum, turn) => sum + (0, get_messages_handler_1.computeTurnCharSize)(turn), 0);
|
|
224
|
+
}
|
|
225
|
+
function renderTranscript(history, maxChars) {
|
|
226
|
+
const blocks = [];
|
|
227
|
+
for (const turn of history) {
|
|
228
|
+
const text = turn.parts
|
|
229
|
+
.map((p) => p.text)
|
|
230
|
+
.join('\n')
|
|
231
|
+
.trim();
|
|
232
|
+
if (turn.role === 'user') {
|
|
233
|
+
blocks.push(`USER:\n${cut(text, TRANSCRIPT_LIMITS.user)}`);
|
|
234
|
+
}
|
|
235
|
+
else if (turn.role === 'model') {
|
|
236
|
+
const calls = (turn.tool_calls ?? []).map((call) => {
|
|
237
|
+
const args = typeof call.function.arguments === 'string'
|
|
238
|
+
? call.function.arguments
|
|
239
|
+
: JSON.stringify(call.function.arguments);
|
|
240
|
+
return `TOOL CALL ${call.function.name}(${cut(args, TRANSCRIPT_LIMITS.toolArguments)})`;
|
|
241
|
+
});
|
|
242
|
+
const body = [cut(text, TRANSCRIPT_LIMITS.model), ...calls]
|
|
243
|
+
.filter(Boolean)
|
|
244
|
+
.join('\n');
|
|
245
|
+
if (body)
|
|
246
|
+
blocks.push(`ASSISTANT:\n${body}`);
|
|
247
|
+
}
|
|
248
|
+
else {
|
|
249
|
+
blocks.push(`TOOL RESULT (${turn.tool_name ?? 'tool'}):\n${cut(text, TRANSCRIPT_LIMITS.tool)}`);
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
const transcript = blocks.join('\n\n');
|
|
253
|
+
if (transcript.length <= maxChars)
|
|
254
|
+
return transcript;
|
|
255
|
+
const head = Math.floor(maxChars * 0.2);
|
|
256
|
+
const tail = maxChars - head;
|
|
257
|
+
return `${transcript.slice(0, head)}\n\n[... ${transcript.length - maxChars} characters of the middle of the conversation omitted ...]\n\n${transcript.slice(transcript.length - tail)}`;
|
|
258
|
+
}
|
|
259
|
+
//# sourceMappingURL=auto-compact.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auto-compact.service.js","sourceRoot":"","sources":["../../../src/interactive-chat/auto-compact.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ exports.InteractiveChatModule = void 0;
|
|
|
10
10
|
const common_1 = require("@nestjs/common");
|
|
11
11
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
12
12
|
const chat_service_1 = require("./chat.service");
|
|
13
|
+
const auto_compact_service_1 = require("./auto-compact.service");
|
|
13
14
|
const streaming_controller_1 = require("./streaming.controller");
|
|
14
15
|
const session_input_entity_1 = require("../core-entities/session-input.entity");
|
|
15
16
|
const ai_action_entity_1 = require("../core-entities/ai-action.entity");
|
|
@@ -17,7 +18,6 @@ const llm_provider_module_1 = require("../llm-provider/llm-provider.module");
|
|
|
17
18
|
const events_module_1 = require("../events/events.module");
|
|
18
19
|
const llm_responses_module_1 = require("../llm-responses/llm-responses.module");
|
|
19
20
|
const application_state_module_1 = require("../application-state/application-state.module");
|
|
20
|
-
const message_bus_module_1 = require("../message-bus/message-bus.module");
|
|
21
21
|
const sessions_module_1 = require("../sessions/sessions.module");
|
|
22
22
|
const system_prompts_module_1 = require("../system-prompts/system-prompts.module");
|
|
23
23
|
const llm_orchestration_module_1 = require("../llm-orchestration/llm-orchestration.module");
|
|
@@ -35,18 +35,15 @@ exports.InteractiveChatModule = InteractiveChatModule = __decorate([
|
|
|
35
35
|
events_module_1.EventsModule,
|
|
36
36
|
(0, common_1.forwardRef)(() => llm_responses_module_1.LlmResponsesModule),
|
|
37
37
|
application_state_module_1.ApplicationStateModule,
|
|
38
|
-
message_bus_module_1.MessageBusModule,
|
|
39
38
|
(0, common_1.forwardRef)(() => sessions_module_1.SessionsModule),
|
|
40
39
|
(0, common_1.forwardRef)(() => system_prompts_module_1.SystemPromptsModule),
|
|
41
40
|
(0, common_1.forwardRef)(() => llm_orchestration_module_1.LlmOrchestrationModule),
|
|
42
41
|
sub_agents_module_1.SubAgentsModule,
|
|
43
|
-
(0, common_1.forwardRef)(() => llm_orchestration_module_1.LlmOrchestrationModule),
|
|
44
|
-
sub_agents_module_1.SubAgentsModule,
|
|
45
42
|
agent_runtime_module_1.AgentRuntimeModule,
|
|
46
43
|
session_event_logs_module_1.SessionEventLogsModule,
|
|
47
44
|
],
|
|
48
45
|
controllers: [streaming_controller_1.StreamingController],
|
|
49
|
-
providers: [chat_service_1.ChatService],
|
|
46
|
+
providers: [chat_service_1.ChatService, auto_compact_service_1.AutoCompactService],
|
|
50
47
|
exports: [chat_service_1.ChatService, InteractiveChatModule],
|
|
51
48
|
})
|
|
52
49
|
], InteractiveChatModule);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat.module.js","sourceRoot":"","sources":["../../../src/interactive-chat/chat.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,6CAAgD;AAChD,iDAA6C;AAC7C,iEAA6D;AAC7D,gFAAqE;AACrE,wEAA6D;AAC7D,6EAAwE;AACxE,2DAAuD;AACvD,gFAA2E;AAC3E,4FAAuF;AACvF,
|
|
1
|
+
{"version":3,"file":"chat.module.js","sourceRoot":"","sources":["../../../src/interactive-chat/chat.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,6CAAgD;AAChD,iDAA6C;AAC7C,iEAA4D;AAC5D,iEAA6D;AAC7D,gFAAqE;AACrE,wEAA6D;AAC7D,6EAAwE;AACxE,2DAAuD;AACvD,gFAA2E;AAC3E,4FAAuF;AACvF,iEAA6D;AAC7D,mFAA8E;AAC9E,4FAAuF;AACvF,uEAAkE;AAClE,gFAA2E;AAC3E,+FAAyF;AAoBlF,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;CAAG,CAAA;AAAxB,sDAAqB;gCAArB,qBAAqB;IAlBjC,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC,CAAC,mCAAY,EAAE,2BAAQ,CAAC,CAAC;YAClD,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,uCAAiB,CAAC;YACnC,4BAAY;YACZ,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,yCAAkB,CAAC;YACpC,iDAAsB;YACtB,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,gCAAc,CAAC;YAChC,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,2CAAmB,CAAC;YACrC,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,iDAAsB,CAAC;YACxC,mCAAe;YACf,yCAAkB;YAClB,kDAAsB;SACvB;QACD,WAAW,EAAE,CAAC,0CAAmB,CAAC;QAClC,SAAS,EAAE,CAAC,0BAAW,EAAE,yCAAkB,CAAC;QAC5C,OAAO,EAAE,CAAC,0BAAW,EAAE,qBAAqB,CAAC;KAC9C,CAAC;GACW,qBAAqB,CAAG"}
|
|
@@ -3,7 +3,6 @@ import { LlmProvider, LlmContent } from '../llm-provider/llm-provider.interface'
|
|
|
3
3
|
import { EventsGateway } from '../events/events.gateway';
|
|
4
4
|
import { LlmResponsesService } from '../llm-responses/llm-responses.service';
|
|
5
5
|
import { ApplicationStateService } from '../application-state/application-state.service';
|
|
6
|
-
import { MessageBusService } from '../message-bus/message-bus.service';
|
|
7
6
|
import { SessionsService } from '../sessions/sessions.service';
|
|
8
7
|
import { SystemPromptsService } from '../system-prompts/system-prompts.service';
|
|
9
8
|
import { ToolSchemaService } from '../llm-orchestration/tool-schema.service';
|
|
@@ -16,6 +15,8 @@ import { AgentRuntimeEventEmitter } from '../agent-runtime/agent-runtime-event-e
|
|
|
16
15
|
import { SessionEventLogsService } from '../session-event-logs/session-event-logs.service';
|
|
17
16
|
import { ContextTemplate } from '../core-entities';
|
|
18
17
|
import { MetadataStore } from '../metadata-store/metadata-store.service';
|
|
18
|
+
import { SessionCancellationService } from '../session-cancellation/session-cancellation.service';
|
|
19
|
+
import { AutoCompactService } from './auto-compact.service';
|
|
19
20
|
export interface AgentRunResult {
|
|
20
21
|
content: string;
|
|
21
22
|
success: boolean;
|
|
@@ -27,7 +28,6 @@ export declare class ChatService {
|
|
|
27
28
|
private readonly eventsGateway;
|
|
28
29
|
private readonly llmResponsesService;
|
|
29
30
|
private readonly applicationStateService;
|
|
30
|
-
private readonly messageBusService;
|
|
31
31
|
private readonly sessionsService;
|
|
32
32
|
private readonly systemPromptsService;
|
|
33
33
|
private readonly toolSchemaService;
|
|
@@ -39,11 +39,13 @@ export declare class ChatService {
|
|
|
39
39
|
private readonly contextTemplatesStore;
|
|
40
40
|
private readonly aiActionsRepository;
|
|
41
41
|
private readonly agentRuntimeEmitter;
|
|
42
|
+
private readonly cancellation;
|
|
43
|
+
private readonly autoCompact;
|
|
42
44
|
private readonly sessionEventLogs?;
|
|
43
45
|
private readonly logger;
|
|
44
46
|
private activeRequests;
|
|
45
47
|
private syncPromises;
|
|
46
|
-
constructor(llmProvider: LlmProvider, eventsGateway: EventsGateway, llmResponsesService: LlmResponsesService, applicationStateService: ApplicationStateService,
|
|
48
|
+
constructor(llmProvider: LlmProvider, eventsGateway: EventsGateway, llmResponsesService: LlmResponsesService, applicationStateService: ApplicationStateService, sessionsService: SessionsService, systemPromptsService: SystemPromptsService, toolSchemaService: ToolSchemaService, historyCompressionService: HistoryCompressionService, subAgentsService: SubAgentsService, moduleRef: ModuleRef, handlerRegistry: Map<string, any>, sessionInputsRepository: Repository<SessionInput>, contextTemplatesStore: MetadataStore<ContextTemplate>, aiActionsRepository: Repository<AIAction>, agentRuntimeEmitter: AgentRuntimeEventEmitter, cancellation: SessionCancellationService, autoCompact: AutoCompactService, sessionEventLogs?: SessionEventLogsService);
|
|
47
49
|
resolveSyncPromise(sessionId: string, result: AgentRunResult): void;
|
|
48
50
|
rejectSyncPromise(sessionId: string, error: Error): void;
|
|
49
51
|
getSyncPromise(sessionId: string): {
|
|
@@ -59,7 +61,13 @@ export declare class ChatService {
|
|
|
59
61
|
}): Promise<AgentRunResult>;
|
|
60
62
|
private callWithRetry;
|
|
61
63
|
getHistory(sessionId: string): Promise<LlmContent[]>;
|
|
62
|
-
sendMessage(sessionId: string, message: string, existingInputId?: string
|
|
64
|
+
sendMessage(sessionId: string, message: string, existingInputId?: string, options?: {
|
|
65
|
+
followUp?: boolean;
|
|
66
|
+
}): Promise<void>;
|
|
67
|
+
private compactIfNeeded;
|
|
63
68
|
cancelRequest(sessionId: string): boolean;
|
|
69
|
+
private clearActiveRequest;
|
|
70
|
+
private readonly settledCancels;
|
|
71
|
+
private settleCancelledRun;
|
|
64
72
|
abortStreaming(sessionId: string): boolean;
|
|
65
73
|
}
|
|
@@ -20,7 +20,6 @@ const llm_provider_interface_1 = require("../llm-provider/llm-provider.interface
|
|
|
20
20
|
const events_gateway_1 = require("../events/events.gateway");
|
|
21
21
|
const llm_responses_service_1 = require("../llm-responses/llm-responses.service");
|
|
22
22
|
const application_state_service_1 = require("../application-state/application-state.service");
|
|
23
|
-
const message_bus_service_1 = require("../message-bus/message-bus.service");
|
|
24
23
|
const sessions_service_1 = require("../sessions/sessions.service");
|
|
25
24
|
const system_prompts_service_1 = require("../system-prompts/system-prompts.service");
|
|
26
25
|
const tool_schema_service_1 = require("../llm-orchestration/tool-schema.service");
|
|
@@ -36,6 +35,8 @@ const agent_runtime_event_emitter_1 = require("../agent-runtime/agent-runtime-ev
|
|
|
36
35
|
const session_event_logs_service_1 = require("../session-event-logs/session-event-logs.service");
|
|
37
36
|
const metadata_store_service_1 = require("../metadata-store/metadata-store.service");
|
|
38
37
|
const metadata_store_tokens_1 = require("../metadata-store/metadata-store.tokens");
|
|
38
|
+
const session_cancellation_service_1 = require("../session-cancellation/session-cancellation.service");
|
|
39
|
+
const auto_compact_service_1 = require("./auto-compact.service");
|
|
39
40
|
function delay(ms) {
|
|
40
41
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
41
42
|
}
|
|
@@ -75,12 +76,11 @@ function isRetryableError(error, _retryAttempt) {
|
|
|
75
76
|
return false;
|
|
76
77
|
}
|
|
77
78
|
let ChatService = ChatService_1 = class ChatService {
|
|
78
|
-
constructor(llmProvider, eventsGateway, llmResponsesService, applicationStateService,
|
|
79
|
+
constructor(llmProvider, eventsGateway, llmResponsesService, applicationStateService, sessionsService, systemPromptsService, toolSchemaService, historyCompressionService, subAgentsService, moduleRef, handlerRegistry, sessionInputsRepository, contextTemplatesStore, aiActionsRepository, agentRuntimeEmitter, cancellation, autoCompact, sessionEventLogs) {
|
|
79
80
|
this.llmProvider = llmProvider;
|
|
80
81
|
this.eventsGateway = eventsGateway;
|
|
81
82
|
this.llmResponsesService = llmResponsesService;
|
|
82
83
|
this.applicationStateService = applicationStateService;
|
|
83
|
-
this.messageBusService = messageBusService;
|
|
84
84
|
this.sessionsService = sessionsService;
|
|
85
85
|
this.systemPromptsService = systemPromptsService;
|
|
86
86
|
this.toolSchemaService = toolSchemaService;
|
|
@@ -92,10 +92,13 @@ let ChatService = ChatService_1 = class ChatService {
|
|
|
92
92
|
this.contextTemplatesStore = contextTemplatesStore;
|
|
93
93
|
this.aiActionsRepository = aiActionsRepository;
|
|
94
94
|
this.agentRuntimeEmitter = agentRuntimeEmitter;
|
|
95
|
+
this.cancellation = cancellation;
|
|
96
|
+
this.autoCompact = autoCompact;
|
|
95
97
|
this.sessionEventLogs = sessionEventLogs;
|
|
96
98
|
this.logger = new common_1.Logger(ChatService_1.name);
|
|
97
99
|
this.activeRequests = new Map();
|
|
98
100
|
this.syncPromises = new Map();
|
|
101
|
+
this.settledCancels = new WeakSet();
|
|
99
102
|
}
|
|
100
103
|
resolveSyncPromise(sessionId, result) {
|
|
101
104
|
const promise = this.syncPromises.get(sessionId);
|
|
@@ -221,12 +224,14 @@ let ChatService = ChatService_1 = class ChatService {
|
|
|
221
224
|
const syncPromise = new Promise((resolve, reject) => {
|
|
222
225
|
this.syncPromises.set(childSessionId, { resolve, reject });
|
|
223
226
|
});
|
|
227
|
+
this.cancellation.linkChild(childSessionId, parentSessionId);
|
|
224
228
|
this.sendMessage(childSessionId, generatedContextString || initialUserMessage).catch((err) => {
|
|
225
229
|
this.logger.error(`runAgentSync: sendMessage failed for session ${childSessionId}: ${err.message}`, err.stack);
|
|
226
230
|
this.rejectSyncPromise(childSessionId, err);
|
|
227
231
|
});
|
|
228
232
|
return syncPromise.finally(() => {
|
|
229
233
|
this.agentRuntimeEmitter.unregisterSubagent(childSessionId);
|
|
234
|
+
this.cancellation.unlinkChild(childSessionId);
|
|
230
235
|
});
|
|
231
236
|
}
|
|
232
237
|
async callWithRetry(request, sessionId, pendingInputId) {
|
|
@@ -323,8 +328,19 @@ let ChatService = ChatService_1 = class ChatService {
|
|
|
323
328
|
}
|
|
324
329
|
for (const toolCall of content.tool_calls) {
|
|
325
330
|
const action = actionsByToolCallId.get(toolCall.id);
|
|
326
|
-
if (!action)
|
|
331
|
+
if (!action) {
|
|
332
|
+
history.push({
|
|
333
|
+
role: 'tool',
|
|
334
|
+
tool_call_id: toolCall.id,
|
|
335
|
+
tool_name: toolCall.function?.name || 'unknown',
|
|
336
|
+
parts: [
|
|
337
|
+
{
|
|
338
|
+
text: 'Error: this tool call was not executed (the run stopped before it ran).',
|
|
339
|
+
},
|
|
340
|
+
],
|
|
341
|
+
});
|
|
327
342
|
continue;
|
|
343
|
+
}
|
|
328
344
|
const output = action.executionLogs?.[0]?.output || '';
|
|
329
345
|
const errorMessage = action.executionLogs?.[0]?.error_message || '';
|
|
330
346
|
let toolResult;
|
|
@@ -372,10 +388,20 @@ let ChatService = ChatService_1 = class ChatService {
|
|
|
372
388
|
}
|
|
373
389
|
return this.historyCompressionService.compress(normalizedHistory);
|
|
374
390
|
}
|
|
375
|
-
async sendMessage(sessionId, message, existingInputId) {
|
|
391
|
+
async sendMessage(sessionId, message, existingInputId, options) {
|
|
392
|
+
const signal = options?.followUp
|
|
393
|
+
? this.cancellation.current(sessionId)
|
|
394
|
+
: this.cancellation.begin(sessionId);
|
|
395
|
+
if (signal.aborted) {
|
|
396
|
+
this.logger.log(`Run of session ${sessionId} was cancelled; not starting the follow-up round.`);
|
|
397
|
+
await this.settleCancelledRun(sessionId, signal);
|
|
398
|
+
return;
|
|
399
|
+
}
|
|
376
400
|
this.agentRuntimeEmitter.markTurnInFlight(sessionId);
|
|
401
|
+
let activePendingInputId;
|
|
377
402
|
let history;
|
|
378
403
|
try {
|
|
404
|
+
await this.compactIfNeeded(sessionId, signal);
|
|
379
405
|
history = await this.getHistory(sessionId);
|
|
380
406
|
}
|
|
381
407
|
catch (error) {
|
|
@@ -470,10 +496,19 @@ let ChatService = ChatService_1 = class ChatService {
|
|
|
470
496
|
});
|
|
471
497
|
await this.sessionsService.update(session.id, { is_running: true });
|
|
472
498
|
const abortController = new AbortController();
|
|
499
|
+
if (signal.aborted) {
|
|
500
|
+
abortController.abort();
|
|
501
|
+
}
|
|
502
|
+
else {
|
|
503
|
+
signal.addEventListener('abort', () => abortController.abort(), {
|
|
504
|
+
once: true,
|
|
505
|
+
});
|
|
506
|
+
}
|
|
473
507
|
this.activeRequests.set(sessionId, {
|
|
474
508
|
abortController,
|
|
475
509
|
pendingInputId: pendingInput.id,
|
|
476
510
|
});
|
|
511
|
+
activePendingInputId = pendingInput.id;
|
|
477
512
|
const wantsDeltas = isStreaming || this.agentRuntimeEmitter.hasSubscribers(session.id);
|
|
478
513
|
const onToken = wantsDeltas
|
|
479
514
|
? (chunk, isFirst, thoughtChunk) => {
|
|
@@ -526,6 +561,7 @@ let ChatService = ChatService_1 = class ChatService {
|
|
|
526
561
|
onToken,
|
|
527
562
|
abortController,
|
|
528
563
|
}, sessionId, pendingInput.id);
|
|
564
|
+
this.clearActiveRequest(sessionId, pendingInput.id);
|
|
529
565
|
await this.llmResponsesService.finalizePendingAiInput(pendingInput.id, {
|
|
530
566
|
raw_llm_response: llm_response.text,
|
|
531
567
|
execution_strategy: executionStrategy,
|
|
@@ -534,19 +570,25 @@ let ChatService = ChatService_1 = class ChatService {
|
|
|
534
570
|
cached_token_count: llm_response.usage?.cachedTokens,
|
|
535
571
|
tool_calls: llm_response.tool_calls,
|
|
536
572
|
thoughts: llm_response.thoughts,
|
|
537
|
-
});
|
|
573
|
+
}, { signal });
|
|
538
574
|
this.eventsGateway.sendToAll('llm-generation-ended', {
|
|
539
575
|
sessionInputId: pendingInput.id,
|
|
540
576
|
sessionId: session.id,
|
|
541
577
|
});
|
|
578
|
+
if (signal.aborted) {
|
|
579
|
+
await this.settleCancelledRun(sessionId, signal);
|
|
580
|
+
return;
|
|
581
|
+
}
|
|
542
582
|
await this.sessionsService.update(session.id, { is_running: false });
|
|
543
583
|
this.eventsGateway.sendToAll('refresh-ui', { sessionId });
|
|
544
|
-
this.activeRequests.delete(sessionId);
|
|
545
584
|
}
|
|
546
585
|
catch (error) {
|
|
547
|
-
const pendingInputId =
|
|
548
|
-
|
|
549
|
-
|
|
586
|
+
const pendingInputId = activePendingInputId || 'unknown';
|
|
587
|
+
if (activePendingInputId) {
|
|
588
|
+
this.clearActiveRequest(sessionId, activePendingInputId);
|
|
589
|
+
}
|
|
590
|
+
const isAbortError = signal.aborted ||
|
|
591
|
+
error.name === 'AbortError' ||
|
|
550
592
|
error.code === 'ABORT_ERR' ||
|
|
551
593
|
error.message === 'This operation was aborted';
|
|
552
594
|
if (isAbortError) {
|
|
@@ -555,12 +597,7 @@ let ChatService = ChatService_1 = class ChatService {
|
|
|
555
597
|
sessionInputId: pendingInputId,
|
|
556
598
|
sessionId: sessionId,
|
|
557
599
|
});
|
|
558
|
-
this.
|
|
559
|
-
subtype: 'aborted',
|
|
560
|
-
is_error: true,
|
|
561
|
-
result: '',
|
|
562
|
-
});
|
|
563
|
-
await this.sessionsService.update(sessionId, { is_running: false });
|
|
600
|
+
await this.settleCancelledRun(sessionId, signal);
|
|
564
601
|
return;
|
|
565
602
|
}
|
|
566
603
|
await this.llmResponsesService.updatePendingAiInputWithError(pendingInputId, error.message);
|
|
@@ -582,28 +619,53 @@ let ChatService = ChatService_1 = class ChatService {
|
|
|
582
619
|
throw error;
|
|
583
620
|
}
|
|
584
621
|
}
|
|
622
|
+
async compactIfNeeded(sessionId, signal) {
|
|
623
|
+
try {
|
|
624
|
+
const session = await this.sessionsService.findOne(sessionId);
|
|
625
|
+
await this.autoCompact.compactIfNeeded(session, signal);
|
|
626
|
+
}
|
|
627
|
+
catch (error) {
|
|
628
|
+
this.logger.warn(`Auto-compact check for session ${sessionId} failed: ${error.message}`);
|
|
629
|
+
}
|
|
630
|
+
}
|
|
585
631
|
cancelRequest(sessionId) {
|
|
586
|
-
const
|
|
587
|
-
|
|
632
|
+
const wasRunning = this.activeRequests.has(sessionId) ||
|
|
633
|
+
this.agentRuntimeEmitter.getState(sessionId).turnInFlight;
|
|
634
|
+
this.cancellation.cancel(sessionId);
|
|
635
|
+
if (!wasRunning) {
|
|
588
636
|
this.logger.warn(`No active request to cancel for session ${sessionId}`);
|
|
589
637
|
return false;
|
|
590
638
|
}
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
639
|
+
this.logger.log(`Run cancelled for session ${sessionId}`);
|
|
640
|
+
this.eventsGateway.sendToAll('refresh-ui', { sessionId });
|
|
641
|
+
return true;
|
|
642
|
+
}
|
|
643
|
+
clearActiveRequest(sessionId, pendingInputId) {
|
|
644
|
+
if (this.activeRequests.get(sessionId)?.pendingInputId === pendingInputId) {
|
|
594
645
|
this.activeRequests.delete(sessionId);
|
|
595
|
-
this.eventsGateway.sendToAll('refresh-ui', { sessionId });
|
|
596
|
-
this.sessionsService
|
|
597
|
-
.update(sessionId, { is_running: false })
|
|
598
|
-
.catch((err) => {
|
|
599
|
-
this.logger.warn(`Failed to reset is_running for session ${sessionId}: ${err.message}`);
|
|
600
|
-
});
|
|
601
|
-
return true;
|
|
602
646
|
}
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
647
|
+
}
|
|
648
|
+
async settleCancelledRun(sessionId, signal) {
|
|
649
|
+
if (this.settledCancels.has(signal))
|
|
650
|
+
return;
|
|
651
|
+
this.settledCancels.add(signal);
|
|
652
|
+
if (!this.cancellation.isCurrent(sessionId, signal)) {
|
|
653
|
+
this.logger.log(`Cancelled run of session ${sessionId} ended after a new turn started.`);
|
|
654
|
+
return;
|
|
655
|
+
}
|
|
656
|
+
this.agentRuntimeEmitter.emitResult(sessionId, {
|
|
657
|
+
subtype: 'aborted',
|
|
658
|
+
is_error: true,
|
|
659
|
+
result: '',
|
|
660
|
+
});
|
|
661
|
+
try {
|
|
662
|
+
await this.sessionsService.update(sessionId, { is_running: false });
|
|
663
|
+
}
|
|
664
|
+
catch (err) {
|
|
665
|
+
this.logger.warn(`Failed to reset is_running for session ${sessionId}: ${err.message}`);
|
|
606
666
|
}
|
|
667
|
+
this.rejectSyncPromise(sessionId, new Error('Cancelled by the user.'));
|
|
668
|
+
this.eventsGateway.sendToAll('refresh-ui', { sessionId });
|
|
607
669
|
}
|
|
608
670
|
abortStreaming(sessionId) {
|
|
609
671
|
return this.cancelRequest(sessionId);
|
|
@@ -614,17 +676,16 @@ exports.ChatService = ChatService = ChatService_1 = __decorate([
|
|
|
614
676
|
(0, common_1.Injectable)(),
|
|
615
677
|
__param(0, (0, common_1.Inject)(llm_provider_interface_1.LLM_PROVIDER)),
|
|
616
678
|
__param(2, (0, common_1.Inject)((0, common_1.forwardRef)(() => llm_responses_service_1.LlmResponsesService))),
|
|
617
|
-
__param(
|
|
618
|
-
__param(
|
|
619
|
-
__param(
|
|
620
|
-
__param(
|
|
621
|
-
__param(
|
|
622
|
-
__param(
|
|
623
|
-
__param(
|
|
679
|
+
__param(4, (0, common_1.Inject)((0, common_1.forwardRef)(() => sessions_service_1.SessionsService))),
|
|
680
|
+
__param(5, (0, common_1.Inject)((0, common_1.forwardRef)(() => system_prompts_service_1.SystemPromptsService))),
|
|
681
|
+
__param(10, (0, common_1.Inject)('ACTION_HANDLER_REGISTRY')),
|
|
682
|
+
__param(11, (0, typeorm_1.InjectRepository)(session_input_entity_1.SessionInput)),
|
|
683
|
+
__param(12, (0, common_1.Inject)((0, metadata_store_tokens_1.getMetadataStoreToken)('context-templates'))),
|
|
684
|
+
__param(13, (0, typeorm_1.InjectRepository)(ai_action_entity_1.AIAction)),
|
|
685
|
+
__param(17, (0, common_1.Optional)()),
|
|
624
686
|
__metadata("design:paramtypes", [Object, events_gateway_1.EventsGateway,
|
|
625
687
|
llm_responses_service_1.LlmResponsesService,
|
|
626
688
|
application_state_service_1.ApplicationStateService,
|
|
627
|
-
message_bus_service_1.MessageBusService,
|
|
628
689
|
sessions_service_1.SessionsService,
|
|
629
690
|
system_prompts_service_1.SystemPromptsService,
|
|
630
691
|
tool_schema_service_1.ToolSchemaService,
|
|
@@ -636,6 +697,8 @@ exports.ChatService = ChatService = ChatService_1 = __decorate([
|
|
|
636
697
|
metadata_store_service_1.MetadataStore,
|
|
637
698
|
typeorm_2.Repository,
|
|
638
699
|
agent_runtime_event_emitter_1.AgentRuntimeEventEmitter,
|
|
700
|
+
session_cancellation_service_1.SessionCancellationService,
|
|
701
|
+
auto_compact_service_1.AutoCompactService,
|
|
639
702
|
session_event_logs_service_1.SessionEventLogsService])
|
|
640
703
|
], ChatService);
|
|
641
704
|
//# sourceMappingURL=chat.service.js.map
|