lzh/picoclaw
1
0
Fork 0
mirror of https://github.com/sipeed/picoclaw.git synced 2026-06-12 18:08:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2985 from chengzhichao-xydt/codex/context-show-summarize-threshold

Browse Source 
fix(context): show both summarize and compress thresholds in /context
This commit is contained in:
Mauro
2026-06-05 19:24:54 +02:00
committed by GitHub
parent 0b7aaac2b2 7a7e205cc8
commit b10f9cdf18
15 changed files with 99 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/agent/agent_command.go
+7 -5
View File
@@ -350,11 +350,13 @@ func (al *AgentLoop) buildCommandsRuntime(
}
history := agent.Sessions.GetHistory(opts.SessionKey)
return &commands.ContextStats{
UsedTokens: usage.UsedTokens,
TotalTokens: usage.TotalTokens,
CompressAtTokens: usage.CompressAtTokens,
UsedPercent: usage.UsedPercent,
MessageCount: len(history),
UsedTokens: usage.UsedTokens,
TotalTokens: usage.TotalTokens,
HistoryTokens: usage.HistoryTokens,
CompressAtTokens: usage.CompressAtTokens,
SummarizeAtTokens: usage.SummarizeAtTokens,
UsedPercent: usage.UsedPercent,
MessageCount: len(history),
}
}
}
pkg/agent/context_usage.go
+17 -4
View File
@@ -61,6 +61,17 @@ func computeContextUsage(agent *AgentInstance, sessionKey string) *bus.ContextUs
// proactive trigger (msgTokens + toolTokens + maxTokens > contextWindow).
compressAt := effectiveWindow
// summarizeAt = soft summarization trigger: matches maybeSummarize's
// threshold (contextWindow * SummarizeTokenPercent / 100).
//
// The engine compares this against history-message tokens ONLY (not
// UsedTokens). HistoryTokens is exposed alongside UsedTokens so the
// UI can show both values and avoid user confusion.
summarizeAt := contextWindow * agent.SummarizeTokenPercent / 100
if summarizeAt <= 0 {
summarizeAt = compressAt
}
usedPercent := 0
if compressAt > 0 {
usedPercent = usedTokens * 100 / compressAt
@@ -70,9 +81,11 @@ func computeContextUsage(agent *AgentInstance, sessionKey string) *bus.ContextUs
}
return &bus.ContextUsage{
UsedTokens: usedTokens,
TotalTokens: contextWindow,
CompressAtTokens: compressAt,
UsedPercent: usedPercent,
UsedTokens: usedTokens,
TotalTokens: contextWindow,
HistoryTokens: historyTokens,
CompressAtTokens: compressAt,
SummarizeAtTokens: summarizeAt,
UsedPercent: usedPercent,
}
}
pkg/bus/types.go
+6 -4
View File
@@ -64,10 +64,12 @@ type OutboundScope struct {
// ContextUsage describes how much of the model's context window the current
// session consumes, and how far it is from triggering compression.
type ContextUsage struct {
UsedTokens int `json:"used_tokens"`
TotalTokens int `json:"total_tokens"` // model context window
CompressAtTokens int `json:"compress_at_tokens"` // threshold that triggers compression
UsedPercent int `json:"used_percent"` // 0-100
UsedTokens int `json:"used_tokens"`
TotalTokens int `json:"total_tokens"` // model context window
HistoryTokens int `json:"history_tokens"` // history-message tokens only (what maybeSummarize checks)
CompressAtTokens int `json:"compress_at_tokens"` // hard budget compression threshold (contextWindow - maxTokens)
SummarizeAtTokens int `json:"summarize_at_tokens"` // soft summarization trigger (vs history tokens)
UsedPercent int `json:"used_percent"` // 0-100, relative to compressAt
}
type OutboundMessage struct {
pkg/channels/pico/pico.go
+6 -4
View File
@@ -1394,10 +1394,12 @@ func setContextUsagePayload(payload map[string]any, u *bus.ContextUsage) {
return
}
payload["context_usage"] = map[string]any{
"used_tokens": u.UsedTokens,
"total_tokens": u.TotalTokens,
"compress_at_tokens": u.CompressAtTokens,
"used_percent": u.UsedPercent,
"used_tokens": u.UsedTokens,
"total_tokens": u.TotalTokens,
"history_tokens": u.HistoryTokens,
"compress_at_tokens": u.CompressAtTokens,
"summarize_at_tokens": u.SummarizeAtTokens,
"used_percent": u.UsedPercent,
}
}
pkg/channels/pico/pico_test.go
+12 -4
View File
@@ -602,10 +602,12 @@ func TestBeginStream_FinalizeIncludesContextUsage(t *testing.T) {
t.Fatal("streamer should support FinalizeWithContext")
}
if err := contextStreamer.FinalizeWithContext(context.Background(), "final", &bus.ContextUsage{
UsedTokens: 10,
TotalTokens: 100,
CompressAtTokens: 80,
UsedPercent: 10,
UsedTokens: 10,
TotalTokens: 100,
HistoryTokens: 5,
CompressAtTokens: 80,
SummarizeAtTokens: 60,
UsedPercent: 10,
}); err != nil {
t.Fatalf("FinalizeWithContext() error = %v", err)
}
@@ -627,6 +629,12 @@ func TestBeginStream_FinalizeIncludesContextUsage(t *testing.T) {
if got := rawUsage["used_tokens"]; got != float64(10) {
t.Fatalf("used_tokens = %#v, want 10", got)
}
if got := rawUsage["history_tokens"]; got != float64(5) {
t.Fatalf("history_tokens = %#v, want 5", got)
}
if got := rawUsage["summarize_at_tokens"]; got != float64(60) {
t.Fatalf("summarize_at_tokens = %#v, want 60", got)
}
}
func TestCreateAndAddConnection_RespectsMaxConnectionsConcurrently(t *testing.T) {
pkg/commands/cmd_context.go
+5 -2
View File
@@ -29,14 +29,17 @@ func formatContextStats(s *ContextStats) string {
remaining = 0
}
usedWindowPercent := s.UsedTokens * 100 / max(s.TotalTokens, 1)
return fmt.Sprintf(
"Context usage \nMessages: %d \nUsed: ~%d / %d tokens (%d%%) \nCompress at: %d tokens \nCompression progress: %d%% \nRemaining: ~%d tokens",
msg := fmt.Sprintf(
"Context usage \nMessages: %d \nUsed: ~%d / %d tokens (%d%%) \nHistory: ~%d tokens \nCompress at: %d tokens \nSummarize at: %d tokens \nCompression progress: %d%% \nRemaining: ~%d tokens",
s.MessageCount,
s.UsedTokens,
s.TotalTokens,
usedWindowPercent,
s.HistoryTokens,
s.CompressAtTokens,
s.SummarizeAtTokens,
s.UsedPercent,
remaining,
)
return msg
}
pkg/commands/runtime.go
+7 -5
View File
@@ -29,11 +29,13 @@ type MCPToolInfo struct {
// ContextStats describes current session context window usage.
type ContextStats struct {
UsedTokens int
TotalTokens int // model context window
CompressAtTokens int // compression threshold
UsedPercent int // 0-100
MessageCount int
UsedTokens int
TotalTokens int // model context window
HistoryTokens int // history-only tokens (what maybeSummarize checks)
CompressAtTokens int // hard budget compression threshold
SummarizeAtTokens int // soft summarization trigger
UsedPercent int // 0-100
MessageCount int
}
// StopResult describes the outcome of a stop request for the current session.
web/frontend/src/components/chat/context-usage-ring.tsx
+25
View File
@@ -145,6 +145,31 @@ export function ContextUsageRing({
/>
</div>
<div className="mt-2 space-y-0.5">
{usage.history_tokens != null && usage.history_tokens > 0 && (
<div className="flex items-center justify-between text-[10px]">
<span className="text-muted-foreground">History</span>
<span className="tabular-nums">
{formatTokens(usage.history_tokens)}
</span>
</div>
)}
<div className="flex items-center justify-between text-[10px]">
<span className="text-muted-foreground">{t("chat.contextCompressAt")}</span>
<span className="tabular-nums">
{formatTokens(usage.compress_at_tokens)}
</span>
</div>
{usage.summarize_at_tokens != null && usage.summarize_at_tokens > 0 && (
<div className="flex items-center justify-between text-[10px]">
<span className="text-muted-foreground">{t("chat.contextSummarizeAt")}</span>
<span className="tabular-nums">
{formatTokens(usage.summarize_at_tokens)}
</span>
</div>
)}
</div>
<button
type="button"
onClick={handleDetail}
web/frontend/src/features/chat/protocol.ts
+2
View File
@@ -78,7 +78,9 @@ function parseContextUsage(
return {
used_tokens: used,
total_tokens: total,
history_tokens: obj.history_tokens != null ? Number(obj.history_tokens) : undefined,
compress_at_tokens: Number(obj.compress_at_tokens) || 0,
summarize_at_tokens: obj.summarize_at_tokens != null ? Number(obj.summarize_at_tokens) : undefined,
used_percent: Number(obj.used_percent) || 0,
}
}
web/frontend/src/i18n/locales/bn-in.json
+2
View File
@@ -96,6 +96,8 @@
"sendHint": "পাঠাতে Enter চাপুন\nনতুন লাইনের জন্য Shift + Enter",
"contextTitle": "প্রসঙ্গ",
"contextDetail": "বিস্তারিত দেখুন",
"contextCompressAt": "Compress at",
"contextSummarizeAt": "Summarize at",
"attachImage": "ছবি যোগ করুন",
"removeImage": "ছবি সরান",
"uploadedImage": "আপলোড করা ছবি",
web/frontend/src/i18n/locales/cs.json
+2
View File
@@ -94,6 +94,8 @@
"sendHint": "Enter pro odeslání\nShift + Enter pro nový řádek",
"contextTitle": "Kontext",
"contextDetail": "Zobrazit detail",
"contextCompressAt": "Komprimovat při",
"contextSummarizeAt": "Shrnout při",
"attachImage": "Přidat obrázky",
"dropImagesActive": "Uvolněním přidáte obrázky",
"removeImage": "Odebrat obrázek",
web/frontend/src/i18n/locales/en.json
+2
View File
@@ -96,6 +96,8 @@
"sendHint": "Press Enter to send\nShift + Enter for a new line",
"contextTitle": "Context",
"contextDetail": "View Details",
"contextCompressAt": "Compress at",
"contextSummarizeAt": "Summarize at",
"attachImage": "Add images",
"dropImagesActive": "Release to add images",
"removeImage": "Remove image",
web/frontend/src/i18n/locales/pt-br.json
+2
View File
@@ -96,6 +96,8 @@
"sendHint": "Pressione Enter para enviar\nShift + Enter para nova linha",
"contextTitle": "Contexto",
"contextDetail": "Ver Detalhes",
"contextCompressAt": "Comprimir em",
"contextSummarizeAt": "Resumir em",
"attachImage": "Adicionar imagens",
"dropImagesActive": "Solte para adicionar imagens",
"removeImage": "Remover imagem",
web/frontend/src/i18n/locales/zh.json
+2
View File
@@ -96,6 +96,8 @@
"sendHint": "按 Enter 发送\nShift + Enter 换行",
"contextTitle": "上下文",
"contextDetail": "查看详情",
"contextCompressAt": "压缩阈值",
"contextSummarizeAt": "摘要阈值",
"attachImage": "添加图片",
"dropImagesActive": "松开以添加图片",
"removeImage": "移除图片",
web/frontend/src/store/chat.ts
+2
View File
@@ -52,7 +52,9 @@ export interface ChatMessage {
export interface ContextUsage {
used_tokens: number
total_tokens: number
history_tokens?: number
compress_at_tokens: number
summarize_at_tokens?: number
used_percent: number
}