Feat/tui2 phase3 parity #187
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,8 @@ import ( | |
| "time" | ||
|
|
||
| "go.opentelemetry.io/otel/attribute" | ||
|
|
||
| "github.com/buchenberg/yaah/internal/tools" | ||
| "go.opentelemetry.io/otel/trace" | ||
|
|
||
| "github.com/buchenberg/yaah/internal/observability" | ||
|
|
@@ -48,6 +50,14 @@ func (c *Client) runStream(ctx context.Context, sp StreamProvider, req types.Cha | |
| observability.RecordStreamEnd(streamSpan, path, finishReason, usageCaptured, len(msg.Content), len(msg.ToolCalls)) | ||
| } | ||
|
|
||
| var lastHeartbeat time.Time | ||
| emitHeartbeat := func() { | ||
| if time.Since(lastHeartbeat) > 5*time.Second { | ||
| tools.SendHeartbeat(ctx) | ||
| lastHeartbeat = time.Now() | ||
| } | ||
| } | ||
|
Comment on lines
+53
to
+59
There was a problem hiding this comment. 🩺 Stability & Availability | 🟠 Major | ⚡ Quick win 🧩 Analysis chain🏁 Script executed: #!/bin/bash
set -eu
echo '--- outline ---'
ast-grep outline internal/agent/llm/stream.go --view expanded || true
echo '--- stream.go relevant ranges ---'
nl -ba internal/agent/llm/stream.go | sed -n '1,180p'
echo '--- heartbeat and stream symbols ---'
rg -n -C 4 'SendStream|SendHeartbeat|emitHeartbeat|Reason|reason|tool.?call|delta|Heartbeat' internal/agent internal 2>/dev/null | head -n 500Repository: buchenberg/yaah Length of output: 39292 🏁 Script executed: #!/bin/bash
set -eu
printf '%s\n' '--- stream.go ---'
sed -n '1,180p' internal/agent/llm/stream.go
printf '%s\n' '--- relevant definitions and call sites ---'
rg -n -C 6 'func .*Send(Stream|Heartbeat)|SendStream|SendHeartbeat|emitHeartbeat|Stream' internal/agent internal 2>/dev/null | head -n 600Repository: buchenberg/yaah Length of output: 42601 🏁 Script executed: #!/bin/bash
set -eu
echo '--- target file ---'
nl -ba internal/agent/llm/stream.go | sed -n '1,180p'
echo '--- symbols ---'
rg -n -C 5 'SendStream|SendHeartbeat|emitHeartbeat|type .*Delta|Reasoning|ToolCall|heartbeat' internal/agent internal 2>/dev/null | head -n 600Repository: buchenberg/yaah Length of output: 40463 🏁 Script executed: #!/bin/bash
set -eu
printf '%s\n' '--- target ---'
nl -ba internal/agent/llm/stream.go | sed -n '1,180p'
printf '%s\n' '--- related definitions ---'
rg -n -C 8 'SendStream|SendHeartbeat|emitHeartbeat|Heartbeat|Reasoning|ToolCall|Stream' internal/agent internal 2>/dev/null | head -n 800Repository: buchenberg/yaah Length of output: 50371 🏁 Script executed: #!/bin/bash
set -eu
git ls-files | rg '(^|/)(stream|.*agent.*|.*llm.*)' | head -n 200
nl -ba internal/agent/llm/stream.go | sed -n '1,180p'
rg -n -C 8 'SendStream|SendHeartbeat|emitHeartbeat|Heartbeat|Reasoning|ToolCall' . --glob '!vendor/**' --glob '!node_modules/**' | head -n 800Repository: buchenberg/yaah Length of output: 50373 🌐 Web query:
💡 Result: The concept of emitting heartbeats independently of content deltas—often implemented as SendHeartbeat or similar mechanisms—is a common design pattern used in streaming applications (such as Server-Sent Events, WebSockets, or gRPC streams) to maintain connection liveness and prevent timeouts [1][2][3][4]. Key characteristics of this pattern include: 1. Protocol Liveness: When a stream is idle (e.g., waiting for a slow upstream process like LLM reasoning), intermediaries like proxies, load balancers, or firewalls may close the connection due to inactivity [1][3][5]. Emitting a synthetic heartbeat (e.g., an SSE comment frame like: keepalive or: prefill) at regular intervals ensures the TCP connection remains active without interfering with the actual content stream, as these comments are specified to be ignored by clients [1][3][6][4]. 2. Independent Cadence: Heartbeats are often generated by a separate timer or goroutine that monitors for inactivity [2][7][4]. This ticker is typically gated by the actual transmission of data; if a visible chunk is sent, the heartbeat timer is reset [1][3][6][4]. This ensures heartbeats are emitted only during silent windows and never interleave with or corrupt real data payloads [1][7][4]. 3. Implementation Variations: - Streaming APIs: In systems like SSE or custom streaming protocols, this involves injecting non-functional frames (comments or empty-delta chunks) during idle periods [1][3][5][4]. - Request-Response Heartbeats: In some control-plane protocols, SendHeartbeat may require an explicit acknowledgment (ACK) from the peer to verify the connection is healthy, triggering a state update (e.g., marking a connection unhealthy) if the ACK is not received within a timeout period [8][9][4]. - Consumer Group Management: In messaging services, heartbeat operations inform the server that a consumer instance is still active and participating in a consumer group, preventing it from being removed from the group due to apparent inactivity [10]. Technical implementations often use configuration variables (e.g., HEARTBEAT_INTERVAL) to allow operators to tune or disable this behavior without modifying core streaming logic [3][6][5]. Citations:
🏁 Script executed: #!/bin/bash
set -eu
echo '--- heartbeat implementation ---'
sed -n '80,112p' internal/jobs/context.go
echo '--- child watchdog ---'
sed -n '160,225p' internal/agent/agent_tools.go
echo '--- focused source verifier ---'
python3 - <<'PY'
from pathlib import Path
source = Path("internal/agent/llm/stream.go").read_text()
required = [
'emitHeartbeat()',
'if delta.Content != ""',
'if delta.ReasoningContent != ""',
'for _, tc := range delta.ToolCalls',
'case <-ctx.Done():',
]
missing = [text for text in required if text not in source]
if missing:
raise SystemExit(f"missing expected source fragments: {missing}")
content_start = source.index('if delta.Content != ""')
heartbeat_pos = source.index('emitHeartbeat()', content_start)
content_end = source.index('\n\t\t\t}', content_start)
if not (content_start < heartbeat_pos < content_end):
raise SystemExit("heartbeat call is not inside the content-delta branch")
select_start = source.index('\t\tselect {')
select_end = source.index('\n\t\t}', select_start)
select_body = source[select_start:select_end]
if 'time.NewTicker' in select_body or 'ticker.C' in select_body:
raise SystemExit("unexpected ticker found in stream select")
print("heartbeat call is content-only; stream select has no ticker case")
PYRepository: buchenberg/yaah Length of output: 3404 🏁 Script executed: #!/bin/bash
set -eu
sed -n '80,112p' internal/jobs/context.go
sed -n '160,225p' internal/agent/agent_tools.go
python3 - <<'PY'
from pathlib import Path
source = Path("internal/agent/llm/stream.go").read_text()
assert source.index("emitHeartbeat()") > source.index('if delta.Content != ""')
assert source.index("emitHeartbeat()") < source.index("for _, tc := range delta.ToolCalls")
select = source[source.index("\t\tselect {"):source.index("\n\t\t}", source.index("\t\tselect {"))]
assert "ticker.C" not in select
print("content-only heartbeat and no ticker case")
PYRepository: buchenberg/yaah Length of output: 3293 Emit heartbeats independently of stream deltas. When 🤖 Prompt for AI Agents |
||
|
|
||
| for { | ||
| select { | ||
| case chunk, ok := <-chunks: | ||
|
|
@@ -94,6 +104,7 @@ func (c *Client) runStream(ctx context.Context, sp StreamProvider, req types.Cha | |
| if delta.Content != "" { | ||
| content.WriteString(delta.Content) | ||
| tokenCount++ | ||
| emitHeartbeat() | ||
| if c.OnToken != nil { | ||
| if clean := dsmlFilter.filterToken(delta.Content); clean != "" { | ||
| c.OnToken(clean) | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ type Theme struct { | |
| ToolBg string | ||
| CodeBg string | ||
| InputBorder string | ||
| PaneBorder string | ||
| NoColor bool | ||
|
|
||
| ToolColors map[string]string | ||
|
|
@@ -89,6 +90,7 @@ func NewDarkTheme() Theme { | |
| ToolBg: "#1a1a2e", | ||
| CodeBg: "#1e1e2e", | ||
| InputBorder: "#ff87af", | ||
| PaneBorder: "#af5fff", | ||
| ToolColors: newToolColors(), | ||
| RoleColors: newRoleColors(), | ||
| } | ||
|
|
@@ -104,6 +106,7 @@ func NewLightTheme() Theme { | |
| ToolBg: "#eeeeee", | ||
| CodeBg: "#f0f0f0", | ||
| InputBorder: "#d75f87", | ||
| PaneBorder: "#7f3faf", | ||
| ToolColors: newToolColors(), | ||
| RoleColors: newRoleColors(), | ||
| } | ||
|
|
@@ -148,7 +151,7 @@ func (th *Theme) TagBold(color, text string) string { | |
| if th.NoColor { | ||
| return text | ||
| } | ||
| return "[" + color + "::b]" + text + "[-:-:-]" | ||
|
There was a problem hiding this comment. 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win Apply the same reset to the package-level This fix is correct: 🛠️ Proposed fix in internal/tui2/colors/colors.go-func TagBold(color, text string) string { return "[" + color + "::b]" + text + Reset }
+func TagBold(color, text string) string { return "[" + color + "::b]" + text + "[-:-:-]" }🤖 Prompt for AI Agents |
||
| } | ||
|
|
||
| func (th *Theme) DimTag() string { | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,5 +39,6 @@ func Show(app *tview.Application, pages *tview.Pages, name, args string, onAnswe | |
| SetTitleColor(tcell.ColorYellow). | ||
| SetBackgroundColor(tcell.ColorDefault) | ||
|
|
||
| pages.AddPage(modalPageName, modal, false, true) | ||
| app.SetFocus(modal) | ||
| } | ||
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -21,6 +21,14 @@ const ( | |||||||||
| CmdClear | ||||||||||
| CmdHelp | ||||||||||
| CmdCompact | ||||||||||
| CmdStop | ||||||||||
| CmdSteer | ||||||||||
| CmdFollowUp | ||||||||||
| CmdVerbose | ||||||||||
| CmdSearch | ||||||||||
| CmdTop | ||||||||||
| CmdBottom | ||||||||||
| CmdBanner | ||||||||||
| CmdReloadRoles | ||||||||||
| CmdLogin | ||||||||||
| CmdLogout | ||||||||||
|
|
@@ -41,6 +49,22 @@ func Parse(input string) Cmd { | |||||||||
| return CmdHelp | ||||||||||
| case input == "compact": | ||||||||||
| return CmdCompact | ||||||||||
| case input == "stop": | ||||||||||
| return CmdStop | ||||||||||
| case strings.HasPrefix(input, "steer "): | ||||||||||
| return CmdSteer | ||||||||||
| case strings.HasPrefix(input, "followup "): | ||||||||||
| return CmdFollowUp | ||||||||||
| case input == "verbose": | ||||||||||
| return CmdVerbose | ||||||||||
| case strings.HasPrefix(input, "search "): | ||||||||||
| return CmdSearch | ||||||||||
| case input == "top": | ||||||||||
| return CmdTop | ||||||||||
| case input == "bottom": | ||||||||||
| return CmdBottom | ||||||||||
| case input == "banner": | ||||||||||
| return CmdBanner | ||||||||||
| case input == "roles": | ||||||||||
| return CmdReloadRoles | ||||||||||
| case input == "login": | ||||||||||
|
|
@@ -51,7 +75,7 @@ func Parse(input string) Cmd { | |||||||||
| return CmdSession | ||||||||||
| case input == "mcp": | ||||||||||
| return CmdMCP | ||||||||||
| case strings.HasPrefix(input, "model"): | ||||||||||
| return CmdModel | ||||||||||
|
Comment on lines
+78
to
79
There was a problem hiding this comment. 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win Restrict the
🛠️ Proposed fix- case strings.HasPrefix(input, "model"):
+ case input == "model" || strings.HasPrefix(input, "model "):
return CmdModel📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||
| default: | ||||||||||
| return CmdNone | ||||||||||
|
|
@@ -79,7 +103,7 @@ func Build(onCommand func(cmd Cmd, arg string)) *Palette { | |||||||||
| p.SetFieldTextColor(tcell.ColorWhite) | ||||||||||
| p.SetLabel(" ") | ||||||||||
| p.SetLabelColor(tcell.ColorYellow) | ||||||||||
| p.SetPlaceholder("command (help, clear, compact, stop, steer, model, mcp, verbose, search...)") | ||||||||||
| p.SetPlaceholderTextColor(tcell.ColorGray) | ||||||||||
|
|
||||||||||
| p.SetDoneFunc(func(key tcell.Key) { | ||||||||||
|
|
@@ -92,8 +116,15 @@ func Build(onCommand func(cmd Cmd, arg string)) *Palette { | |||||||||
|
|
||||||||||
| cmd := Parse(input) | ||||||||||
| arg := "" | ||||||||||
| switch { | ||||||||||
| case cmd == CmdModel && strings.HasPrefix(input, "model "): | ||||||||||
| arg = strings.TrimPrefix(input, "model ") | ||||||||||
| case cmd == CmdSteer && strings.HasPrefix(input, "steer "): | ||||||||||
| arg = strings.TrimPrefix(input, "steer ") | ||||||||||
| case cmd == CmdFollowUp && strings.HasPrefix(input, "followup "): | ||||||||||
| arg = strings.TrimPrefix(input, "followup ") | ||||||||||
| case cmd == CmdSearch && strings.HasPrefix(input, "search "): | ||||||||||
| arg = strings.TrimPrefix(input, "search ") | ||||||||||
| } | ||||||||||
| if cmd != CmdNone { | ||||||||||
| p.onCommand(cmd, arg) | ||||||||||
|
|
||||||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win
Keep the parity exit gate consistent with the documented scope.
The new notes mark the priority work complete, but the plan still lists unimplemented parity items. Update the exit gate and inventory to identify deferred items, or keep Phase 3 open until they are complete.
🤖 Prompt for AI Agents