repoburg 1.3.319 → 1.3.320
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 +156 -100
- package/agent-pane/backend/dist/server.js +156 -100
- 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
|
@@ -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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat.service.js","sourceRoot":"","sources":["../../../src/interactive-chat/chat.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"chat.service.js","sourceRoot":"","sources":["../../../src/interactive-chat/chat.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -119,7 +119,7 @@ print('\\n'.join(files))
|
|
|
119
119
|
this.logger.log(`Python availability check: ${this.pythonAvailable ? 'available' : 'not available'}`);
|
|
120
120
|
return this.pythonAvailable;
|
|
121
121
|
}
|
|
122
|
-
async execute(args,
|
|
122
|
+
async execute(args, context) {
|
|
123
123
|
const validatedArgs = (0, class_transformer_1.plainToClass)(execute_code_args_dto_1.ExecuteCodeArgsDto, args);
|
|
124
124
|
const errors = await (0, class_validator_1.validate)(validatedArgs);
|
|
125
125
|
if (errors.length > 0) {
|
|
@@ -162,8 +162,14 @@ print('\\n'.join(files))
|
|
|
162
162
|
const result = await (0, spawn_with_kill_1.execWithProcessGroupKill)(config.command(tempFilePath), {
|
|
163
163
|
cwd: this.projectRoot,
|
|
164
164
|
timeout: 30000,
|
|
165
|
+
signal: context?.abortSignal,
|
|
165
166
|
});
|
|
166
|
-
if (result.
|
|
167
|
+
if (result.aborted) {
|
|
168
|
+
executionStatus = 'FAILURE';
|
|
169
|
+
unifiedOutput = `EXECUTION CANCELLED: the user stopped the run.\n\nSTDOUT:\n${result.stdout || 'N/A'}\n\nSTDERR:\n${result.stderr || 'N/A'}`;
|
|
170
|
+
errorDetails = 'Code execution cancelled by the user.';
|
|
171
|
+
}
|
|
172
|
+
else if (result.killed) {
|
|
167
173
|
executionStatus = 'FAILURE';
|
|
168
174
|
unifiedOutput = `EXECUTION TIMED OUT after 30000ms\n\nSTDOUT:\n${result.stdout || 'N/A'}\n\nSTDERR:\n${result.stderr || 'N/A'}`;
|
|
169
175
|
errorDetails = 'Code execution timed out after 30000ms.';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-code.handler.js","sourceRoot":"","sources":["../../../../src/llm-orchestration/action-handlers/execute-code.handler.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAoD;AAMpD,uEAAiE;AACjE,yDAAiD;AACjD,qDAA2C;AAE3C,uCAAmD;AACnD,iEAAuE;AACvE,6BAA6B;AAC7B,kCAAkC;AAClC,iCAAiC;AAQjC,MAAM,gBAAgB,GAAmC;IACvD,UAAU,EAAE;QACV,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,YAAY,GAAG;KACvD;IACD,MAAM,EAAE;QACN,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,YAAY,GAAG;KACvD;CACF,CAAC;AAGK,IAAM,kBAAkB,0BAAxB,MAAM,kBAAkB;IAAxB;QACI,aAAQ,GAAG,cAAc,CAAC;QAClB,WAAM,GAAG,IAAI,eAAM,CAAC,oBAAkB,CAAC,IAAI,CAAC,CAAC;QAC7C,gBAAW,GAC1B,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACpC,YAAO,GAAW,IAAI,CAAC,IAAI,CAC1C,IAAI,CAAC,WAAW,EAChB,WAAW,EACX,MAAM,CACP,CAAC;
|
|
1
|
+
{"version":3,"file":"execute-code.handler.js","sourceRoot":"","sources":["../../../../src/llm-orchestration/action-handlers/execute-code.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
import { ActionHandler } from './action-handler.interface';
|
|
2
2
|
import { ActionExecutionResult, PlanExecutionContext, ToolMetadata } from '../llm-orchestration.interfaces';
|
|
3
3
|
import { McpService } from '../../mcp/mcp.service';
|
|
4
|
+
export type McpOutputTokenLimit = (systemPromptId: string | null) => Promise<number>;
|
|
4
5
|
export declare class McpToolActionHandler implements ActionHandler {
|
|
5
6
|
private readonly serverName;
|
|
6
7
|
private readonly toolNameRaw;
|
|
7
8
|
private readonly mcpService;
|
|
8
9
|
private readonly toolDescription;
|
|
10
|
+
private readonly outputTokenLimit?;
|
|
9
11
|
readonly toolName: string;
|
|
10
12
|
private readonly logger;
|
|
11
|
-
constructor(serverName: string, toolNameRaw: string, mcpService: McpService, toolDescription: string);
|
|
13
|
+
constructor(serverName: string, toolNameRaw: string, mcpService: McpService, toolDescription: string, outputTokenLimit?: McpOutputTokenLimit);
|
|
12
14
|
getMetadata(): ToolMetadata;
|
|
13
15
|
getDefinition(): string;
|
|
14
|
-
execute(args: Record<string, any>,
|
|
16
|
+
execute(args: Record<string, any>, context: PlanExecutionContext): Promise<ActionExecutionResult>;
|
|
17
|
+
private limitOutput;
|
|
15
18
|
}
|
|
@@ -2,12 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.McpToolActionHandler = void 0;
|
|
4
4
|
const common_1 = require("@nestjs/common");
|
|
5
|
+
const gpt_tokenizer_1 = require("gpt-tokenizer");
|
|
5
6
|
class McpToolActionHandler {
|
|
6
|
-
constructor(serverName, toolNameRaw, mcpService, toolDescription) {
|
|
7
|
+
constructor(serverName, toolNameRaw, mcpService, toolDescription, outputTokenLimit) {
|
|
7
8
|
this.serverName = serverName;
|
|
8
9
|
this.toolNameRaw = toolNameRaw;
|
|
9
10
|
this.mcpService = mcpService;
|
|
10
11
|
this.toolDescription = toolDescription;
|
|
12
|
+
this.outputTokenLimit = outputTokenLimit;
|
|
11
13
|
this.logger = new common_1.Logger(McpToolActionHandler.name);
|
|
12
14
|
this.toolName = `${serverName}__${toolNameRaw}`;
|
|
13
15
|
}
|
|
@@ -25,21 +27,35 @@ ${this.toolDescription}
|
|
|
25
27
|
|
|
26
28
|
Executed via MCP server "${this.serverName}", tool "${this.toolNameRaw}".`;
|
|
27
29
|
}
|
|
28
|
-
async execute(args,
|
|
30
|
+
async execute(args, context) {
|
|
31
|
+
const persisted = (plain) => ({
|
|
32
|
+
server_name: this.serverName,
|
|
33
|
+
tool_name: this.toolNameRaw,
|
|
34
|
+
arguments: JSON.stringify(args),
|
|
35
|
+
plain,
|
|
36
|
+
});
|
|
29
37
|
try {
|
|
30
|
-
const
|
|
31
|
-
const
|
|
38
|
+
const outcome = await this.mcpService.callTool(this.serverName, this.toolNameRaw, args, { signal: context?.abortSignal });
|
|
39
|
+
const { text, notice } = await this.limitOutput(outcome.text, context?.system_prompt_id ?? null);
|
|
40
|
+
if (outcome.isError) {
|
|
41
|
+
return {
|
|
42
|
+
status: 'FAILURE',
|
|
43
|
+
summary: `MCP tool "${this.serverName}.${this.toolNameRaw}" returned an error.`,
|
|
44
|
+
error_message: text,
|
|
45
|
+
persisted_args: persisted(`Error: ${text}`),
|
|
46
|
+
execution_log: {
|
|
47
|
+
output: '',
|
|
48
|
+
error_message: text,
|
|
49
|
+
},
|
|
50
|
+
};
|
|
51
|
+
}
|
|
32
52
|
return {
|
|
33
53
|
status: 'SUCCESS',
|
|
34
54
|
summary: `MCP tool "${this.serverName}.${this.toolNameRaw}" executed.`,
|
|
35
|
-
persisted_args:
|
|
36
|
-
server_name: this.serverName,
|
|
37
|
-
tool_name: this.toolNameRaw,
|
|
38
|
-
arguments: JSON.stringify(args),
|
|
39
|
-
plain: unifiedOutput,
|
|
40
|
-
},
|
|
55
|
+
persisted_args: persisted(text),
|
|
41
56
|
execution_log: {
|
|
42
|
-
output:
|
|
57
|
+
output: text,
|
|
58
|
+
...(notice ? { error_message: notice } : {}),
|
|
43
59
|
},
|
|
44
60
|
};
|
|
45
61
|
}
|
|
@@ -48,12 +64,7 @@ Executed via MCP server "${this.serverName}", tool "${this.toolNameRaw}".`;
|
|
|
48
64
|
status: 'FAILURE',
|
|
49
65
|
summary: `MCP tool "${this.serverName}.${this.toolNameRaw}" failed.`,
|
|
50
66
|
error_message: error.message,
|
|
51
|
-
persisted_args: {
|
|
52
|
-
server_name: this.serverName,
|
|
53
|
-
tool_name: this.toolNameRaw,
|
|
54
|
-
arguments: JSON.stringify(args),
|
|
55
|
-
plain: `Error: ${error.message}`,
|
|
56
|
-
},
|
|
67
|
+
persisted_args: persisted(`Error: ${error.message}`),
|
|
57
68
|
execution_log: {
|
|
58
69
|
output: '',
|
|
59
70
|
error_message: error.message,
|
|
@@ -61,6 +72,28 @@ Executed via MCP server "${this.serverName}", tool "${this.toolNameRaw}".`;
|
|
|
61
72
|
};
|
|
62
73
|
}
|
|
63
74
|
}
|
|
75
|
+
async limitOutput(text, systemPromptId) {
|
|
76
|
+
if (!this.outputTokenLimit)
|
|
77
|
+
return { text };
|
|
78
|
+
let limit;
|
|
79
|
+
try {
|
|
80
|
+
limit = await this.outputTokenLimit(systemPromptId);
|
|
81
|
+
}
|
|
82
|
+
catch {
|
|
83
|
+
return { text };
|
|
84
|
+
}
|
|
85
|
+
if (!limit || limit <= 0)
|
|
86
|
+
return { text };
|
|
87
|
+
const tokenCount = (0, gpt_tokenizer_1.countTokens)(text);
|
|
88
|
+
if (tokenCount <= limit)
|
|
89
|
+
return { text };
|
|
90
|
+
const keep = Math.floor(text.length * (limit / tokenCount));
|
|
91
|
+
this.logger.warn(`MCP output of ${this.toolName} truncated: ${tokenCount} tokens exceeds limit of ${limit}`);
|
|
92
|
+
return {
|
|
93
|
+
text: `${text.slice(0, keep)}\n\n[OUTPUT TRUNCATED: ${tokenCount} tokens exceeds limit of ${limit}. Ask the tool for less (filters, paging) if you need the rest.]`,
|
|
94
|
+
notice: `Output truncated due to size limit (${tokenCount} > ${limit} tokens).`,
|
|
95
|
+
};
|
|
96
|
+
}
|
|
64
97
|
}
|
|
65
98
|
exports.McpToolActionHandler = McpToolActionHandler;
|
|
66
99
|
//# sourceMappingURL=mcp-tool-action.handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-tool-action.handler.js","sourceRoot":"","sources":["../../../../src/llm-orchestration/action-handlers/mcp-tool-action.handler.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;
|
|
1
|
+
{"version":3,"file":"mcp-tool-action.handler.js","sourceRoot":"","sources":["../../../../src/llm-orchestration/action-handlers/mcp-tool-action.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -146,8 +146,16 @@ ${command_string}
|
|
|
146
146
|
const result = await (0, spawn_with_kill_1.execWithProcessGroupKill)(command, {
|
|
147
147
|
cwd: this.projectRoot,
|
|
148
148
|
timeout: commandTimeout,
|
|
149
|
+
signal: _context?.abortSignal,
|
|
149
150
|
});
|
|
150
|
-
if (result.
|
|
151
|
+
if (result.aborted) {
|
|
152
|
+
unifiedOutput = `COMMAND CANCELLED: the user stopped the run and the process was killed.\n\nSTDOUT:\n${result.stdout || 'N/A'}\n\nSTDERR:\n${result.stderr || 'N/A'}`;
|
|
153
|
+
summary = `Command "${command_string}" was cancelled.`;
|
|
154
|
+
status = 'FAILURE';
|
|
155
|
+
errorMessage = 'Command cancelled by the user.';
|
|
156
|
+
this.logger.warn(`Command cancelled: ${command_string}`);
|
|
157
|
+
}
|
|
158
|
+
else if (result.killed) {
|
|
151
159
|
unifiedOutput = `COMMAND TIMED OUT after ${commandTimeout}ms\n\nSTDOUT:\n${result.stdout || 'N/A'}\n\nSTDERR:\n${result.stderr || 'N/A'}`;
|
|
152
160
|
summary = `Command "${command_string}" timed out after ${commandTimeout}ms.`;
|
|
153
161
|
status = 'FAILURE';
|