@dexto/core 1.8.3 → 1.8.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/dist/agent/DextoAgent.cjs +3 -1
- package/dist/agent/DextoAgent.d.ts +2 -0
- package/dist/agent/DextoAgent.d.ts.map +1 -1
- package/dist/agent/DextoAgent.js +7 -2
- package/dist/events/index.d.ts +3 -0
- package/dist/events/index.d.ts.map +1 -1
- package/dist/index.browser.cjs +6 -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/llm/executor/provider-error.cjs +214 -0
- package/dist/llm/executor/provider-error.d.ts +26 -0
- package/dist/llm/executor/provider-error.d.ts.map +1 -0
- package/dist/llm/executor/provider-error.js +190 -0
- package/dist/llm/executor/stream-processor.cjs +34 -5
- package/dist/llm/executor/stream-processor.d.ts +4 -1
- package/dist/llm/executor/stream-processor.d.ts.map +1 -1
- package/dist/llm/executor/stream-processor.js +34 -5
- package/dist/llm/executor/turn-executor.cjs +320 -152
- package/dist/llm/executor/turn-executor.d.ts +6 -5
- package/dist/llm/executor/turn-executor.d.ts.map +1 -1
- package/dist/llm/executor/turn-executor.js +319 -148
- package/dist/llm/registry/sync.cjs +15 -2
- package/dist/llm/registry/sync.d.ts.map +1 -1
- package/dist/llm/registry/sync.js +15 -2
- package/dist/llm/services/vercel.cjs +32 -5
- package/dist/llm/services/vercel.d.ts.map +1 -1
- package/dist/llm/services/vercel.js +32 -5
- package/dist/session/chat-session.cjs +41 -11
- package/dist/session/chat-session.d.ts.map +1 -1
- package/dist/session/chat-session.js +41 -11
- package/dist/session/title-generator.cjs +19 -2
- package/dist/session/title-generator.d.ts +8 -0
- package/dist/session/title-generator.d.ts.map +1 -1
- package/dist/session/title-generator.js +19 -2
- package/dist/systemPrompt/contributors.cjs +10 -1
- package/dist/systemPrompt/contributors.d.ts.map +1 -1
- package/dist/systemPrompt/contributors.js +10 -1
- package/dist/telemetry/browser.cjs +138 -0
- package/dist/telemetry/browser.d.ts +30 -0
- package/dist/telemetry/browser.d.ts.map +1 -0
- package/dist/telemetry/browser.js +115 -0
- package/dist/telemetry/decorators.cjs +86 -82
- package/dist/telemetry/decorators.d.ts.map +1 -1
- package/dist/telemetry/decorators.js +86 -82
- package/dist/telemetry/index.cjs +5 -2
- package/dist/telemetry/index.d.ts +1 -0
- package/dist/telemetry/index.d.ts.map +1 -1
- package/dist/telemetry/index.js +3 -1
- package/dist/telemetry/operation-span.cjs +74 -0
- package/dist/telemetry/operation-span.d.ts +13 -0
- package/dist/telemetry/operation-span.d.ts.map +1 -0
- package/dist/telemetry/operation-span.js +51 -0
- package/dist/telemetry/telemetry.cjs +2 -3
- package/dist/telemetry/telemetry.d.ts.map +1 -1
- package/dist/telemetry/telemetry.js +2 -3
- package/dist/telemetry/utils.cjs +11 -12
- package/dist/telemetry/utils.d.ts.map +1 -1
- package/dist/telemetry/utils.js +11 -12
- package/dist/tools/tool-call-metadata.cjs +121 -6
- package/dist/tools/tool-call-metadata.d.ts.map +1 -1
- package/dist/tools/tool-call-metadata.js +121 -6
- package/package.json +3 -2
|
@@ -77,6 +77,7 @@ var import_turn_executor = require("../executor/turn-executor.js");
|
|
|
77
77
|
var import_DextoRuntimeError = require("../../errors/DextoRuntimeError.js");
|
|
78
78
|
var import_types4 = require("../../errors/types.js");
|
|
79
79
|
var import_error_codes = require("../error-codes.js");
|
|
80
|
+
var import_operation_span = require("../../telemetry/operation-span.js");
|
|
80
81
|
var _VercelLLMService_decorators, _init;
|
|
81
82
|
function ensureRunContextMatchesServiceSession(serviceSessionId, runContext) {
|
|
82
83
|
if (runContext !== void 0 && runContext.sessionId !== serviceSessionId) {
|
|
@@ -157,11 +158,37 @@ class VercelLLMService {
|
|
|
157
158
|
async createTurnDriver(options = {}) {
|
|
158
159
|
const sessionId = ensureRunContextMatchesServiceSession(this.sessionId, options.runContext);
|
|
159
160
|
const executor = this.createTurnExecutor(options.signal, options.runContext);
|
|
160
|
-
const contributorContext = await
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
161
|
+
const contributorContext = await (0, import_operation_span.recordOperationSpan)(
|
|
162
|
+
{
|
|
163
|
+
name: "llm.vercel.build_contributor_context",
|
|
164
|
+
attributes: {
|
|
165
|
+
"session.id": sessionId
|
|
166
|
+
},
|
|
167
|
+
resultAttributes: (context2) => ({
|
|
168
|
+
"tool.has_workspace_context": context2.workspace !== null,
|
|
169
|
+
"tool.has_environment_context": context2.environment !== void 0,
|
|
170
|
+
"tool.session_prompt_contributors": context2.session?.systemPromptContributors?.length ?? 0
|
|
171
|
+
})
|
|
172
|
+
},
|
|
173
|
+
() => this.toolManager.buildContributorContext({ sessionId }),
|
|
174
|
+
this.logger
|
|
175
|
+
);
|
|
176
|
+
const streaming = options.streaming ?? true;
|
|
177
|
+
return (0, import_operation_span.recordOperationSpan)(
|
|
178
|
+
{
|
|
179
|
+
name: "llm.vercel.create_turn_executor_driver",
|
|
180
|
+
attributes: {
|
|
181
|
+
"session.id": sessionId,
|
|
182
|
+
"turn.streaming": streaming,
|
|
183
|
+
"turn.resume": options.state !== void 0
|
|
184
|
+
}
|
|
185
|
+
},
|
|
186
|
+
() => executor.createDriver(contributorContext, {
|
|
187
|
+
streaming,
|
|
188
|
+
...options.state !== void 0 ? { state: options.state } : {}
|
|
189
|
+
}),
|
|
190
|
+
this.logger
|
|
191
|
+
);
|
|
165
192
|
}
|
|
166
193
|
/**
|
|
167
194
|
* Create a TurnExecutor instance for executing the agent loop.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/services/vercel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAqB,MAAM,IAAI,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,KAAK,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC5E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAGxD,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAIhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/services/vercel.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ import { TurnExecutor } from "../executor/turn-executor.js";
|
|
|
14
14
|
import { DextoRuntimeError } from "../../errors/DextoRuntimeError.js";
|
|
15
15
|
import { ErrorScope, ErrorType } from "../../errors/types.js";
|
|
16
16
|
import { LLMErrorCode } from "../error-codes.js";
|
|
17
|
+
import { recordOperationSpan } from "../../telemetry/operation-span.js";
|
|
17
18
|
function ensureRunContextMatchesServiceSession(serviceSessionId, runContext) {
|
|
18
19
|
if (runContext !== void 0 && runContext.sessionId !== serviceSessionId) {
|
|
19
20
|
throw new DextoRuntimeError(
|
|
@@ -93,11 +94,37 @@ class VercelLLMService {
|
|
|
93
94
|
async createTurnDriver(options = {}) {
|
|
94
95
|
const sessionId = ensureRunContextMatchesServiceSession(this.sessionId, options.runContext);
|
|
95
96
|
const executor = this.createTurnExecutor(options.signal, options.runContext);
|
|
96
|
-
const contributorContext = await
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
97
|
+
const contributorContext = await recordOperationSpan(
|
|
98
|
+
{
|
|
99
|
+
name: "llm.vercel.build_contributor_context",
|
|
100
|
+
attributes: {
|
|
101
|
+
"session.id": sessionId
|
|
102
|
+
},
|
|
103
|
+
resultAttributes: (context2) => ({
|
|
104
|
+
"tool.has_workspace_context": context2.workspace !== null,
|
|
105
|
+
"tool.has_environment_context": context2.environment !== void 0,
|
|
106
|
+
"tool.session_prompt_contributors": context2.session?.systemPromptContributors?.length ?? 0
|
|
107
|
+
})
|
|
108
|
+
},
|
|
109
|
+
() => this.toolManager.buildContributorContext({ sessionId }),
|
|
110
|
+
this.logger
|
|
111
|
+
);
|
|
112
|
+
const streaming = options.streaming ?? true;
|
|
113
|
+
return recordOperationSpan(
|
|
114
|
+
{
|
|
115
|
+
name: "llm.vercel.create_turn_executor_driver",
|
|
116
|
+
attributes: {
|
|
117
|
+
"session.id": sessionId,
|
|
118
|
+
"turn.streaming": streaming,
|
|
119
|
+
"turn.resume": options.state !== void 0
|
|
120
|
+
}
|
|
121
|
+
},
|
|
122
|
+
() => executor.createDriver(contributorContext, {
|
|
123
|
+
streaming,
|
|
124
|
+
...options.state !== void 0 ? { state: options.state } : {}
|
|
125
|
+
}),
|
|
126
|
+
this.logger
|
|
127
|
+
);
|
|
101
128
|
}
|
|
102
129
|
/**
|
|
103
130
|
* Create a TurnExecutor instance for executing the agent loop.
|
|
@@ -31,6 +31,7 @@ var import_message_queue = require("./message-queue.js");
|
|
|
31
31
|
var import_usage_metadata = require("../llm/usage-metadata.js");
|
|
32
32
|
var import_codex_base_url = require("../llm/providers/codex-base-url.js");
|
|
33
33
|
var import_errors2 = require("./errors.js");
|
|
34
|
+
var import_operation_span = require("../telemetry/operation-span.js");
|
|
34
35
|
class ChatSession {
|
|
35
36
|
/**
|
|
36
37
|
* Creates a new ChatSession instance.
|
|
@@ -426,19 +427,48 @@ class ChatSession {
|
|
|
426
427
|
const detachForwarders = this.attachRunEventForwarders(input.runContext);
|
|
427
428
|
try {
|
|
428
429
|
if (input.kind === "start") {
|
|
429
|
-
const modifiedParts = await
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
430
|
+
const modifiedParts = await (0, import_operation_span.recordOperationSpan)(
|
|
431
|
+
{
|
|
432
|
+
name: "chat_session.prepare_turn_input",
|
|
433
|
+
attributes: {
|
|
434
|
+
"session.id": this.id,
|
|
435
|
+
"turn.kind": input.kind
|
|
436
|
+
}
|
|
437
|
+
},
|
|
438
|
+
() => this.prepareTurnInput(input.content, signal, input.runContext),
|
|
439
|
+
this.logger
|
|
440
|
+
);
|
|
441
|
+
await (0, import_operation_span.recordOperationSpan)(
|
|
442
|
+
{
|
|
443
|
+
name: "chat_session.add_user_message",
|
|
444
|
+
attributes: {
|
|
445
|
+
"session.id": this.id,
|
|
446
|
+
"turn.kind": input.kind,
|
|
447
|
+
"message.parts": modifiedParts.length
|
|
448
|
+
}
|
|
449
|
+
},
|
|
450
|
+
() => this.llmService.getContextManager().addUserMessage(modifiedParts),
|
|
451
|
+
this.logger
|
|
433
452
|
);
|
|
434
|
-
await this.llmService.getContextManager().addUserMessage(modifiedParts);
|
|
435
453
|
}
|
|
436
|
-
const
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
454
|
+
const streaming = input.streaming ?? true;
|
|
455
|
+
const driver = await (0, import_operation_span.recordOperationSpan)(
|
|
456
|
+
{
|
|
457
|
+
name: "chat_session.create_llm_turn_driver",
|
|
458
|
+
attributes: {
|
|
459
|
+
"session.id": this.id,
|
|
460
|
+
"turn.kind": input.kind,
|
|
461
|
+
"turn.streaming": streaming
|
|
462
|
+
}
|
|
463
|
+
},
|
|
464
|
+
() => this.llmService.createTurnDriver({
|
|
465
|
+
signal,
|
|
466
|
+
streaming,
|
|
467
|
+
...input.runContext !== void 0 && { runContext: input.runContext },
|
|
468
|
+
...input.kind === "resume" ? { state: input.state } : {}
|
|
469
|
+
}),
|
|
470
|
+
this.logger
|
|
471
|
+
);
|
|
442
472
|
return this.wrapTurnDriver(driver, signal, input.runContext, detachForwarders);
|
|
443
473
|
} catch (error) {
|
|
444
474
|
if (input.kind === "start" && error instanceof import_errors.DextoRuntimeError && error.code === import_error_codes.HookErrorCode.HOOK_BLOCKED_EXECUTION && error.scope === import_errors.ErrorScope.HOOK && error.type === import_errors.ErrorType.FORBIDDEN) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-session.d.ts","sourceRoot":"","sources":["../../src/session/chat-session.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAA2B,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAC9F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EACH,eAAe,EACf,aAAa,EAGhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,qBAAqB,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAuB,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAOtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"chat-session.d.ts","sourceRoot":"","sources":["../../src/session/chat-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ import {
|
|
|
16
16
|
} from "../llm/usage-metadata.js";
|
|
17
17
|
import { parseCodexBaseURL } from "../llm/providers/codex-base-url.js";
|
|
18
18
|
import { SessionError } from "./errors.js";
|
|
19
|
+
import { recordOperationSpan } from "../telemetry/operation-span.js";
|
|
19
20
|
class ChatSession {
|
|
20
21
|
/**
|
|
21
22
|
* Creates a new ChatSession instance.
|
|
@@ -411,19 +412,48 @@ class ChatSession {
|
|
|
411
412
|
const detachForwarders = this.attachRunEventForwarders(input.runContext);
|
|
412
413
|
try {
|
|
413
414
|
if (input.kind === "start") {
|
|
414
|
-
const modifiedParts = await
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
415
|
+
const modifiedParts = await recordOperationSpan(
|
|
416
|
+
{
|
|
417
|
+
name: "chat_session.prepare_turn_input",
|
|
418
|
+
attributes: {
|
|
419
|
+
"session.id": this.id,
|
|
420
|
+
"turn.kind": input.kind
|
|
421
|
+
}
|
|
422
|
+
},
|
|
423
|
+
() => this.prepareTurnInput(input.content, signal, input.runContext),
|
|
424
|
+
this.logger
|
|
425
|
+
);
|
|
426
|
+
await recordOperationSpan(
|
|
427
|
+
{
|
|
428
|
+
name: "chat_session.add_user_message",
|
|
429
|
+
attributes: {
|
|
430
|
+
"session.id": this.id,
|
|
431
|
+
"turn.kind": input.kind,
|
|
432
|
+
"message.parts": modifiedParts.length
|
|
433
|
+
}
|
|
434
|
+
},
|
|
435
|
+
() => this.llmService.getContextManager().addUserMessage(modifiedParts),
|
|
436
|
+
this.logger
|
|
418
437
|
);
|
|
419
|
-
await this.llmService.getContextManager().addUserMessage(modifiedParts);
|
|
420
438
|
}
|
|
421
|
-
const
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
439
|
+
const streaming = input.streaming ?? true;
|
|
440
|
+
const driver = await recordOperationSpan(
|
|
441
|
+
{
|
|
442
|
+
name: "chat_session.create_llm_turn_driver",
|
|
443
|
+
attributes: {
|
|
444
|
+
"session.id": this.id,
|
|
445
|
+
"turn.kind": input.kind,
|
|
446
|
+
"turn.streaming": streaming
|
|
447
|
+
}
|
|
448
|
+
},
|
|
449
|
+
() => this.llmService.createTurnDriver({
|
|
450
|
+
signal,
|
|
451
|
+
streaming,
|
|
452
|
+
...input.runContext !== void 0 && { runContext: input.runContext },
|
|
453
|
+
...input.kind === "resume" ? { state: input.state } : {}
|
|
454
|
+
}),
|
|
455
|
+
this.logger
|
|
456
|
+
);
|
|
427
457
|
return this.wrapTurnDriver(driver, signal, input.runContext, detachForwarders);
|
|
428
458
|
} catch (error) {
|
|
429
459
|
if (input.kind === "start" && error instanceof DextoRuntimeError && error.code === HookErrorCode.HOOK_BLOCKED_EXECUTION && error.scope === ErrorScope.HOOK && error.type === ErrorType.FORBIDDEN) {
|
|
@@ -53,9 +53,12 @@ async function generateSessionTitle(config, userText, logger, opts = {}) {
|
|
|
53
53
|
});
|
|
54
54
|
const processed = postProcessTitle(result.text);
|
|
55
55
|
if (!processed) {
|
|
56
|
-
return {
|
|
56
|
+
return {
|
|
57
|
+
error: "LLM returned empty title",
|
|
58
|
+
usage: toSessionTitleTokenUsage(result.totalUsage)
|
|
59
|
+
};
|
|
57
60
|
}
|
|
58
|
-
return { title: processed };
|
|
61
|
+
return { title: processed, usage: toSessionTitleTokenUsage(result.totalUsage) };
|
|
59
62
|
} catch (error) {
|
|
60
63
|
if (controller?.signal.aborted) {
|
|
61
64
|
return { timedOut: true, error: "Timed out while waiting for LLM response" };
|
|
@@ -68,6 +71,20 @@ async function generateSessionTitle(config, userText, logger, opts = {}) {
|
|
|
68
71
|
}
|
|
69
72
|
}
|
|
70
73
|
}
|
|
74
|
+
function toSessionTitleTokenUsage(usage) {
|
|
75
|
+
const tokenUsage = {};
|
|
76
|
+
copyTokenUsageNumber(tokenUsage, "cachedInputTokens", usage.cachedInputTokens);
|
|
77
|
+
copyTokenUsageNumber(tokenUsage, "inputTokens", usage.inputTokens);
|
|
78
|
+
copyTokenUsageNumber(tokenUsage, "outputTokens", usage.outputTokens);
|
|
79
|
+
copyTokenUsageNumber(tokenUsage, "reasoningTokens", usage.reasoningTokens);
|
|
80
|
+
copyTokenUsageNumber(tokenUsage, "totalTokens", usage.totalTokens);
|
|
81
|
+
return tokenUsage;
|
|
82
|
+
}
|
|
83
|
+
function copyTokenUsageNumber(target, key, value) {
|
|
84
|
+
if (typeof value === "number" && Number.isFinite(value)) {
|
|
85
|
+
target[key] = value;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
71
88
|
function deriveHeuristicTitle(userText) {
|
|
72
89
|
const sanitized = sanitizeUserText(userText, 120);
|
|
73
90
|
if (!sanitized) return void 0;
|
|
@@ -1,10 +1,18 @@
|
|
|
1
1
|
import type { ValidatedLLMConfig } from '../llm/schemas.js';
|
|
2
2
|
import type { Logger } from '../logger/v2/types.js';
|
|
3
3
|
import type { DextoProviderContext, LanguageModelFactory } from '../llm/services/types.js';
|
|
4
|
+
export interface GenerateSessionTitleTokenUsage {
|
|
5
|
+
cachedInputTokens?: number;
|
|
6
|
+
inputTokens?: number;
|
|
7
|
+
outputTokens?: number;
|
|
8
|
+
reasoningTokens?: number;
|
|
9
|
+
totalTokens?: number;
|
|
10
|
+
}
|
|
4
11
|
export interface GenerateSessionTitleResult {
|
|
5
12
|
title?: string;
|
|
6
13
|
error?: string;
|
|
7
14
|
timedOut?: boolean;
|
|
15
|
+
usage?: GenerateSessionTitleTokenUsage;
|
|
8
16
|
}
|
|
9
17
|
/**
|
|
10
18
|
* Generate a concise title for a chat based on the first user message.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"title-generator.d.ts","sourceRoot":"","sources":["../../src/session/title-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAI3F,MAAM,WAAW,0BAA0B;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"title-generator.d.ts","sourceRoot":"","sources":["../../src/session/title-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAI3F,MAAM,WAAW,8BAA8B;IAC3C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,0BAA0B;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,8BAA8B,CAAC;CAC1C;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,kBAAkB,EAC1B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;IACF,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,eAAe,CAAC,EAAE,oBAAoB,CAAC;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;CACjB,GACP,OAAO,CAAC,0BAA0B,CAAC,CAmDrC;AAsBD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CA8BzE"}
|
|
@@ -30,9 +30,12 @@ async function generateSessionTitle(config, userText, logger, opts = {}) {
|
|
|
30
30
|
});
|
|
31
31
|
const processed = postProcessTitle(result.text);
|
|
32
32
|
if (!processed) {
|
|
33
|
-
return {
|
|
33
|
+
return {
|
|
34
|
+
error: "LLM returned empty title",
|
|
35
|
+
usage: toSessionTitleTokenUsage(result.totalUsage)
|
|
36
|
+
};
|
|
34
37
|
}
|
|
35
|
-
return { title: processed };
|
|
38
|
+
return { title: processed, usage: toSessionTitleTokenUsage(result.totalUsage) };
|
|
36
39
|
} catch (error) {
|
|
37
40
|
if (controller?.signal.aborted) {
|
|
38
41
|
return { timedOut: true, error: "Timed out while waiting for LLM response" };
|
|
@@ -45,6 +48,20 @@ async function generateSessionTitle(config, userText, logger, opts = {}) {
|
|
|
45
48
|
}
|
|
46
49
|
}
|
|
47
50
|
}
|
|
51
|
+
function toSessionTitleTokenUsage(usage) {
|
|
52
|
+
const tokenUsage = {};
|
|
53
|
+
copyTokenUsageNumber(tokenUsage, "cachedInputTokens", usage.cachedInputTokens);
|
|
54
|
+
copyTokenUsageNumber(tokenUsage, "inputTokens", usage.inputTokens);
|
|
55
|
+
copyTokenUsageNumber(tokenUsage, "outputTokens", usage.outputTokens);
|
|
56
|
+
copyTokenUsageNumber(tokenUsage, "reasoningTokens", usage.reasoningTokens);
|
|
57
|
+
copyTokenUsageNumber(tokenUsage, "totalTokens", usage.totalTokens);
|
|
58
|
+
return tokenUsage;
|
|
59
|
+
}
|
|
60
|
+
function copyTokenUsageNumber(target, key, value) {
|
|
61
|
+
if (typeof value === "number" && Number.isFinite(value)) {
|
|
62
|
+
target[key] = value;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
48
65
|
function deriveHeuristicTitle(userText) {
|
|
49
66
|
const sanitized = sanitizeUserText(userText, 120);
|
|
50
67
|
if (!sanitized) return void 0;
|
|
@@ -29,6 +29,7 @@ var import_promises = require("fs/promises");
|
|
|
29
29
|
var import_path = require("path");
|
|
30
30
|
var import_errors = require("./errors.js");
|
|
31
31
|
var import_DextoRuntimeError = require("../errors/DextoRuntimeError.js");
|
|
32
|
+
var import_operation_span = require("../telemetry/operation-span.js");
|
|
32
33
|
class StaticContributor {
|
|
33
34
|
constructor(id, priority, content) {
|
|
34
35
|
this.id = id;
|
|
@@ -203,7 +204,15 @@ class SkillsContributor {
|
|
|
203
204
|
logger;
|
|
204
205
|
async getContent(_context) {
|
|
205
206
|
try {
|
|
206
|
-
const skills = await
|
|
207
|
+
const skills = await (0, import_operation_span.recordOperationSpan)(
|
|
208
|
+
{
|
|
209
|
+
name: "skills.list",
|
|
210
|
+
componentName: "SkillsContributor",
|
|
211
|
+
resultAttributes: (skills2) => ({ "skills.count": skills2.length })
|
|
212
|
+
},
|
|
213
|
+
() => this.skillManager.list(),
|
|
214
|
+
this.logger
|
|
215
|
+
);
|
|
207
216
|
if (skills.length === 0) {
|
|
208
217
|
return "";
|
|
209
218
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contributors.d.ts","sourceRoot":"","sources":["../../src/systemPrompt/contributors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAGhF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"contributors.d.ts","sourceRoot":"","sources":["../../src/systemPrompt/contributors.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { readFile, stat } from "fs/promises";
|
|
|
3
3
|
import { resolve, extname } from "path";
|
|
4
4
|
import { SystemPromptError } from "./errors.js";
|
|
5
5
|
import { DextoRuntimeError } from "../errors/DextoRuntimeError.js";
|
|
6
|
+
import { recordOperationSpan } from "../telemetry/operation-span.js";
|
|
6
7
|
class StaticContributor {
|
|
7
8
|
constructor(id, priority, content) {
|
|
8
9
|
this.id = id;
|
|
@@ -177,7 +178,15 @@ class SkillsContributor {
|
|
|
177
178
|
logger;
|
|
178
179
|
async getContent(_context) {
|
|
179
180
|
try {
|
|
180
|
-
const skills = await
|
|
181
|
+
const skills = await recordOperationSpan(
|
|
182
|
+
{
|
|
183
|
+
name: "skills.list",
|
|
184
|
+
componentName: "SkillsContributor",
|
|
185
|
+
resultAttributes: (skills2) => ({ "skills.count": skills2.length })
|
|
186
|
+
},
|
|
187
|
+
() => this.skillManager.list(),
|
|
188
|
+
this.logger
|
|
189
|
+
);
|
|
181
190
|
if (skills.length === 0) {
|
|
182
191
|
return "";
|
|
183
192
|
}
|
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var browser_exports = {};
|
|
20
|
+
__export(browser_exports, {
|
|
21
|
+
Telemetry: () => Telemetry
|
|
22
|
+
});
|
|
23
|
+
module.exports = __toCommonJS(browser_exports);
|
|
24
|
+
var import_api = require("@opentelemetry/api");
|
|
25
|
+
function isGlobalTelemetryLike(value) {
|
|
26
|
+
if (typeof value !== "object" || value === null) {
|
|
27
|
+
return false;
|
|
28
|
+
}
|
|
29
|
+
return typeof Reflect.get(value, "forceFlush") === "function" && typeof Reflect.get(value, "isInitialized") === "function" && typeof Reflect.get(value, "name") === "string" && typeof Reflect.get(value, "shutdown") === "function" && Reflect.get(value, "tracer") !== void 0;
|
|
30
|
+
}
|
|
31
|
+
class Telemetry {
|
|
32
|
+
tracer;
|
|
33
|
+
name;
|
|
34
|
+
_isInitialized;
|
|
35
|
+
_shutdownHandler;
|
|
36
|
+
static _initPromise;
|
|
37
|
+
constructor(config, options) {
|
|
38
|
+
const serviceName = config.serviceName ?? "dexto-service";
|
|
39
|
+
const tracerName = config.tracerName ?? serviceName;
|
|
40
|
+
this.name = serviceName;
|
|
41
|
+
this.tracer = import_api.trace.getTracer(tracerName);
|
|
42
|
+
this._shutdownHandler = options.shutdown;
|
|
43
|
+
this._isInitialized = options.initialized;
|
|
44
|
+
}
|
|
45
|
+
static async registerGlobal(options = {}) {
|
|
46
|
+
const existing = Telemetry.getGlobalInstance();
|
|
47
|
+
if (existing !== void 0) {
|
|
48
|
+
return existing;
|
|
49
|
+
}
|
|
50
|
+
if (Telemetry._initPromise !== void 0) {
|
|
51
|
+
return Telemetry._initPromise;
|
|
52
|
+
}
|
|
53
|
+
Telemetry._initPromise = Promise.resolve().then(() => {
|
|
54
|
+
const current = Telemetry.getGlobalInstance();
|
|
55
|
+
if (current !== void 0) {
|
|
56
|
+
return current;
|
|
57
|
+
}
|
|
58
|
+
const telemetry = new Telemetry(options.config ?? {}, {
|
|
59
|
+
initialized: options.initialized ?? true,
|
|
60
|
+
...options.shutdown !== void 0 && { shutdown: options.shutdown }
|
|
61
|
+
});
|
|
62
|
+
Telemetry.setGlobalInstance(telemetry);
|
|
63
|
+
return telemetry;
|
|
64
|
+
});
|
|
65
|
+
return Telemetry._initPromise;
|
|
66
|
+
}
|
|
67
|
+
static getActiveSpan() {
|
|
68
|
+
return import_api.trace.getActiveSpan();
|
|
69
|
+
}
|
|
70
|
+
static get() {
|
|
71
|
+
const telemetry = Telemetry.getGlobalInstance();
|
|
72
|
+
if (telemetry === void 0) {
|
|
73
|
+
throw new Error("Telemetry not initialized. Call Telemetry.registerGlobal() first.");
|
|
74
|
+
}
|
|
75
|
+
return telemetry;
|
|
76
|
+
}
|
|
77
|
+
static hasGlobalInstance() {
|
|
78
|
+
return Telemetry.getGlobalInstance() !== void 0;
|
|
79
|
+
}
|
|
80
|
+
static async shutdownGlobal() {
|
|
81
|
+
const telemetry = Telemetry.getGlobalInstance();
|
|
82
|
+
if (telemetry !== void 0) {
|
|
83
|
+
await telemetry.shutdown();
|
|
84
|
+
}
|
|
85
|
+
Telemetry.setGlobalInstance(void 0);
|
|
86
|
+
Telemetry._initPromise = void 0;
|
|
87
|
+
}
|
|
88
|
+
static setBaggage(baggage, ctx = import_api.context.active()) {
|
|
89
|
+
const currentBaggage = Object.fromEntries(
|
|
90
|
+
import_api.propagation.getBaggage(ctx)?.getAllEntries() ?? []
|
|
91
|
+
);
|
|
92
|
+
return import_api.propagation.setBaggage(
|
|
93
|
+
ctx,
|
|
94
|
+
import_api.propagation.createBaggage({
|
|
95
|
+
...currentBaggage,
|
|
96
|
+
...baggage
|
|
97
|
+
})
|
|
98
|
+
);
|
|
99
|
+
}
|
|
100
|
+
static withContext(ctx, fn) {
|
|
101
|
+
return import_api.context.with(ctx, fn);
|
|
102
|
+
}
|
|
103
|
+
isInitialized() {
|
|
104
|
+
return this._isInitialized;
|
|
105
|
+
}
|
|
106
|
+
async forceFlush() {
|
|
107
|
+
const provider = import_api.trace.getTracerProvider();
|
|
108
|
+
const forceFlush = Reflect.get(provider, "forceFlush");
|
|
109
|
+
if (typeof forceFlush === "function") {
|
|
110
|
+
await Reflect.apply(forceFlush, provider, []);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
async shutdown() {
|
|
114
|
+
try {
|
|
115
|
+
await this._shutdownHandler?.();
|
|
116
|
+
} finally {
|
|
117
|
+
this._isInitialized = false;
|
|
118
|
+
this._shutdownHandler = void 0;
|
|
119
|
+
Telemetry.setGlobalInstance(void 0);
|
|
120
|
+
Telemetry._initPromise = void 0;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
static getGlobalInstance() {
|
|
124
|
+
const telemetry = Reflect.get(globalThis, "__TELEMETRY__");
|
|
125
|
+
return isGlobalTelemetryLike(telemetry) ? telemetry : void 0;
|
|
126
|
+
}
|
|
127
|
+
static setGlobalInstance(telemetry) {
|
|
128
|
+
if (telemetry === void 0) {
|
|
129
|
+
Reflect.deleteProperty(globalThis, "__TELEMETRY__");
|
|
130
|
+
return;
|
|
131
|
+
}
|
|
132
|
+
Reflect.set(globalThis, "__TELEMETRY__", telemetry);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
136
|
+
0 && (module.exports = {
|
|
137
|
+
Telemetry
|
|
138
|
+
});
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import type { BaggageEntry, Context, Tracer } from '@opentelemetry/api';
|
|
2
|
+
import type { OtelConfiguration } from './schemas.js';
|
|
3
|
+
export type TelemetryShutdownHandler = () => Promise<void>;
|
|
4
|
+
export type TelemetryRegistrationOptions = {
|
|
5
|
+
config?: OtelConfiguration | undefined;
|
|
6
|
+
initialized?: boolean | undefined;
|
|
7
|
+
shutdown?: TelemetryShutdownHandler | undefined;
|
|
8
|
+
};
|
|
9
|
+
export type BrowserTelemetryInstance = Pick<Telemetry, 'forceFlush' | 'isInitialized' | 'name' | 'shutdown' | 'tracer'>;
|
|
10
|
+
export declare class Telemetry {
|
|
11
|
+
tracer: Tracer;
|
|
12
|
+
name: string;
|
|
13
|
+
private _isInitialized;
|
|
14
|
+
private _shutdownHandler?;
|
|
15
|
+
private static _initPromise?;
|
|
16
|
+
private constructor();
|
|
17
|
+
static registerGlobal(options?: TelemetryRegistrationOptions): Promise<BrowserTelemetryInstance>;
|
|
18
|
+
static getActiveSpan(): import("@opentelemetry/api").Span | undefined;
|
|
19
|
+
static get(): BrowserTelemetryInstance;
|
|
20
|
+
static hasGlobalInstance(): boolean;
|
|
21
|
+
static shutdownGlobal(): Promise<void>;
|
|
22
|
+
static setBaggage(baggage: Record<string, BaggageEntry>, ctx?: Context): Context;
|
|
23
|
+
static withContext<T>(ctx: Context, fn: () => T): T;
|
|
24
|
+
isInitialized(): boolean;
|
|
25
|
+
forceFlush(): Promise<void>;
|
|
26
|
+
shutdown(): Promise<void>;
|
|
27
|
+
private static getGlobalInstance;
|
|
28
|
+
private static setGlobalInstance;
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=browser.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../src/telemetry/browser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,MAAM,MAAM,wBAAwB,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;AAE3D,MAAM,MAAM,4BAA4B,GAAG;IACvC,MAAM,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACvC,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,EAAE,wBAAwB,GAAG,SAAS,CAAC;CACnD,CAAC;AAOF,MAAM,MAAM,wBAAwB,GAAG,IAAI,CACvC,SAAS,EACT,YAAY,GAAG,eAAe,GAAG,MAAM,GAAG,UAAU,GAAG,QAAQ,CAClE,CAAC;AAgBF,qBAAa,SAAS;IACX,MAAM,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,gBAAgB,CAAC,CAAuC;IAChE,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAgD;IAE5E,OAAO;WAUM,cAAc,CACvB,OAAO,GAAE,4BAAiC,GAC3C,OAAO,CAAC,wBAAwB,CAAC;IA2BpC,MAAM,CAAC,aAAa;IAIpB,MAAM,CAAC,GAAG,IAAI,wBAAwB;IAQtC,MAAM,CAAC,iBAAiB,IAAI,OAAO;WAItB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAS5C,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,GAAE,OAA8B;IAa5F,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAI5C,aAAa,IAAI,OAAO;IAIlB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAWtC,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAKhC,OAAO,CAAC,MAAM,CAAC,iBAAiB;CAOnC"}
|