@dexto/core 1.2.4 → 1.2.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +60 -0
- package/dist/agent/DextoAgent.cjs +579 -345
- package/dist/agent/DextoAgent.d.ts +131 -83
- package/dist/agent/DextoAgent.d.ts.map +1 -1
- package/dist/agent/DextoAgent.js +573 -336
- package/dist/agent/agentCard.cjs +4 -2
- package/dist/agent/agentCard.d.ts +0 -1
- package/dist/agent/agentCard.d.ts.map +1 -1
- package/dist/agent/agentCard.js +4 -2
- package/dist/agent/index.cjs +3 -7
- package/dist/agent/index.d.ts +3 -3
- package/dist/agent/index.d.ts.map +1 -1
- package/dist/agent/index.js +7 -6
- package/dist/agent/schemas.cjs +164 -64
- package/dist/agent/schemas.d.ts +2605 -517
- package/dist/agent/schemas.d.ts.map +1 -1
- package/dist/agent/schemas.js +167 -64
- package/dist/agent/state-manager.cjs +28 -23
- package/dist/agent/state-manager.d.ts +4 -1
- package/dist/agent/state-manager.d.ts.map +1 -1
- package/dist/agent/state-manager.js +28 -23
- package/dist/{preferences/constants.cjs → agent/types.cjs} +2 -14
- package/dist/agent/types.d.ts +54 -0
- package/dist/agent/types.d.ts.map +1 -0
- package/dist/agent/types.js +0 -0
- package/dist/approval/errors.cjs +89 -8
- package/dist/approval/errors.d.ts +5 -3
- package/dist/approval/errors.d.ts.map +1 -1
- package/dist/approval/errors.js +89 -8
- package/dist/approval/{providers/factory.d.ts → factory.d.ts} +2 -2
- package/dist/approval/factory.d.ts.map +1 -0
- package/dist/approval/{providers/factory.js → factory.js} +1 -1
- package/dist/approval/index.cjs +4 -6
- package/dist/approval/index.d.ts +3 -5
- package/dist/approval/index.d.ts.map +1 -1
- package/dist/approval/index.js +4 -5
- package/dist/approval/manager.cjs +140 -37
- package/dist/approval/manager.d.ts +56 -17
- package/dist/approval/manager.d.ts.map +1 -1
- package/dist/approval/manager.js +141 -38
- package/dist/approval/schemas.cjs +9 -1
- package/dist/approval/schemas.d.ts +120 -35
- package/dist/approval/schemas.d.ts.map +1 -1
- package/dist/approval/schemas.js +9 -2
- package/dist/approval/types.cjs +14 -2
- package/dist/approval/types.d.ts +64 -12
- package/dist/approval/types.d.ts.map +1 -1
- package/dist/approval/types.js +12 -1
- package/dist/context/compression/middle-removal.cjs +11 -11
- package/dist/context/compression/middle-removal.d.ts +3 -1
- package/dist/context/compression/middle-removal.d.ts.map +1 -1
- package/dist/context/compression/middle-removal.js +11 -11
- package/dist/context/compression/oldest-removal.cjs +18 -5
- package/dist/context/compression/oldest-removal.d.ts +3 -1
- package/dist/context/compression/oldest-removal.d.ts.map +1 -1
- package/dist/context/compression/oldest-removal.js +18 -5
- package/dist/context/manager.cjs +94 -67
- package/dist/context/manager.d.ts +13 -10
- package/dist/context/manager.d.ts.map +1 -1
- package/dist/context/manager.js +94 -67
- package/dist/context/utils.cjs +79 -65
- package/dist/context/utils.d.ts +15 -12
- package/dist/context/utils.d.ts.map +1 -1
- package/dist/context/utils.js +45 -31
- package/dist/errors/DextoRuntimeError.d.ts +5 -5
- package/dist/errors/DextoRuntimeError.d.ts.map +1 -1
- package/dist/errors/result-bridge.cjs +2 -3
- package/dist/errors/result-bridge.d.ts +5 -3
- package/dist/errors/result-bridge.d.ts.map +1 -1
- package/dist/errors/result-bridge.js +1 -2
- package/dist/errors/types.cjs +1 -2
- package/dist/errors/types.d.ts +5 -8
- package/dist/errors/types.d.ts.map +1 -1
- package/dist/errors/types.js +1 -2
- package/dist/events/index.cjs +125 -55
- package/dist/events/index.d.ts +204 -97
- package/dist/events/index.d.ts.map +1 -1
- package/dist/events/index.js +123 -55
- package/dist/filesystem/filesystem-service.cjs +40 -30
- package/dist/filesystem/filesystem-service.d.ts +9 -1
- package/dist/filesystem/filesystem-service.d.ts.map +1 -1
- package/dist/filesystem/filesystem-service.js +40 -30
- package/dist/filesystem/path-validator.cjs +4 -3
- package/dist/filesystem/path-validator.d.ts +3 -1
- package/dist/filesystem/path-validator.d.ts.map +1 -1
- package/dist/filesystem/path-validator.js +4 -3
- package/dist/filesystem/types.d.ts +3 -3
- package/dist/filesystem/types.d.ts.map +1 -1
- package/dist/index.browser.cjs +7 -0
- package/dist/index.browser.d.ts +2 -0
- package/dist/index.browser.d.ts.map +1 -1
- package/dist/index.browser.js +4 -0
- package/dist/index.cjs +0 -7
- package/dist/index.d.ts +12 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +0 -4
- package/dist/llm/formatters/anthropic.cjs +32 -21
- package/dist/llm/formatters/anthropic.d.ts +3 -0
- package/dist/llm/formatters/anthropic.d.ts.map +1 -1
- package/dist/llm/formatters/anthropic.js +32 -21
- package/dist/llm/formatters/factory.cjs +6 -7
- package/dist/llm/formatters/factory.d.ts +2 -1
- package/dist/llm/formatters/factory.d.ts.map +1 -1
- package/dist/llm/formatters/factory.js +4 -5
- package/dist/llm/formatters/openai.cjs +38 -9
- package/dist/llm/formatters/openai.d.ts +3 -0
- package/dist/llm/formatters/openai.d.ts.map +1 -1
- package/dist/llm/formatters/openai.js +38 -9
- package/dist/llm/formatters/vercel.cjs +49 -8
- package/dist/llm/formatters/vercel.d.ts +3 -0
- package/dist/llm/formatters/vercel.d.ts.map +1 -1
- package/dist/llm/formatters/vercel.js +49 -8
- package/dist/llm/registry.cjs +153 -17
- package/dist/llm/registry.d.ts +5 -2
- package/dist/llm/registry.d.ts.map +1 -1
- package/dist/llm/registry.js +143 -7
- package/dist/llm/resolver.cjs +4 -4
- package/dist/llm/resolver.d.ts +3 -2
- package/dist/llm/resolver.d.ts.map +1 -1
- package/dist/llm/resolver.js +4 -4
- package/dist/llm/schemas.cjs +6 -3
- package/dist/llm/schemas.d.ts +51 -17
- package/dist/llm/schemas.d.ts.map +1 -1
- package/dist/llm/schemas.js +5 -3
- package/dist/llm/services/anthropic.cjs +216 -183
- package/dist/llm/services/anthropic.d.ts +3 -1
- package/dist/llm/services/anthropic.d.ts.map +1 -1
- package/dist/llm/services/anthropic.js +217 -184
- package/dist/llm/services/factory.cjs +15 -9
- package/dist/llm/services/factory.d.ts +2 -1
- package/dist/llm/services/factory.d.ts.map +1 -1
- package/dist/llm/services/factory.js +15 -9
- package/dist/llm/services/openai.cjs +262 -225
- package/dist/llm/services/openai.d.ts +3 -1
- package/dist/llm/services/openai.d.ts.map +1 -1
- package/dist/llm/services/openai.js +263 -226
- package/dist/llm/services/test-utils.integration.cjs +58 -12
- package/dist/llm/services/test-utils.integration.d.ts.map +1 -1
- package/dist/llm/services/test-utils.integration.js +58 -12
- package/dist/llm/services/types.d.ts +9 -0
- package/dist/llm/services/types.d.ts.map +1 -1
- package/dist/llm/services/vercel.cjs +163 -111
- package/dist/llm/services/vercel.d.ts +3 -1
- package/dist/llm/services/vercel.d.ts.map +1 -1
- package/dist/llm/services/vercel.js +157 -105
- package/dist/llm/tokenizer/factory.cjs +2 -2
- package/dist/llm/tokenizer/factory.d.ts +3 -1
- package/dist/llm/tokenizer/factory.d.ts.map +1 -1
- package/dist/llm/tokenizer/factory.js +2 -2
- package/dist/llm/tokenizer/openai.cjs +16 -9
- package/dist/llm/tokenizer/openai.d.ts +4 -1
- package/dist/llm/tokenizer/openai.d.ts.map +1 -1
- package/dist/llm/tokenizer/openai.js +16 -9
- package/dist/llm/validation.cjs +8 -9
- package/dist/llm/validation.d.ts +3 -1
- package/dist/llm/validation.d.ts.map +1 -1
- package/dist/llm/validation.js +5 -6
- package/dist/logger/factory.cjs +54 -0
- package/dist/logger/factory.d.ts +36 -0
- package/dist/logger/factory.d.ts.map +1 -0
- package/dist/logger/factory.js +31 -0
- package/dist/logger/index.cjs +42 -3
- package/dist/logger/index.d.ts +17 -1
- package/dist/logger/index.d.ts.map +1 -1
- package/dist/logger/index.js +26 -1
- package/dist/logger/logger.cjs +30 -17
- package/dist/logger/logger.d.ts.map +1 -1
- package/dist/logger/logger.js +30 -17
- package/dist/logger/v2/dexto-logger.cjs +141 -0
- package/dist/logger/v2/dexto-logger.d.ts +54 -0
- package/dist/logger/v2/dexto-logger.d.ts.map +1 -0
- package/dist/logger/v2/dexto-logger.js +118 -0
- package/dist/{preferences → logger/v2}/error-codes.cjs +11 -10
- package/dist/logger/v2/error-codes.d.ts +13 -0
- package/dist/logger/v2/error-codes.d.ts.map +1 -0
- package/dist/logger/v2/error-codes.js +13 -0
- package/dist/logger/v2/errors.cjs +107 -0
- package/dist/logger/v2/errors.d.ts +32 -0
- package/dist/logger/v2/errors.d.ts.map +1 -0
- package/dist/logger/v2/errors.js +84 -0
- package/dist/logger/v2/schemas.cjs +57 -0
- package/dist/logger/v2/schemas.d.ts +147 -0
- package/dist/logger/v2/schemas.d.ts.map +1 -0
- package/dist/logger/v2/schemas.js +33 -0
- package/dist/logger/v2/transport-factory.cjs +53 -0
- package/dist/logger/v2/transport-factory.d.ts +21 -0
- package/dist/logger/v2/transport-factory.d.ts.map +1 -0
- package/dist/logger/v2/transport-factory.js +29 -0
- package/dist/logger/v2/transports/console-transport.cjs +79 -0
- package/dist/logger/v2/transports/console-transport.d.ts +23 -0
- package/dist/logger/v2/transports/console-transport.d.ts.map +1 -0
- package/dist/logger/v2/transports/console-transport.js +46 -0
- package/dist/logger/v2/transports/file-transport.cjs +161 -0
- package/dist/logger/v2/transports/file-transport.d.ts +46 -0
- package/dist/logger/v2/transports/file-transport.d.ts.map +1 -0
- package/dist/logger/v2/transports/file-transport.js +128 -0
- package/dist/logger/v2/types.cjs +49 -0
- package/dist/logger/v2/types.d.ts +123 -0
- package/dist/logger/v2/types.d.ts.map +1 -0
- package/dist/logger/v2/types.js +26 -0
- package/dist/mcp/manager.cjs +88 -78
- package/dist/mcp/manager.d.ts +3 -1
- package/dist/mcp/manager.d.ts.map +1 -1
- package/dist/mcp/manager.js +88 -78
- package/dist/mcp/mcp-client.cjs +109 -79
- package/dist/mcp/mcp-client.d.ts +3 -0
- package/dist/mcp/mcp-client.d.ts.map +1 -1
- package/dist/mcp/mcp-client.js +102 -72
- package/dist/memory/manager.cjs +9 -7
- package/dist/memory/manager.d.ts +3 -1
- package/dist/memory/manager.d.ts.map +1 -1
- package/dist/memory/manager.js +9 -7
- package/dist/memory/schemas.d.ts +6 -6
- package/dist/plugins/manager.cjs +21 -19
- package/dist/plugins/manager.d.ts +3 -1
- package/dist/plugins/manager.d.ts.map +1 -1
- package/dist/plugins/manager.js +21 -19
- package/dist/plugins/schemas.d.ts +9 -9
- package/dist/plugins/types.d.ts +2 -2
- package/dist/plugins/types.d.ts.map +1 -1
- package/dist/process/command-validator.cjs +30 -20
- package/dist/process/command-validator.d.ts +4 -1
- package/dist/process/command-validator.d.ts.map +1 -1
- package/dist/process/command-validator.js +30 -20
- package/dist/process/process-service.cjs +23 -21
- package/dist/process/process-service.d.ts +3 -1
- package/dist/process/process-service.d.ts.map +1 -1
- package/dist/process/process-service.js +23 -21
- package/dist/prompts/prompt-manager.cjs +25 -18
- package/dist/prompts/prompt-manager.d.ts +3 -1
- package/dist/prompts/prompt-manager.d.ts.map +1 -1
- package/dist/prompts/prompt-manager.js +25 -18
- package/dist/prompts/providers/custom-prompt-provider.cjs +11 -7
- package/dist/prompts/providers/custom-prompt-provider.d.ts +3 -1
- package/dist/prompts/providers/custom-prompt-provider.d.ts.map +1 -1
- package/dist/prompts/providers/custom-prompt-provider.js +11 -7
- package/dist/prompts/providers/file-prompt-provider.cjs +14 -12
- package/dist/prompts/providers/file-prompt-provider.d.ts +3 -1
- package/dist/prompts/providers/file-prompt-provider.d.ts.map +1 -1
- package/dist/prompts/providers/file-prompt-provider.js +14 -12
- package/dist/prompts/providers/mcp-prompt-provider.cjs +7 -6
- package/dist/prompts/providers/mcp-prompt-provider.d.ts +3 -1
- package/dist/prompts/providers/mcp-prompt-provider.d.ts.map +1 -1
- package/dist/prompts/providers/mcp-prompt-provider.js +7 -6
- package/dist/prompts/providers/starter-prompt-provider.cjs +7 -5
- package/dist/prompts/providers/starter-prompt-provider.d.ts +3 -1
- package/dist/prompts/providers/starter-prompt-provider.d.ts.map +1 -1
- package/dist/prompts/providers/starter-prompt-provider.js +7 -5
- package/dist/prompts/schemas.d.ts +3 -3
- package/dist/resources/handlers/blob-handler.cjs +15 -11
- package/dist/resources/handlers/blob-handler.d.ts +3 -1
- package/dist/resources/handlers/blob-handler.d.ts.map +1 -1
- package/dist/resources/handlers/blob-handler.js +15 -11
- package/dist/resources/handlers/factory.cjs +3 -3
- package/dist/resources/handlers/factory.d.ts +2 -1
- package/dist/resources/handlers/factory.d.ts.map +1 -1
- package/dist/resources/handlers/factory.js +3 -3
- package/dist/resources/handlers/filesystem-handler.cjs +10 -8
- package/dist/resources/handlers/filesystem-handler.d.ts +3 -1
- package/dist/resources/handlers/filesystem-handler.d.ts.map +1 -1
- package/dist/resources/handlers/filesystem-handler.js +10 -8
- package/dist/resources/internal-provider.cjs +28 -20
- package/dist/resources/internal-provider.d.ts +3 -1
- package/dist/resources/internal-provider.d.ts.map +1 -1
- package/dist/resources/internal-provider.js +28 -20
- package/dist/resources/manager.cjs +34 -25
- package/dist/resources/manager.d.ts +3 -1
- package/dist/resources/manager.d.ts.map +1 -1
- package/dist/resources/manager.js +34 -25
- package/dist/resources/schemas.d.ts +6 -6
- package/dist/search/search-service.cjs +8 -6
- package/dist/search/search-service.d.ts +3 -1
- package/dist/search/search-service.d.ts.map +1 -1
- package/dist/search/search-service.js +8 -6
- package/dist/session/chat-session.cjs +40 -27
- package/dist/session/chat-session.d.ts +10 -7
- package/dist/session/chat-session.d.ts.map +1 -1
- package/dist/session/chat-session.js +40 -27
- package/dist/session/history/database.cjs +18 -11
- package/dist/session/history/database.d.ts +3 -1
- package/dist/session/history/database.d.ts.map +1 -1
- package/dist/session/history/database.js +18 -11
- package/dist/session/history/factory.cjs +2 -2
- package/dist/session/history/factory.d.ts +5 -1
- package/dist/session/history/factory.d.ts.map +1 -1
- package/dist/session/history/factory.js +2 -2
- package/dist/session/session-manager.cjs +37 -53
- package/dist/session/session-manager.d.ts +3 -17
- package/dist/session/session-manager.d.ts.map +1 -1
- package/dist/session/session-manager.js +37 -53
- package/dist/session/title-generator.cjs +3 -2
- package/dist/session/title-generator.d.ts +2 -1
- package/dist/session/title-generator.d.ts.map +1 -1
- package/dist/session/title-generator.js +3 -2
- package/dist/storage/blob/factory.cjs +9 -18
- package/dist/storage/blob/factory.d.ts +5 -4
- package/dist/storage/blob/factory.d.ts.map +1 -1
- package/dist/storage/blob/factory.js +8 -17
- package/dist/storage/blob/local-blob-store.cjs +25 -32
- package/dist/storage/blob/local-blob-store.d.ts +3 -2
- package/dist/storage/blob/local-blob-store.d.ts.map +1 -1
- package/dist/storage/blob/local-blob-store.js +25 -32
- package/dist/storage/blob/memory-blob-store.cjs +326 -0
- package/dist/storage/blob/memory-blob-store.d.ts +66 -0
- package/dist/storage/blob/memory-blob-store.d.ts.map +1 -0
- package/dist/storage/blob/memory-blob-store.js +303 -0
- package/dist/storage/blob/schemas.cjs +3 -1
- package/dist/storage/blob/schemas.d.ts +6 -6
- package/dist/storage/blob/schemas.d.ts.map +1 -1
- package/dist/storage/blob/schemas.js +3 -1
- package/dist/storage/cache/factory.cjs +7 -8
- package/dist/storage/cache/factory.d.ts +4 -1
- package/dist/storage/cache/factory.d.ts.map +1 -1
- package/dist/storage/cache/factory.js +4 -5
- package/dist/storage/cache/redis-store.cjs +4 -1
- package/dist/storage/cache/redis-store.d.ts +3 -1
- package/dist/storage/cache/redis-store.d.ts.map +1 -1
- package/dist/storage/cache/redis-store.js +4 -1
- package/dist/storage/database/factory.cjs +13 -16
- package/dist/storage/database/factory.d.ts +5 -3
- package/dist/storage/database/factory.d.ts.map +1 -1
- package/dist/storage/database/factory.js +9 -12
- package/dist/storage/database/postgres-store.cjs +4 -1
- package/dist/storage/database/postgres-store.d.ts +3 -1
- package/dist/storage/database/postgres-store.d.ts.map +1 -1
- package/dist/storage/database/postgres-store.js +4 -1
- package/dist/storage/database/schemas.cjs +3 -4
- package/dist/storage/database/schemas.d.ts +8 -16
- package/dist/storage/database/schemas.d.ts.map +1 -1
- package/dist/storage/database/schemas.js +3 -4
- package/dist/storage/database/sqlite-store.cjs +17 -45
- package/dist/storage/database/sqlite-store.d.ts +3 -3
- package/dist/storage/database/sqlite-store.d.ts.map +1 -1
- package/dist/storage/database/sqlite-store.js +17 -45
- package/dist/storage/schemas.cjs +3 -1
- package/dist/storage/schemas.d.ts +16 -23
- package/dist/storage/schemas.d.ts.map +1 -1
- package/dist/storage/schemas.js +3 -1
- package/dist/storage/storage-manager.cjs +15 -15
- package/dist/storage/storage-manager.d.ts +6 -6
- package/dist/storage/storage-manager.d.ts.map +1 -1
- package/dist/storage/storage-manager.js +15 -15
- package/dist/systemPrompt/contributors.cjs +15 -15
- package/dist/systemPrompt/contributors.d.ts +5 -3
- package/dist/systemPrompt/contributors.d.ts.map +1 -1
- package/dist/systemPrompt/contributors.js +15 -15
- package/dist/systemPrompt/manager.cjs +11 -8
- package/dist/systemPrompt/manager.d.ts +4 -2
- package/dist/systemPrompt/manager.d.ts.map +1 -1
- package/dist/systemPrompt/manager.js +11 -8
- package/dist/systemPrompt/schemas.cjs +21 -1
- package/dist/systemPrompt/schemas.d.ts +53 -53
- package/dist/systemPrompt/schemas.d.ts.map +1 -1
- package/dist/systemPrompt/schemas.js +11 -1
- package/dist/telemetry/decorators.cjs +54 -15
- package/dist/telemetry/decorators.d.ts.map +1 -1
- package/dist/telemetry/decorators.js +54 -15
- package/dist/telemetry/utils.cjs +21 -14
- package/dist/telemetry/utils.d.ts +7 -3
- package/dist/telemetry/utils.d.ts.map +1 -1
- package/dist/telemetry/utils.js +21 -14
- package/dist/tools/confirmation/allowed-tools-provider/factory.cjs +2 -2
- package/dist/tools/confirmation/allowed-tools-provider/factory.d.ts +2 -1
- package/dist/tools/confirmation/allowed-tools-provider/factory.d.ts.map +1 -1
- package/dist/tools/confirmation/allowed-tools-provider/factory.js +2 -2
- package/dist/tools/confirmation/allowed-tools-provider/storage.cjs +7 -6
- package/dist/tools/confirmation/allowed-tools-provider/storage.d.ts +3 -1
- package/dist/tools/confirmation/allowed-tools-provider/storage.d.ts.map +1 -1
- package/dist/tools/confirmation/allowed-tools-provider/storage.js +7 -6
- package/dist/tools/errors.cjs +2 -1
- package/dist/tools/errors.d.ts.map +1 -1
- package/dist/tools/errors.js +2 -1
- package/dist/tools/internal-tools/constants.cjs +2 -1
- package/dist/tools/internal-tools/constants.d.ts +1 -1
- package/dist/tools/internal-tools/constants.d.ts.map +1 -1
- package/dist/tools/internal-tools/constants.js +2 -1
- package/dist/tools/internal-tools/implementations/bash-exec-tool.cjs +1 -1
- package/dist/tools/internal-tools/implementations/bash-exec-tool.js +1 -1
- package/dist/tools/internal-tools/implementations/delegate-to-url-tool.cjs +192 -0
- package/dist/tools/internal-tools/implementations/delegate-to-url-tool.d.ts +33 -0
- package/dist/tools/internal-tools/implementations/delegate-to-url-tool.d.ts.map +1 -0
- package/dist/tools/internal-tools/implementations/delegate-to-url-tool.js +169 -0
- package/dist/tools/internal-tools/provider.cjs +21 -17
- package/dist/tools/internal-tools/provider.d.ts +3 -1
- package/dist/tools/internal-tools/provider.d.ts.map +1 -1
- package/dist/tools/internal-tools/provider.js +21 -17
- package/dist/tools/internal-tools/registry.cjs +5 -0
- package/dist/tools/internal-tools/registry.d.ts.map +1 -1
- package/dist/tools/internal-tools/registry.js +5 -0
- package/dist/tools/schemas.cjs +16 -4
- package/dist/tools/schemas.d.ts +21 -9
- package/dist/tools/schemas.d.ts.map +1 -1
- package/dist/tools/schemas.js +15 -4
- package/dist/tools/tool-manager.cjs +64 -47
- package/dist/tools/tool-manager.d.ts +4 -2
- package/dist/tools/tool-manager.d.ts.map +1 -1
- package/dist/tools/tool-manager.js +61 -44
- package/dist/tools/types.d.ts +0 -4
- package/dist/tools/types.d.ts.map +1 -1
- package/dist/utils/env-file.cjs +118 -0
- package/dist/utils/env-file.d.ts +5 -0
- package/dist/utils/env-file.d.ts.map +1 -0
- package/dist/utils/env-file.js +85 -0
- package/dist/utils/error-conversion.cjs +23 -1
- package/dist/utils/error-conversion.d.ts +2 -1
- package/dist/utils/error-conversion.d.ts.map +1 -1
- package/dist/utils/error-conversion.js +23 -1
- package/dist/utils/execution-context.d.ts.map +1 -1
- package/dist/utils/fs-walk.d.ts.map +1 -1
- package/dist/utils/index.cjs +7 -9
- package/dist/utils/index.d.ts +3 -4
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +3 -4
- package/dist/utils/path.cjs +22 -57
- package/dist/utils/path.d.ts +8 -7
- package/dist/utils/path.d.ts.map +1 -1
- package/dist/utils/path.js +21 -54
- package/dist/utils/result.cjs +37 -14
- package/dist/utils/result.d.ts.map +1 -1
- package/dist/utils/result.js +37 -14
- package/dist/utils/schema.cjs +2 -3
- package/dist/utils/schema.d.ts +2 -1
- package/dist/utils/schema.d.ts.map +1 -1
- package/dist/utils/schema.js +1 -2
- package/dist/utils/service-initializer.cjs +87 -61
- package/dist/utils/service-initializer.d.ts +4 -2
- package/dist/utils/service-initializer.d.ts.map +1 -1
- package/dist/utils/service-initializer.js +69 -43
- package/package.json +7 -3
- package/dist/Dexto.cjs +0 -251
- package/dist/Dexto.d.ts +0 -191
- package/dist/Dexto.d.ts.map +0 -1
- package/dist/Dexto.js +0 -228
- package/dist/agent/registry/error-codes.cjs +0 -44
- package/dist/agent/registry/error-codes.d.ts +0 -21
- package/dist/agent/registry/error-codes.d.ts.map +0 -1
- package/dist/agent/registry/error-codes.js +0 -21
- package/dist/agent/registry/errors.cjs +0 -188
- package/dist/agent/registry/errors.d.ts +0 -63
- package/dist/agent/registry/errors.d.ts.map +0 -1
- package/dist/agent/registry/errors.js +0 -165
- package/dist/agent/registry/registry.cjs +0 -479
- package/dist/agent/registry/registry.d.ts +0 -130
- package/dist/agent/registry/registry.d.ts.map +0 -1
- package/dist/agent/registry/registry.js +0 -453
- package/dist/agent/registry/types.cjs +0 -74
- package/dist/agent/registry/types.d.ts +0 -142
- package/dist/agent/registry/types.d.ts.map +0 -1
- package/dist/agent/registry/types.js +0 -48
- package/dist/agent/registry/user-registry.cjs +0 -140
- package/dist/agent/registry/user-registry.d.ts +0 -34
- package/dist/agent/registry/user-registry.d.ts.map +0 -1
- package/dist/agent/registry/user-registry.js +0 -105
- package/dist/approval/providers/event-based-approval-provider.cjs +0 -156
- package/dist/approval/providers/event-based-approval-provider.d.ts +0 -39
- package/dist/approval/providers/event-based-approval-provider.d.ts.map +0 -1
- package/dist/approval/providers/event-based-approval-provider.js +0 -133
- package/dist/approval/providers/factory.d.ts.map +0 -1
- package/dist/approval/providers/noop-approval-provider.cjs +0 -54
- package/dist/approval/providers/noop-approval-provider.d.ts +0 -18
- package/dist/approval/providers/noop-approval-provider.d.ts.map +0 -1
- package/dist/approval/providers/noop-approval-provider.js +0 -31
- package/dist/config/agent-resolver.cjs +0 -153
- package/dist/config/agent-resolver.d.ts +0 -14
- package/dist/config/agent-resolver.d.ts.map +0 -1
- package/dist/config/agent-resolver.js +0 -123
- package/dist/config/error-codes.cjs +0 -39
- package/dist/config/error-codes.d.ts +0 -16
- package/dist/config/error-codes.d.ts.map +0 -1
- package/dist/config/error-codes.js +0 -16
- package/dist/config/errors.cjs +0 -126
- package/dist/config/errors.d.ts +0 -34
- package/dist/config/errors.d.ts.map +0 -1
- package/dist/config/errors.js +0 -103
- package/dist/config/index.cjs +0 -26
- package/dist/config/index.d.ts +0 -4
- package/dist/config/index.d.ts.map +0 -1
- package/dist/config/index.js +0 -3
- package/dist/config/loader.cjs +0 -119
- package/dist/config/loader.d.ts +0 -16
- package/dist/config/loader.d.ts.map +0 -1
- package/dist/config/loader.js +0 -86
- package/dist/config/writer.cjs +0 -182
- package/dist/config/writer.d.ts +0 -35
- package/dist/config/writer.d.ts.map +0 -1
- package/dist/config/writer.js +0 -147
- package/dist/preferences/constants.d.ts +0 -2
- package/dist/preferences/constants.d.ts.map +0 -1
- package/dist/preferences/constants.js +0 -5
- package/dist/preferences/error-codes.d.ts +0 -8
- package/dist/preferences/error-codes.d.ts.map +0 -1
- package/dist/preferences/error-codes.js +0 -12
- package/dist/preferences/errors.cjs +0 -75
- package/dist/preferences/errors.d.ts +0 -18
- package/dist/preferences/errors.d.ts.map +0 -1
- package/dist/preferences/errors.js +0 -51
- package/dist/preferences/index.cjs +0 -55
- package/dist/preferences/index.d.ts +0 -6
- package/dist/preferences/index.d.ts.map +0 -1
- package/dist/preferences/index.js +0 -32
- package/dist/preferences/loader.cjs +0 -138
- package/dist/preferences/loader.d.ts +0 -51
- package/dist/preferences/loader.d.ts.map +0 -1
- package/dist/preferences/loader.js +0 -110
- package/dist/preferences/schemas.cjs +0 -75
- package/dist/preferences/schemas.d.ts +0 -110
- package/dist/preferences/schemas.d.ts.map +0 -1
- package/dist/preferences/schemas.js +0 -49
- package/dist/utils/api-key-store.cjs +0 -56
- package/dist/utils/api-key-store.d.ts +0 -24
- package/dist/utils/api-key-store.d.ts.map +0 -1
- package/dist/utils/api-key-store.js +0 -31
- package/dist/utils/env.cjs +0 -154
- package/dist/utils/env.d.ts +0 -28
- package/dist/utils/env.d.ts.map +0 -1
- package/dist/utils/env.js +0 -119
- package/dist/utils/port-utils.cjs +0 -37
- package/dist/utils/port-utils.d.ts +0 -10
- package/dist/utils/port-utils.d.ts.map +0 -1
- package/dist/utils/port-utils.js +0 -14
- package/dist/utils/port-utils.spec.cjs +0 -26
- package/dist/utils/port-utils.spec.js +0 -25
- /package/dist/approval/{providers/factory.cjs → factory.cjs} +0 -0
|
@@ -4,7 +4,7 @@ import {
|
|
|
4
4
|
__runInitializers
|
|
5
5
|
} from "../../chunk-C6A6W6XS.js";
|
|
6
6
|
var _OpenAIService_decorators, _init;
|
|
7
|
-
import {
|
|
7
|
+
import { DextoLogComponent } from "../../logger/v2/types.js";
|
|
8
8
|
import { ContextManager } from "../../context/manager.js";
|
|
9
9
|
import { getMaxInputTokensForModel, getEffectiveMaxInputTokens } from "../registry.js";
|
|
10
10
|
import { DextoRuntimeError } from "../../errors/DextoRuntimeError.js";
|
|
@@ -13,7 +13,7 @@ import { OpenAIMessageFormatter } from "../formatters/openai.js";
|
|
|
13
13
|
import { createTokenizer } from "../tokenizer/factory.js";
|
|
14
14
|
import { shouldIncludeRawToolResult } from "../../utils/debug.js";
|
|
15
15
|
import { InstrumentClass } from "../../telemetry/decorators.js";
|
|
16
|
-
import { trace } from "@opentelemetry/api";
|
|
16
|
+
import { trace, context, propagation } from "@opentelemetry/api";
|
|
17
17
|
_OpenAIService_decorators = [InstrumentClass({
|
|
18
18
|
prefix: "llm.openai",
|
|
19
19
|
excludeMethods: ["getAllTools", "formatToolsForOpenAI", "getConfig", "getContextManager"]
|
|
@@ -25,15 +25,17 @@ class OpenAIService {
|
|
|
25
25
|
contextManager;
|
|
26
26
|
sessionEventBus;
|
|
27
27
|
sessionId;
|
|
28
|
-
|
|
28
|
+
logger;
|
|
29
|
+
constructor(toolManager, openai, systemPromptManager, historyProvider, sessionEventBus, config, sessionId, resourceManager, logger) {
|
|
30
|
+
this.logger = logger.createChild(DextoLogComponent.LLM);
|
|
29
31
|
this.config = config;
|
|
30
32
|
this.openai = openai;
|
|
31
33
|
this.toolManager = toolManager;
|
|
32
34
|
this.sessionEventBus = sessionEventBus;
|
|
33
35
|
this.sessionId = sessionId;
|
|
34
|
-
const formatter = new OpenAIMessageFormatter();
|
|
35
|
-
const tokenizer = createTokenizer(config.provider, config.model);
|
|
36
|
-
const maxInputTokens = getEffectiveMaxInputTokens(config);
|
|
36
|
+
const formatter = new OpenAIMessageFormatter(this.logger);
|
|
37
|
+
const tokenizer = createTokenizer(config.provider, config.model, this.logger);
|
|
38
|
+
const maxInputTokens = getEffectiveMaxInputTokens(config, this.logger);
|
|
37
39
|
this.contextManager = new ContextManager(
|
|
38
40
|
config,
|
|
39
41
|
formatter,
|
|
@@ -42,7 +44,8 @@ class OpenAIService {
|
|
|
42
44
|
tokenizer,
|
|
43
45
|
historyProvider,
|
|
44
46
|
sessionId,
|
|
45
|
-
resourceManager
|
|
47
|
+
resourceManager,
|
|
48
|
+
this.logger
|
|
46
49
|
// compressionStrategies uses default
|
|
47
50
|
);
|
|
48
51
|
}
|
|
@@ -50,222 +53,256 @@ class OpenAIService {
|
|
|
50
53
|
return this.toolManager.getAllTools();
|
|
51
54
|
}
|
|
52
55
|
async completeTask(textInput, options, imageData, fileData, stream) {
|
|
53
|
-
|
|
54
|
-
const
|
|
55
|
-
const
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
reasoningTokens
|
|
90
|
-
} : void 0
|
|
91
|
-
});
|
|
92
|
-
if (totalTokens > 0) {
|
|
93
|
-
this.contextManager.updateActualTokenCount(totalTokens);
|
|
94
|
-
}
|
|
95
|
-
this.sessionEventBus.emit("llmservice:response", {
|
|
96
|
-
content: finalContent,
|
|
97
|
-
provider: this.config.provider,
|
|
98
|
-
model: this.config.model,
|
|
99
|
-
router: "in-built",
|
|
100
|
-
tokenUsage: { totalTokens, inputTokens, outputTokens, reasoningTokens }
|
|
101
|
-
});
|
|
102
|
-
const activeSpan2 = trace.getActiveSpan();
|
|
103
|
-
if (activeSpan2 && totalTokens > 0) {
|
|
104
|
-
const attributes = {
|
|
105
|
-
"gen_ai.usage.total_tokens": totalTokens
|
|
106
|
-
};
|
|
107
|
-
if (inputTokens > 0) {
|
|
108
|
-
attributes["gen_ai.usage.input_tokens"] = inputTokens;
|
|
109
|
-
}
|
|
110
|
-
if (outputTokens > 0) {
|
|
111
|
-
attributes["gen_ai.usage.output_tokens"] = outputTokens;
|
|
112
|
-
}
|
|
113
|
-
if (reasoningTokens > 0) {
|
|
114
|
-
attributes["gen_ai.usage.reasoning_tokens"] = reasoningTokens;
|
|
115
|
-
}
|
|
116
|
-
activeSpan2.setAttributes(attributes);
|
|
117
|
-
}
|
|
118
|
-
return finalContent;
|
|
119
|
-
}
|
|
120
|
-
const functionToolCalls = message.tool_calls.filter(
|
|
121
|
-
(toolCall) => {
|
|
122
|
-
logger.debug(`Tool call type received: ${toolCall.type}`);
|
|
123
|
-
return toolCall.type === "function";
|
|
124
|
-
}
|
|
125
|
-
);
|
|
126
|
-
if (message.tool_calls.length > functionToolCalls.length) {
|
|
127
|
-
logger.warn(
|
|
128
|
-
`Filtered out ${message.tool_calls.length - functionToolCalls.length} non-function tool calls`
|
|
129
|
-
);
|
|
130
|
-
}
|
|
131
|
-
await this.contextManager.addAssistantMessage(
|
|
132
|
-
message.content,
|
|
133
|
-
functionToolCalls.length > 0 ? functionToolCalls : void 0,
|
|
134
|
-
{}
|
|
135
|
-
);
|
|
136
|
-
if (stream && message.content) {
|
|
137
|
-
fullResponse += message.content;
|
|
138
|
-
}
|
|
139
|
-
for (const toolCall of functionToolCalls) {
|
|
56
|
+
const activeSpan = trace.getActiveSpan();
|
|
57
|
+
const currentContext = context.active();
|
|
58
|
+
const provider = this.config.provider;
|
|
59
|
+
const model = this.config.model;
|
|
60
|
+
if (activeSpan) {
|
|
61
|
+
activeSpan.setAttribute("llm.provider", provider);
|
|
62
|
+
activeSpan.setAttribute("llm.model", model);
|
|
63
|
+
}
|
|
64
|
+
const existingBaggage = propagation.getBaggage(currentContext);
|
|
65
|
+
const baggageEntries = {};
|
|
66
|
+
if (existingBaggage) {
|
|
67
|
+
existingBaggage.getAllEntries().forEach(([key, entry]) => {
|
|
68
|
+
baggageEntries[key] = entry;
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
baggageEntries["llm.provider"] = { value: provider };
|
|
72
|
+
baggageEntries["llm.model"] = { value: model };
|
|
73
|
+
const updatedContext = propagation.setBaggage(
|
|
74
|
+
currentContext,
|
|
75
|
+
propagation.createBaggage(baggageEntries)
|
|
76
|
+
);
|
|
77
|
+
return await context.with(updatedContext, async () => {
|
|
78
|
+
await this.contextManager.addUserMessage(textInput, imageData, fileData);
|
|
79
|
+
const rawTools = await this.toolManager.getAllTools();
|
|
80
|
+
const formattedTools = this.formatToolsForOpenAI(rawTools);
|
|
81
|
+
this.logger.silly(`Formatted tools: ${JSON.stringify(formattedTools, null, 2)}`);
|
|
82
|
+
this.sessionEventBus.emit("llm:thinking");
|
|
83
|
+
let iterationCount = 0;
|
|
84
|
+
let totalTokens = 0;
|
|
85
|
+
let inputTokens = 0;
|
|
86
|
+
let outputTokens = 0;
|
|
87
|
+
let reasoningTokens = 0;
|
|
88
|
+
let fullResponse = "";
|
|
89
|
+
const contextStr = stream ? "OpenAI streaming API call" : "OpenAI API call";
|
|
90
|
+
try {
|
|
91
|
+
while (iterationCount < this.config.maxIterations) {
|
|
140
92
|
if (options?.signal?.aborted) {
|
|
141
93
|
throw Object.assign(new Error("Aborted"), {
|
|
142
94
|
name: "AbortError",
|
|
143
95
|
aborted: true
|
|
144
96
|
});
|
|
145
97
|
}
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
this.
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
98
|
+
iterationCount++;
|
|
99
|
+
const { message, usage } = stream ? await this.getAIStreamingResponseWithRetries(
|
|
100
|
+
formattedTools,
|
|
101
|
+
options?.signal
|
|
102
|
+
) : await this.getAIResponseWithRetries(formattedTools, options?.signal);
|
|
103
|
+
if (usage) {
|
|
104
|
+
totalTokens += usage.total_tokens ?? 0;
|
|
105
|
+
inputTokens += usage.prompt_tokens ?? 0;
|
|
106
|
+
outputTokens += usage.completion_tokens ?? 0;
|
|
107
|
+
reasoningTokens += usage.completion_tokens_details?.reasoning_tokens ?? 0;
|
|
108
|
+
}
|
|
109
|
+
if (!message.tool_calls || message.tool_calls.length === 0) {
|
|
110
|
+
const responseText = message.content || "";
|
|
111
|
+
const finalContent = stream ? fullResponse + responseText : responseText;
|
|
112
|
+
await this.contextManager.addAssistantMessage(finalContent, void 0, {
|
|
113
|
+
tokenUsage: totalTokens > 0 ? {
|
|
114
|
+
totalTokens,
|
|
115
|
+
inputTokens,
|
|
116
|
+
outputTokens,
|
|
117
|
+
reasoningTokens
|
|
118
|
+
} : void 0
|
|
166
119
|
});
|
|
167
|
-
|
|
120
|
+
if (totalTokens > 0) {
|
|
121
|
+
this.contextManager.updateActualTokenCount(totalTokens);
|
|
122
|
+
}
|
|
123
|
+
this.sessionEventBus.emit("llm:response", {
|
|
124
|
+
content: finalContent,
|
|
125
|
+
provider: this.config.provider,
|
|
126
|
+
model: this.config.model,
|
|
127
|
+
router: "in-built",
|
|
128
|
+
tokenUsage: { totalTokens, inputTokens, outputTokens, reasoningTokens }
|
|
129
|
+
});
|
|
130
|
+
const activeSpan3 = trace.getActiveSpan();
|
|
131
|
+
if (activeSpan3 && totalTokens > 0) {
|
|
132
|
+
const attributes = {
|
|
133
|
+
"gen_ai.usage.total_tokens": totalTokens
|
|
134
|
+
};
|
|
135
|
+
if (inputTokens > 0) {
|
|
136
|
+
attributes["gen_ai.usage.input_tokens"] = inputTokens;
|
|
137
|
+
}
|
|
138
|
+
if (outputTokens > 0) {
|
|
139
|
+
attributes["gen_ai.usage.output_tokens"] = outputTokens;
|
|
140
|
+
}
|
|
141
|
+
if (reasoningTokens > 0) {
|
|
142
|
+
attributes["gen_ai.usage.reasoning_tokens"] = reasoningTokens;
|
|
143
|
+
}
|
|
144
|
+
activeSpan3.setAttributes(attributes);
|
|
145
|
+
}
|
|
146
|
+
return finalContent;
|
|
168
147
|
}
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
this.sessionId
|
|
179
|
-
);
|
|
180
|
-
const sanitized = await this.contextManager.addToolResult(
|
|
181
|
-
toolCall.id,
|
|
182
|
-
toolName,
|
|
183
|
-
result,
|
|
184
|
-
{ success: true }
|
|
148
|
+
const functionToolCalls = message.tool_calls.filter(
|
|
149
|
+
(toolCall) => {
|
|
150
|
+
this.logger.debug(`Tool call type received: ${toolCall.type}`);
|
|
151
|
+
return toolCall.type === "function";
|
|
152
|
+
}
|
|
153
|
+
);
|
|
154
|
+
if (message.tool_calls.length > functionToolCalls.length) {
|
|
155
|
+
this.logger.warn(
|
|
156
|
+
`Filtered out ${message.tool_calls.length - functionToolCalls.length} non-function tool calls`
|
|
185
157
|
);
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
158
|
+
}
|
|
159
|
+
await this.contextManager.addAssistantMessage(
|
|
160
|
+
message.content,
|
|
161
|
+
functionToolCalls.length > 0 ? functionToolCalls : void 0,
|
|
162
|
+
{}
|
|
163
|
+
);
|
|
164
|
+
if (stream && message.content) {
|
|
165
|
+
fullResponse += message.content;
|
|
166
|
+
}
|
|
167
|
+
for (const toolCall of functionToolCalls) {
|
|
168
|
+
if (options?.signal?.aborted) {
|
|
169
|
+
throw Object.assign(new Error("Aborted"), {
|
|
170
|
+
name: "AbortError",
|
|
171
|
+
aborted: true
|
|
172
|
+
});
|
|
173
|
+
}
|
|
174
|
+
this.logger.debug(`Tool call initiated - Type: ${toolCall.type}`);
|
|
175
|
+
this.logger.debug(
|
|
176
|
+
`Tool call details: ${JSON.stringify(toolCall, null, 2)}`
|
|
201
177
|
);
|
|
202
|
-
|
|
178
|
+
const toolName = toolCall.function.name;
|
|
179
|
+
let args = {};
|
|
180
|
+
try {
|
|
181
|
+
args = JSON.parse(toolCall.function.arguments);
|
|
182
|
+
} catch (e) {
|
|
183
|
+
this.logger.error(`Error parsing arguments for ${toolName}:`, {
|
|
184
|
+
error: e instanceof Error ? e.message : String(e)
|
|
185
|
+
});
|
|
186
|
+
const sanitized = await this.contextManager.addToolResult(
|
|
187
|
+
toolCall.id,
|
|
188
|
+
toolName,
|
|
189
|
+
{ error: `Failed to parse arguments: ${e}` },
|
|
190
|
+
{ success: false }
|
|
191
|
+
);
|
|
192
|
+
this.sessionEventBus.emit("llm:tool-result", {
|
|
193
|
+
toolName,
|
|
194
|
+
callId: toolCall.id,
|
|
195
|
+
success: false,
|
|
196
|
+
sanitized,
|
|
197
|
+
...shouldIncludeRawToolResult() ? { rawResult: { error: `Failed to parse arguments: ${e}` } } : {}
|
|
198
|
+
});
|
|
199
|
+
continue;
|
|
200
|
+
}
|
|
201
|
+
this.sessionEventBus.emit("llm:tool-call", {
|
|
203
202
|
toolName,
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
sanitized,
|
|
207
|
-
...shouldIncludeRawToolResult() ? { rawResult: { error: errorMessage } } : {}
|
|
203
|
+
args,
|
|
204
|
+
callId: toolCall.id
|
|
208
205
|
});
|
|
206
|
+
try {
|
|
207
|
+
const result = await this.toolManager.executeTool(
|
|
208
|
+
toolName,
|
|
209
|
+
args,
|
|
210
|
+
this.sessionId
|
|
211
|
+
);
|
|
212
|
+
const sanitized = await this.contextManager.addToolResult(
|
|
213
|
+
toolCall.id,
|
|
214
|
+
toolName,
|
|
215
|
+
result,
|
|
216
|
+
{ success: true }
|
|
217
|
+
);
|
|
218
|
+
this.sessionEventBus.emit("llm:tool-result", {
|
|
219
|
+
toolName,
|
|
220
|
+
callId: toolCall.id,
|
|
221
|
+
success: true,
|
|
222
|
+
sanitized,
|
|
223
|
+
...shouldIncludeRawToolResult() ? { rawResult: result } : {}
|
|
224
|
+
});
|
|
225
|
+
} catch (error) {
|
|
226
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
227
|
+
this.logger.error(
|
|
228
|
+
`Tool execution error for ${toolName}: ${errorMessage}`
|
|
229
|
+
);
|
|
230
|
+
const sanitized = await this.contextManager.addToolResult(
|
|
231
|
+
toolCall.id,
|
|
232
|
+
toolName,
|
|
233
|
+
{ error: errorMessage },
|
|
234
|
+
{ success: false }
|
|
235
|
+
);
|
|
236
|
+
this.sessionEventBus.emit("llm:tool-result", {
|
|
237
|
+
toolName,
|
|
238
|
+
callId: toolCall.id,
|
|
239
|
+
success: false,
|
|
240
|
+
sanitized,
|
|
241
|
+
...shouldIncludeRawToolResult() ? { rawResult: { error: errorMessage } } : {}
|
|
242
|
+
});
|
|
243
|
+
}
|
|
209
244
|
}
|
|
210
245
|
}
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
totalTokens
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
this.sessionEventBus.emit("llmservice:response", {
|
|
226
|
-
content: finalResponse,
|
|
227
|
-
provider: this.config.provider,
|
|
228
|
-
model: this.config.model,
|
|
229
|
-
router: "in-built",
|
|
230
|
-
tokenUsage: { totalTokens, inputTokens, outputTokens, reasoningTokens }
|
|
231
|
-
});
|
|
232
|
-
const activeSpan = trace.getActiveSpan();
|
|
233
|
-
if (activeSpan && totalTokens > 0) {
|
|
234
|
-
const attributes = {
|
|
235
|
-
"gen_ai.usage.total_tokens": totalTokens
|
|
236
|
-
};
|
|
237
|
-
if (inputTokens > 0) {
|
|
238
|
-
attributes["gen_ai.usage.input_tokens"] = inputTokens;
|
|
246
|
+
this.logger.warn(
|
|
247
|
+
`Reached maximum iterations (${this.config.maxIterations}) for task.`
|
|
248
|
+
);
|
|
249
|
+
const finalResponse = fullResponse || "Task completed but reached maximum tool call iterations.";
|
|
250
|
+
await this.contextManager.addAssistantMessage(finalResponse, void 0, {
|
|
251
|
+
tokenUsage: totalTokens > 0 ? {
|
|
252
|
+
totalTokens,
|
|
253
|
+
inputTokens,
|
|
254
|
+
outputTokens,
|
|
255
|
+
reasoningTokens
|
|
256
|
+
} : void 0
|
|
257
|
+
});
|
|
258
|
+
if (totalTokens > 0) {
|
|
259
|
+
this.contextManager.updateActualTokenCount(totalTokens);
|
|
239
260
|
}
|
|
240
|
-
|
|
241
|
-
|
|
261
|
+
this.sessionEventBus.emit("llm:response", {
|
|
262
|
+
content: finalResponse,
|
|
263
|
+
provider: this.config.provider,
|
|
264
|
+
model: this.config.model,
|
|
265
|
+
router: "in-built",
|
|
266
|
+
tokenUsage: { totalTokens, inputTokens, outputTokens, reasoningTokens }
|
|
267
|
+
});
|
|
268
|
+
const activeSpan2 = trace.getActiveSpan();
|
|
269
|
+
if (activeSpan2 && totalTokens > 0) {
|
|
270
|
+
const attributes = {
|
|
271
|
+
"gen_ai.usage.total_tokens": totalTokens
|
|
272
|
+
};
|
|
273
|
+
if (inputTokens > 0) {
|
|
274
|
+
attributes["gen_ai.usage.input_tokens"] = inputTokens;
|
|
275
|
+
}
|
|
276
|
+
if (outputTokens > 0) {
|
|
277
|
+
attributes["gen_ai.usage.output_tokens"] = outputTokens;
|
|
278
|
+
}
|
|
279
|
+
if (reasoningTokens > 0) {
|
|
280
|
+
attributes["gen_ai.usage.reasoning_tokens"] = reasoningTokens;
|
|
281
|
+
}
|
|
282
|
+
activeSpan2.setAttributes(attributes);
|
|
242
283
|
}
|
|
243
|
-
|
|
244
|
-
|
|
284
|
+
return finalResponse;
|
|
285
|
+
} catch (error) {
|
|
286
|
+
if (error instanceof Error && (error.name === "AbortError" || error.aborted === true)) {
|
|
287
|
+
throw error;
|
|
245
288
|
}
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
289
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
290
|
+
this.logger.error(`Error in ${contextStr}: ${errorMessage}`, { error });
|
|
291
|
+
if (!stream) {
|
|
292
|
+
this.logger.warn(
|
|
293
|
+
`If this error is due to token overflow, consider configuring 'maxInputTokens' in your LLMConfig.`
|
|
294
|
+
);
|
|
295
|
+
}
|
|
296
|
+
this.sessionEventBus.emit("llm:error", {
|
|
297
|
+
error: error instanceof Error ? error : new Error(errorMessage),
|
|
298
|
+
context: contextStr,
|
|
299
|
+
recoverable: false
|
|
300
|
+
});
|
|
301
|
+
const errorResponse = `Error processing ${stream ? "streaming " : ""}request: ${errorMessage}`;
|
|
302
|
+
await this.contextManager.addAssistantMessage(errorResponse, void 0, {});
|
|
303
|
+
return errorResponse;
|
|
259
304
|
}
|
|
260
|
-
|
|
261
|
-
error: error instanceof Error ? error : new Error(errorMessage),
|
|
262
|
-
context,
|
|
263
|
-
recoverable: false
|
|
264
|
-
});
|
|
265
|
-
const errorResponse = `Error processing ${stream ? "streaming " : ""}request: ${errorMessage}`;
|
|
266
|
-
await this.contextManager.addAssistantMessage(errorResponse, void 0, {});
|
|
267
|
-
return errorResponse;
|
|
268
|
-
}
|
|
305
|
+
});
|
|
269
306
|
}
|
|
270
307
|
/**
|
|
271
308
|
* Get configuration information about the LLM service
|
|
@@ -277,12 +314,13 @@ class OpenAIService {
|
|
|
277
314
|
try {
|
|
278
315
|
modelMaxInputTokens = getMaxInputTokensForModel(
|
|
279
316
|
this.config.provider,
|
|
280
|
-
this.config.model
|
|
317
|
+
this.config.model,
|
|
318
|
+
this.logger
|
|
281
319
|
);
|
|
282
320
|
} catch (error) {
|
|
283
321
|
if (error instanceof DextoRuntimeError && error.code === LLMErrorCode.MODEL_UNKNOWN) {
|
|
284
322
|
modelMaxInputTokens = configuredMaxInputTokens;
|
|
285
|
-
logger.debug(
|
|
323
|
+
this.logger.debug(
|
|
286
324
|
`Could not find model ${this.config.model} in LLM registry to get max tokens. Using configured max tokens: ${configuredMaxInputTokens}.`
|
|
287
325
|
);
|
|
288
326
|
} else {
|
|
@@ -301,7 +339,7 @@ class OpenAIService {
|
|
|
301
339
|
async getAIResponseWithRetries(tools, signal) {
|
|
302
340
|
let attempts = 0;
|
|
303
341
|
const MAX_ATTEMPTS = 3;
|
|
304
|
-
logger.debug(`Tools size in getAIResponseWithRetries: ${tools.length}`);
|
|
342
|
+
this.logger.debug(`Tools size in getAIResponseWithRetries: ${tools.length}`);
|
|
305
343
|
while (attempts < MAX_ATTEMPTS) {
|
|
306
344
|
attempts++;
|
|
307
345
|
try {
|
|
@@ -313,10 +351,10 @@ class OpenAIService {
|
|
|
313
351
|
{ mcpManager: this.toolManager.getMcpManager() },
|
|
314
352
|
{ provider: this.config.provider, model: this.config.model }
|
|
315
353
|
);
|
|
316
|
-
logger.silly(
|
|
354
|
+
this.logger.silly(
|
|
317
355
|
`Message history (potentially compressed) in getAIResponseWithRetries: ${JSON.stringify(formattedMessages, null, 2)}`
|
|
318
356
|
);
|
|
319
|
-
logger.debug(`Estimated tokens being sent to OpenAI: ${tokensUsed}`);
|
|
357
|
+
this.logger.debug(`Estimated tokens being sent to OpenAI: ${tokensUsed}`);
|
|
320
358
|
const response = await this.openai.chat.completions.create(
|
|
321
359
|
{
|
|
322
360
|
model: this.config.model,
|
|
@@ -328,9 +366,8 @@ class OpenAIService {
|
|
|
328
366
|
},
|
|
329
367
|
signal ? { signal } : void 0
|
|
330
368
|
);
|
|
331
|
-
logger.silly(
|
|
332
|
-
|
|
333
|
-
JSON.stringify(response, null, 2)
|
|
369
|
+
this.logger.silly(
|
|
370
|
+
`OPENAI CHAT COMPLETION RESPONSE: ${JSON.stringify(response, null, 2)}`
|
|
334
371
|
);
|
|
335
372
|
const message = response.choices[0]?.message;
|
|
336
373
|
if (!message) {
|
|
@@ -343,17 +380,17 @@ class OpenAIService {
|
|
|
343
380
|
throw error;
|
|
344
381
|
}
|
|
345
382
|
const apiError = error;
|
|
346
|
-
logger.error(
|
|
383
|
+
this.logger.error(
|
|
347
384
|
`Error in OpenAI API call (Attempt ${attempts}/${MAX_ATTEMPTS}): ${apiError.message || JSON.stringify(apiError, null, 2)}`,
|
|
348
385
|
{ status: apiError.status, headers: apiError.headers }
|
|
349
386
|
);
|
|
350
387
|
if (apiError.status === 400 && apiError.code === "context_length_exceeded") {
|
|
351
|
-
logger.warn(
|
|
388
|
+
this.logger.warn(
|
|
352
389
|
`Context length exceeded. ContextManager compression might not be sufficient. Error details: ${JSON.stringify(apiError.error)}`
|
|
353
390
|
);
|
|
354
391
|
}
|
|
355
392
|
if (attempts >= MAX_ATTEMPTS) {
|
|
356
|
-
logger.error(
|
|
393
|
+
this.logger.error(
|
|
357
394
|
`Failed to get response from OpenAI after ${MAX_ATTEMPTS} attempts.`
|
|
358
395
|
);
|
|
359
396
|
throw error;
|
|
@@ -377,10 +414,10 @@ class OpenAIService {
|
|
|
377
414
|
{ mcpManager: this.toolManager.getMcpManager() },
|
|
378
415
|
{ provider: this.config.provider, model: this.config.model }
|
|
379
416
|
);
|
|
380
|
-
logger.silly(
|
|
417
|
+
this.logger.silly(
|
|
381
418
|
`Streaming message history (potentially compressed): ${JSON.stringify(formattedMessages, null, 2)}`
|
|
382
419
|
);
|
|
383
|
-
logger.debug(`Estimated tokens being sent to OpenAI streaming: ${tokensUsed}`);
|
|
420
|
+
this.logger.debug(`Estimated tokens being sent to OpenAI streaming: ${tokensUsed}`);
|
|
384
421
|
const stream = await this.openai.chat.completions.create(
|
|
385
422
|
{
|
|
386
423
|
model: this.config.model,
|
|
@@ -409,8 +446,8 @@ class OpenAIService {
|
|
|
409
446
|
const delta = chunk.choices[0]?.delta;
|
|
410
447
|
if (delta?.content) {
|
|
411
448
|
content += delta.content;
|
|
412
|
-
this.sessionEventBus.emit("
|
|
413
|
-
|
|
449
|
+
this.sessionEventBus.emit("llm:chunk", {
|
|
450
|
+
chunkType: "text",
|
|
414
451
|
content: delta.content,
|
|
415
452
|
isComplete: false
|
|
416
453
|
});
|
|
@@ -447,8 +484,8 @@ class OpenAIService {
|
|
|
447
484
|
}
|
|
448
485
|
}
|
|
449
486
|
if (content) {
|
|
450
|
-
this.sessionEventBus.emit("
|
|
451
|
-
|
|
487
|
+
this.sessionEventBus.emit("llm:chunk", {
|
|
488
|
+
chunkType: "text",
|
|
452
489
|
content: "",
|
|
453
490
|
isComplete: true
|
|
454
491
|
});
|
|
@@ -459,21 +496,21 @@ class OpenAIService {
|
|
|
459
496
|
refusal: null,
|
|
460
497
|
...toolCalls.length > 0 && { tool_calls: toolCalls }
|
|
461
498
|
};
|
|
462
|
-
logger.debug(`OpenAI streaming completed. Usage info: ${usage}`);
|
|
499
|
+
this.logger.debug(`OpenAI streaming completed. Usage info: ${usage}`);
|
|
463
500
|
return { message, ...usage && { usage } };
|
|
464
501
|
} catch (error) {
|
|
465
502
|
const apiError = error;
|
|
466
|
-
logger.error(
|
|
503
|
+
this.logger.error(
|
|
467
504
|
`Error in OpenAI streaming API call (Attempt ${attempts}/${MAX_ATTEMPTS}): ${apiError.message || JSON.stringify(apiError, null, 2)}`,
|
|
468
505
|
{ status: apiError.status, headers: apiError.headers }
|
|
469
506
|
);
|
|
470
507
|
if (apiError.status === 400 && apiError.message?.includes("maximum context length")) {
|
|
471
|
-
logger.warn(
|
|
508
|
+
this.logger.warn(
|
|
472
509
|
`Context length exceeded in streaming. ContextManager compression might not be sufficient. Error details: ${JSON.stringify(apiError.error)}`
|
|
473
510
|
);
|
|
474
511
|
}
|
|
475
512
|
if (attempts >= MAX_ATTEMPTS) {
|
|
476
|
-
logger.error(
|
|
513
|
+
this.logger.error(
|
|
477
514
|
`Failed to get streaming response from OpenAI after ${MAX_ATTEMPTS} attempts.`
|
|
478
515
|
);
|
|
479
516
|
throw error;
|