v1.8.2: tool loop cap-hit summary + tool call UI compaction
Old hardcoded MAX_TOOL_LOOP_DEPTH=15 replaced by per-agent max_tool_calls (1-100, AGENTS.md frontmatter) with defaults: 30 for read-only-only agents, 10 for agents that include any non-read-only tool, 15 for raw chat. When the loop hits cap, fire one final summary call with tools disabled, stream the wrap-up into the in-flight assistant message, then insert a system sentinel with metadata.kind='cap_hit'. The sentinel renders an amber bubble with a Continue button (latest sentinel only) that POSTs to a new /api/chats/:id/continue route to extend. Hard ceiling: 3 cap-hits per chat (2 continues max) — third sentinel reports can_continue=false. Error frames carry a machine-readable reason code alongside human error text. Failed messages persist the reason via metadata.kind='error' so the bubble renders specifics on reload (WS error frame is one-shot). Tool call UI rewired: ToolCallLine renders inline (↳ name args spinner/check/✗, expand-on-tap for args+result); ToolCallGroup collapses 3+ consecutive same-tool runs into a compact card. MessageList owns a three-pass pre-render (flatten + fold tool results onto matching runs by id + group same-tool runs + number sentinels). MessageBubble drops tool rendering and adds the sentinel / error-reason branches. ToolCallCard deleted. Roadmap follow-up logged: add explicit max_tool_calls: 30 to the 6 agents in /data/AGENTS.md and /opt/boocode/AGENTS.md post-ship for discoverability (defaults handle behavior identically). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -4,10 +4,10 @@ import Markdown from 'react-markdown';
|
||||
import remarkGfm from 'remark-gfm';
|
||||
import { ChevronDown, ChevronRight, Copy, RefreshCw, Check, Share2, RotateCw, GitFork, Trash2 } from 'lucide-react';
|
||||
import { toast } from 'sonner';
|
||||
import type { Chat, Message } from '@/api/types';
|
||||
import type { Chat, ErrorReason, Message } from '@/api/types';
|
||||
import { api } from '@/api/client';
|
||||
import { sessionEvents } from '@/hooks/sessionEvents';
|
||||
import { ToolCallCard } from './ToolCallCard';
|
||||
import { CapHitSentinel } from './CapHitSentinel';
|
||||
import { CodeBlock } from './CodeBlock';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import {
|
||||
@@ -19,6 +19,15 @@ import {
|
||||
DialogTitle,
|
||||
} from '@/components/ui/dialog';
|
||||
|
||||
// v1.8.2: human labels for the machine-readable error reasons that ride on
|
||||
// failed assistant messages via metadata.kind === 'error'. Kept short so the
|
||||
// inline render under "message failed" stays a single muted line.
|
||||
const ERROR_REASON_LABELS: Record<ErrorReason, string> = {
|
||||
llm_provider_error: 'LLM provider error',
|
||||
tool_execution_failed: 'Tool execution failed',
|
||||
summary_after_cap_failed: 'Summary after tool budget hit failed',
|
||||
};
|
||||
|
||||
// Match path-shaped substrings ending in `.ext`. Additionally require a `/`
|
||||
// in the match to reduce false positives in prose (e.g. plain `foo.ts` won't
|
||||
// match, but `src/foo.ts` will). False positives at the edges are accepted
|
||||
@@ -94,6 +103,9 @@ function linkifyChildren(children: ReactNode, keyPrefix = 'l'): ReactNode {
|
||||
interface Props {
|
||||
message: Message;
|
||||
sessionChats?: Chat[];
|
||||
// v1.8.2: passed by MessageList's render-item pass for cap-hit sentinels.
|
||||
// Only the most recent sentinel shows the Continue button.
|
||||
capHitInfo?: { position: number; isLatest: boolean };
|
||||
}
|
||||
|
||||
function MarkdownBody({ content }: { content: string }) {
|
||||
@@ -464,15 +476,34 @@ function CompactCard({ message, sessionChats }: { message: Message; sessionChats
|
||||
);
|
||||
}
|
||||
|
||||
export function MessageBubble({ message, sessionChats }: Props) {
|
||||
export function MessageBubble({ message, sessionChats, capHitInfo }: Props) {
|
||||
if (message.kind === 'compact') {
|
||||
return <CompactCard message={message} sessionChats={sessionChats} />;
|
||||
}
|
||||
|
||||
if (message.role === 'tool') {
|
||||
return <ToolCallCard message={message} />;
|
||||
// v1.8.2: cap-hit sentinels render as a distinct system bubble with a
|
||||
// Continue button. MessageList's pre-render pass tags each sentinel with
|
||||
// its position; only the latest gets the actionable button.
|
||||
if (
|
||||
message.role === 'system' &&
|
||||
message.metadata?.kind === 'cap_hit' &&
|
||||
capHitInfo
|
||||
) {
|
||||
return (
|
||||
<CapHitSentinel
|
||||
message={message}
|
||||
capHitPosition={capHitInfo.position}
|
||||
isLatest={capHitInfo.isLatest}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
// v1.8.2: tool messages and assistant tool_calls are now rendered by
|
||||
// MessageList via ToolCallLine / ToolCallGroup. Tool-role messages reach
|
||||
// this point only if MessageList didn't consume them (shouldn't happen,
|
||||
// but guard against it by rendering nothing rather than a stale card).
|
||||
if (message.role === 'tool') return null;
|
||||
|
||||
if (message.role === 'user') {
|
||||
return (
|
||||
<div className="group flex flex-col items-end gap-1">
|
||||
@@ -487,14 +518,17 @@ export function MessageBubble({ message, sessionChats }: Props) {
|
||||
const isStreaming = message.status === 'streaming';
|
||||
const failed = message.status === 'failed';
|
||||
const hasContent = message.content.length > 0;
|
||||
const hasToolCalls = (message.tool_calls?.length ?? 0) > 0;
|
||||
// v1.8.2: if metadata stamps an error reason, surface it inline under the
|
||||
// generic "message failed" line. Keeps the user's eye where it already is
|
||||
// rather than introducing a separate banner.
|
||||
const errorMeta =
|
||||
message.metadata !== null && message.metadata.kind === 'error'
|
||||
? message.metadata
|
||||
: null;
|
||||
|
||||
return (
|
||||
<div className="group flex flex-col gap-2">
|
||||
{message.tool_calls?.map((tc) => (
|
||||
<ToolCallCard key={tc.id} toolCall={tc} />
|
||||
))}
|
||||
{(hasContent || (!hasToolCalls && isStreaming)) && (
|
||||
{(hasContent || isStreaming) && (
|
||||
<div className="max-w-[90%] text-sm leading-relaxed space-y-2 break-words min-w-0">
|
||||
{hasContent ? <MarkdownBody content={message.content} /> : null}
|
||||
{isStreaming && (
|
||||
@@ -503,12 +537,18 @@ export function MessageBubble({ message, sessionChats }: Props) {
|
||||
</div>
|
||||
)}
|
||||
{failed && (
|
||||
<div className="text-xs text-destructive">message failed</div>
|
||||
<div className="text-xs text-destructive">
|
||||
message failed
|
||||
{errorMeta && (
|
||||
<span className="block text-muted-foreground mt-0.5">
|
||||
{ERROR_REASON_LABELS[errorMeta.error_reason]}
|
||||
{errorMeta.error_text ? ` — ${errorMeta.error_text}` : ''}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
{!isStreaming && <StatsLine message={message} />}
|
||||
{!isStreaming && (hasContent || hasToolCalls) && (
|
||||
<ActionRow message={message} />
|
||||
)}
|
||||
{!isStreaming && hasContent && <ActionRow message={message} />}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user