Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions internal/assistant/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ const (
jsonTextKey = "text"
jsonThinkingKey = "thinking"
jsonDisplayKey = "display"
jsonUsageKey = "usage"
jsonUserRole = "user"
functionToolType = "function"
functionCallType = "function_call"
Expand Down
51 changes: 50 additions & 1 deletion internal/assistant/lifecycle.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,18 @@ func (runtime *Runtime) dispatchTurnErrorLifecycle(
runtime.dispatchLifecycle(ctx, extension.LifecycleAgentEnd, payload)
}

func (runtime *Runtime) dispatchContextBuild(
ctx context.Context,
sessionID string,
cwd string,
systemPrompt string,
messages []database.MessageEntity,
usage model.TokenUsage,
) {
payload := contextBuildLifecyclePayload(sessionID, cwd, systemPrompt, messages, usage)
runtime.dispatchLifecycle(ctx, extension.LifecycleContextBuild, payload)
}
Comment thread
omarluq marked this conversation as resolved.

func promptLifecyclePayload(request *PromptRequest) map[string]any {
if request == nil {
return map[string]any{}
Expand Down Expand Up @@ -185,7 +197,7 @@ func turnEndLifecyclePayload(
"cached": cached,
lifecycleErrorKey: "",
jsonSessionIDKey: sessionID,
"usage": tokenUsageLifecyclePayload(usage),
jsonUsageKey: tokenUsageLifecyclePayload(usage),
lifecycleUserEntryIDKey: userEntryID,
}
if turnErr != nil {
Expand All @@ -195,6 +207,43 @@ func turnEndLifecyclePayload(
return payload
}

func contextBuildLifecyclePayload(
sessionID string,
cwd string,
systemPrompt string,
messages []database.MessageEntity,
usage model.TokenUsage,
) map[string]any {
return map[string]any{
lifecycleCWDKey: cwd,
jsonSessionIDKey: sessionID,
"message_count": len(messages),
"system_tokens": estimateTokens(systemPrompt),
"message_tokens": estimateMessageTokens(messages),
jsonUsageKey: tokenUsageLifecyclePayload(usage),
"model_facing_roles": modelFacingRoleCounts(messages),
}
}

func estimateMessageTokens(messages []database.MessageEntity) int {
tokens := 0
for index := range messages {
tokens += estimateTokens(messages[index].Content)
}

return tokens
}

func modelFacingRoleCounts(messages []database.MessageEntity) map[string]int {
counts := map[string]int{}
for index := range messages {
role := string(messages[index].Role)
counts[role]++
}

return counts
}

func entryLifecyclePayload(entry *database.EntryEntity) map[string]any {
return map[string]any{
lifecycleCreatedAtKey: entry.CreatedAt.Format(timeFormatRFC3339Nano),
Expand Down
1 change: 1 addition & 0 deletions internal/assistant/runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,7 @@ func (runtime *Runtime) modelResponse(
}

estimatedUsage := estimateTokenUsage(systemPrompt, messages, &selectedModel)
runtime.dispatchContextBuild(ctx, sessionID, cwd, systemPrompt, messages, estimatedUsage)
runtime.emitUsage(ctx, onEvent, estimatedUsage)
request := &CompletionRequest{
Model: selectedModel,
Expand Down
3 changes: 3 additions & 0 deletions internal/assistant/runtime_lifecycle_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ local names = {
"before_agent_start",
"agent_start",
"turn_start",
"context_build",
"message_append",
"turn_end",
"agent_end",
Expand Down Expand Up @@ -75,6 +76,7 @@ func TestRuntime_PromptEmitsOrderedSessionTurnLifecycleEvents(t *testing.T) {
"before_agent_start|||session",
"agent_start|||session",
"turn_start|||session",
"context_build|||session",
"message_append|assistant||session",
"turn_end|||session",
"agent_end|||session",
Expand All @@ -92,6 +94,7 @@ func TestRuntime_PromptEmitsOrderedSessionTurnLifecycleEvents(t *testing.T) {
"before_agent_start|||session",
"agent_start|||session",
"turn_start|||session",
"context_build|||session",
"turn_end||error|session",
"agent_end||error|session",
}},
Expand Down
4 changes: 2 additions & 2 deletions internal/assistant/usage_events.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ func (runtime *Runtime) emitUsage(ctx context.Context, onEvent func(StreamEvent)
jsonInputTokensKey: usage.InputTokens,
jsonOutputTokensKey: usage.OutputTokens,
}
runtime.emit(ctx, "usage", payload)
runtime.emit(ctx, jsonUsageKey, payload)
if runtime.extensions != nil {
if err := runtime.extensions.Emit(ctx, "usage", payload); err != nil {
if err := runtime.extensions.Emit(ctx, jsonUsageKey, payload); err != nil {
runtime.logger.Debug("emit usage extension event failed", "error", err)
}
}
Expand Down
Loading