feat(chat): show each tool call where it happened in the reply
This commit is contained in:
1 parent
2bcfcf6ea8
commit
9387cb1f5e
9 files changed
+67
-20
No files matched your search
@@ -8,6 +8,7 @@ import (
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
"unicode/utf8"
|
||||
|
||||
"github.com/samcharles93/ai-sdk/chat"
|
||||
"github.com/samcharles93/ai-sdk/core"
|
||||
@@ -234,6 +235,7 @@ type pendingToolCall struct {
|
||||
name string
|
||||
parameters string
|
||||
started time.Time
|
||||
offset int
|
||||
}
|
||||
|
||||
// took is the call's running time so far, zero for a result with no
|
||||
@@ -258,6 +260,7 @@ func (c pendingToolCall) took() int64 {
|
||||
func drainChatStream(parts <-chan core.StreamPart, turn gateway.TurnStream, icons map[string]string) string {
|
||||
var sb strings.Builder
|
||||
pending := make(map[string]pendingToolCall)
|
||||
runes := 0
|
||||
for part := range parts {
|
||||
switch part.Type {
|
||||
case core.StreamPartTextDelta:
|
||||
@@ -265,6 +268,7 @@ func drainChatStream(parts <-chan core.StreamPart, turn gateway.TurnStream, icon
|
||||
continue
|
||||
}
|
||||
sb.WriteString(part.TextDelta)
|
||||
runes += utf8.RuneCountInString(part.TextDelta)
|
||||
if turn != nil {
|
||||
turn.Delta(part.TextDelta)
|
||||
}
|
||||
@@ -276,6 +280,7 @@ func drainChatStream(parts <-chan core.StreamPart, turn gateway.TurnStream, icon
|
||||
name: part.ToolCall.ToolName,
|
||||
parameters: gateway.SummarizeToolParameters(part.ToolCall.Input),
|
||||
started: time.Now(),
|
||||
offset: runes,
|
||||
}
|
||||
case core.StreamPartToolResult:
|
||||
if part.ToolResult == nil || turn == nil {
|
||||
@@ -295,6 +300,7 @@ func drainChatStream(parts <-chan core.StreamPart, turn gateway.TurnStream, icon
|
||||
Output: part.ToolResult.Output,
|
||||
Err: part.ToolResult.Error,
|
||||
DurationMS: call.took(),
|
||||
TextOffset: call.offset,
|
||||
})
|
||||
for _, ref := range multimodalMediaRefs(part.ToolResult.Output) {
|
||||
// Path and URL are alternatives, not a pair: the channel
|
||||
|
||||
@@ -379,6 +379,7 @@ type ToolCall struct {
|
||||
Output string `protobuf:"bytes,4,opt,name=output,proto3" json:"output,omitempty"`
|
||||
Error string `protobuf:"bytes,5,opt,name=error,proto3" json:"error,omitempty"`
|
||||
DurationMs int64 `protobuf:"varint,6,opt,name=duration_ms,json=durationMs,proto3" json:"duration_ms,omitempty"`
|
||||
TextOffset int32 `protobuf:"varint,7,opt,name=text_offset,json=textOffset,proto3" json:"text_offset,omitempty"`
|
||||
unknownFields protoimpl.UnknownFields
|
||||
sizeCache protoimpl.SizeCache
|
||||
}
|
||||
@@ -455,6 +456,13 @@ func (x *ToolCall) GetDurationMs() int64 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *ToolCall) GetTextOffset() int32 {
|
||||
if x != nil {
|
||||
return x.TextOffset
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
type Media struct {
|
||||
state protoimpl.MessageState `protogen:"open.v1"`
|
||||
ToolName string `protobuf:"bytes,1,opt,name=tool_name,json=toolName,proto3" json:"tool_name,omitempty"`
|
||||
@@ -4036,7 +4044,7 @@ const file_gateway_v1_chat_proto_rawDesc = "" +
|
||||
"\x05media\x18\v \x03(\v2\x11.gateway.v1.MediaR\x05media\x12\x1b\n" +
|
||||
"\tsender_id\x18\f \x01(\tR\bsenderIdJ\x04\b\t\x10\n" +
|
||||
"R\n" +
|
||||
"budget_key\"\x9d\x01\n" +
|
||||
"budget_key\"\xbe\x01\n" +
|
||||
"\bToolCall\x12\x0e\n" +
|
||||
"\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n" +
|
||||
"\x04name\x18\x02 \x01(\tR\x04name\x12\x1e\n" +
|
||||
@@ -4046,7 +4054,9 @@ const file_gateway_v1_chat_proto_rawDesc = "" +
|
||||
"\x06output\x18\x04 \x01(\tR\x06output\x12\x14\n" +
|
||||
"\x05error\x18\x05 \x01(\tR\x05error\x12\x1f\n" +
|
||||
"\vduration_ms\x18\x06 \x01(\x03R\n" +
|
||||
"durationMs\"\xf0\x02\n" +
|
||||
"durationMs\x12\x1f\n" +
|
||||
"\vtext_offset\x18\a \x01(\x05R\n" +
|
||||
"textOffset\"\xf0\x02\n" +
|
||||
"\x05Media\x12\x1b\n" +
|
||||
"\ttool_name\x18\x01 \x01(\tR\btoolName\x12\x12\n" +
|
||||
"\x04type\x18\x02 \x01(\tR\x04type\x12\x17\n" +
|
||||
|
||||
@@ -24,6 +24,9 @@ type ToolCallEvent struct {
|
||||
Err string
|
||||
// DurationMS is how long the tool took to run, zero when unmeasured.
|
||||
DurationMS int64 `json:",omitempty"`
|
||||
// TextOffset is how many runes of the reply text preceded the call, so a
|
||||
// surface can show it where it happened.
|
||||
TextOffset int `json:",omitempty"`
|
||||
}
|
||||
|
||||
// MediaEvent reports one media attachment produced during a turn, so a
|
||||
|
||||
@@ -92,6 +92,7 @@ func toolProto(v messaging.ToolCallEvent) *pb.ToolCall {
|
||||
Output: v.Output,
|
||||
Error: v.Err,
|
||||
DurationMs: v.DurationMS,
|
||||
TextOffset: int32(v.TextOffset),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,6 +107,7 @@ func toolValue(v *pb.ToolCall) messaging.ToolCallEvent {
|
||||
Output: v.Output,
|
||||
Err: v.Error,
|
||||
DurationMS: v.DurationMs,
|
||||
TextOffset: int(v.TextOffset),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -132,6 +132,7 @@ type chatToolView struct {
|
||||
Summary string `json:"summary"`
|
||||
Failed bool `json:"failed"`
|
||||
DurationMS int64 `json:"duration_ms,omitempty"`
|
||||
TextOffset int `json:"text_offset,omitempty"`
|
||||
}
|
||||
|
||||
func (s *Server) chatReady(w http.ResponseWriter) (*ChatService, bool) {
|
||||
@@ -240,7 +241,7 @@ func (s *Server) handleChatTurns(w http.ResponseWriter, r *http.Request) {
|
||||
for _, tool := range turn.ToolCalls {
|
||||
view.ToolCalls = append(view.ToolCalls, chatToolView{
|
||||
ID: tool.ID, Name: tool.Name, Parameters: tool.Parameters,
|
||||
Summary: tool.Summary(), Failed: tool.Err != "", DurationMS: tool.DurationMS,
|
||||
Summary: tool.Summary(), Failed: tool.Err != "", DurationMS: tool.DurationMS, TextOffset: tool.TextOffset,
|
||||
})
|
||||
}
|
||||
views = append(views, view)
|
||||
@@ -320,6 +321,7 @@ type chatStreamEvent struct {
|
||||
Parameters string `json:"parameters,omitempty"`
|
||||
Failed bool `json:"failed,omitempty"`
|
||||
DurationMS int64 `json:"duration_ms,omitempty"`
|
||||
TextOffset int `json:"text_offset,omitempty"`
|
||||
SessionID string `json:"session_id,omitempty"`
|
||||
// Path and Label carry a dashboard_navigate result so the browser can
|
||||
// render a clickable chip that routes the operator to the page. Present
|
||||
@@ -369,6 +371,7 @@ func (s chatStreamSink) ToolCall(event messaging.ToolCallEvent) {
|
||||
Text: event.Summary(),
|
||||
Failed: event.Err != "",
|
||||
DurationMS: event.DurationMS,
|
||||
TextOffset: event.TextOffset,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -89,6 +89,7 @@ message ToolCall {
|
||||
string output = 4;
|
||||
string error = 5;
|
||||
int64 duration_ms = 6;
|
||||
int32 text_offset = 7;
|
||||
}
|
||||
message Media {
|
||||
string tool_name = 1;
|
||||
|
||||
Vendored
+1
-1
@@ -166,7 +166,7 @@ XID_Start XIDS`.split(/\s/).map(e=>[wx(e),e])),vS=new Map([[`s`,nS(383)],[nS(383
|
||||
`,1)[0];if(Object.keys(e).length===0)return``}}catch{}return r.value.split(`
|
||||
`,1)[0]}),l=Y(()=>[r.value&&`> ${r.value}`,a.value].filter(Boolean).join(`
|
||||
|
||||
`));return(t,r)=>e.tool.path?(L(),q(zte,{key:0,path:e.tool.path,label:e.tool.label},null,8,[`path`,`label`])):l.value?(L(),q(V(lm),{key:1,"default-open":i.value},{default:I(()=>[A(V(fm),null,{default:I(()=>[A(V(mm),{status:i.value?`error`:o.value?`running`:void 0},{default:I(()=>[A(V(dm),null,{default:I(()=>[i.value?(L(),q(V(au),{key:0})):o.value?(L(),q(V(xu),{key:1,class:`animate-spin`})):(L(),q(V(tu),{key:2,class:`text-success`}))]),_:1}),R(`span`,Bte,B(n.value),1),A(V(hm),{class:`font-mono text-xs`},{default:I(()=>[H(B(c.value),1)]),_:1}),s.value?(L(),j(`span`,Vte,B(s.value),1)):F(``,!0)]),_:1},8,[`status`])]),_:1}),A(V(um),null,{default:I(()=>[A(V(_m),{size:`sm`},{default:I(()=>[A(V(Sm),{wrap:``,class:`max-h-64`},{default:I(()=>[H(B(l.value),1)]),_:1})]),_:1})]),_:1})]),_:1},8,[`default-open`])):(L(),q(V(mm),{key:2,status:i.value?`error`:o.value?`running`:void 0},{default:I(()=>[A(V(dm),null,{default:I(()=>[i.value?(L(),q(V(au),{key:0})):o.value?(L(),q(V(xu),{key:1,class:`animate-spin`})):(L(),q(V(tu),{key:2,class:`text-success`}))]),_:1}),R(`span`,Hte,B(n.value),1),A(V(hm),{class:`font-mono text-xs`},{default:I(()=>[H(B(c.value),1)]),_:1}),s.value?(L(),j(`span`,Ute,B(s.value),1)):F(``,!0)]),_:1},8,[`status`]))}}),Wte={class:`flex flex-col gap-1.5`},Gte=P({__name:`ChatToolGroup`,props:{tools:{},streaming:{type:Boolean}},setup(e){let t=e,n=e=>!!(e.err||e.Err||e.failed),r=Y(()=>t.tools.some(n)),i=Y(()=>`${t.tools.length} tool call${t.tools.length===1?``:`s`}`);return(t,n)=>(L(),q(V(lm),{"default-open":r.value},{default:I(()=>[A(V(fm),null,{default:I(()=>[A(V(mm),{status:r.value?`error`:void 0},{default:I(()=>[A(V(dm),null,{default:I(()=>[A(V(xte))]),_:1}),A(V(hm),{class:`truncate`},{default:I(()=>[H(B(i.value),1)]),_:1})]),_:1},8,[`status`])]),_:1}),A(V(um),null,{default:I(()=>[R(`div`,Wte,[(L(!0),j(U,null,M(e.tools,(t,n)=>(L(),q(uw,{key:n,tool:t,streaming:e.streaming&&n===e.tools.length-1},null,8,[`tool`,`streaming`]))),128))])]),_:1})]),_:1},8,[`default-open`]))}}),Kte={key:1,class:`mb-2 flex flex-wrap gap-1.5`},qte={key:3,class:`whitespace-pre-wrap`},Jte=P({__name:`ChatBubble`,props:{text:{},tools:{default:()=>[]},media:{default:()=>[]},assistant:{type:Boolean,default:!1},streaming:{type:Boolean,default:!1}},setup(e){let t=e,n=Y(()=>{let e=[],n=!1;for(let r of t.tools)r.path?(e.push([r]),n=!1):n?e[e.length-1].push(r):(e.push([r]),n=!0);return e});return(t,r)=>(L(),q(V(IC),{align:e.assistant?`start`:`end`},{default:I(()=>[A(V(LC),null,{default:I(()=>[A(V(nm),{variant:e.assistant?`muted`:`tinted`,class:`max-w-[min(78ch,92%)]`},{default:I(()=>[A(V(rm),{class:`[overflow-wrap:anywhere]`},{default:I(()=>[e.assistant&&e.tools.length?(L(),q(V(am),{key:0,class:`mb-2`},{default:I(()=>[(L(!0),j(U,null,M(n.value,(t,n)=>(L(),j(U,{key:n},[t.length>1?(L(),q(Gte,{key:0,tools:t,streaming:e.streaming},null,8,[`tools`,`streaming`])):(L(),q(uw,{key:1,tool:t[0],streaming:e.streaming},null,8,[`tool`,`streaming`]))],64))),128))]),_:1})):F(``,!0),e.media.length?(L(),j(`div`,Kte,[(L(!0),j(U,null,M(e.media,(e,t)=>(L(),q(HC,{key:t,attachment:e},null,8,[`attachment`]))),128))])):F(``,!0),e.assistant?(L(),q(Lte,{key:2,text:e.text},null,8,[`text`])):(L(),j(`div`,qte,B(e.text),1)),K(t.$slots,`default`)]),_:3})]),_:3},8,[`variant`]),e.assistant&&!e.streaming&&e.text?(L(),q(V(RC),{key:0,class:`px-0 transition-opacity focus-within:opacity-100 [@media(hover:hover)]:opacity-0 [@media(hover:hover)]:group-hover/message:opacity-100`},{default:I(()=>[A(V(wm),{value:e.text},null,8,[`value`])]),_:1})):F(``,!0)]),_:3})]),_:3},8,[`align`]))}}),Yte={class:`text-sm`},Xte={key:0,class:`mt-1 text-fg-muted`},Zte={key:1,class:`mt-2 flex flex-wrap gap-2`},Qte=P({__name:`ChatChooseCard`,props:{choose:{}},setup(e){let t=Y(()=>sd.value.models??[]);return(e,n)=>(L(),j(`div`,Yte,[n[0]||=R(`p`,{class:`font-medium`},`Choose a model`,-1),t.value.length?(L(),j(`div`,Zte,[(L(!0),j(U,null,M(t.value,e=>(L(),q(V(X),{key:e,size:`sm`,variant:e===V(sd).active_model?`default`:`outline`,class:`font-mono`,onClick:t=>void V(Cd)(e)},{default:I(()=>[H(B(e),1)]),_:2},1032,[`variant`,`onClick`]))),128))])):(L(),j(`p`,Xte,`None configured.`))]))}}),$te={class:`text-sm`},ene={key:0},tne={class:`mt-1 space-y-0.5`},nne={class:`font-mono`},rne=[`href`],ine={key:0,class:`mt-3 flex gap-2`},ane={key:1,class:`mt-2 text-fg-muted`},one={key:2,class:`mt-2 text-fg-muted`},sne={key:3,class:`mt-2 text-ok`},cne={key:4,class:`mt-2 text-danger`},lne={key:5,class:`mt-2 text-xs text-fg-muted`},une=P({__name:`ChatUpdateCard`,props:{update:{}},setup(e){let t=e,n=Y(()=>t.update.available??[]),r=J(`idle`),i=J(``);async function a(){r.value=`installing`;try{let e=(await Z.updateInstall(t.update.snapshot)).result?.installed;i.value=e?Object.entries(e).map(([e,t])=>`${e} → ${t}`).join(`, `)+`. Archie restarts to apply it.`:`Update finished.`,r.value=`done`}catch(e){i.value=e.message,r.value=`failed`}}async function o(){try{await Z.updateDefer(t.update.snapshot),r.value=`deferred`}catch(e){i.value=e.
Line truncated
|
||||
`));return(t,r)=>e.tool.path?(L(),q(zte,{key:0,path:e.tool.path,label:e.tool.label},null,8,[`path`,`label`])):l.value?(L(),q(V(lm),{key:1,"default-open":i.value},{default:I(()=>[A(V(fm),null,{default:I(()=>[A(V(mm),{status:i.value?`error`:o.value?`running`:void 0},{default:I(()=>[A(V(dm),null,{default:I(()=>[i.value?(L(),q(V(au),{key:0})):o.value?(L(),q(V(xu),{key:1,class:`animate-spin`})):(L(),q(V(tu),{key:2,class:`text-success`}))]),_:1}),R(`span`,Bte,B(n.value),1),A(V(hm),{class:`font-mono text-xs`},{default:I(()=>[H(B(c.value),1)]),_:1}),s.value?(L(),j(`span`,Vte,B(s.value),1)):F(``,!0)]),_:1},8,[`status`])]),_:1}),A(V(um),null,{default:I(()=>[A(V(_m),{size:`sm`},{default:I(()=>[A(V(Sm),{wrap:``,class:`max-h-64`},{default:I(()=>[H(B(l.value),1)]),_:1})]),_:1})]),_:1})]),_:1},8,[`default-open`])):(L(),q(V(mm),{key:2,status:i.value?`error`:o.value?`running`:void 0},{default:I(()=>[A(V(dm),null,{default:I(()=>[i.value?(L(),q(V(au),{key:0})):o.value?(L(),q(V(xu),{key:1,class:`animate-spin`})):(L(),q(V(tu),{key:2,class:`text-success`}))]),_:1}),R(`span`,Hte,B(n.value),1),A(V(hm),{class:`font-mono text-xs`},{default:I(()=>[H(B(c.value),1)]),_:1}),s.value?(L(),j(`span`,Ute,B(s.value),1)):F(``,!0)]),_:1},8,[`status`]))}}),Wte={class:`flex flex-col gap-1.5`},Gte=P({__name:`ChatToolGroup`,props:{tools:{},streaming:{type:Boolean}},setup(e){let t=e,n=e=>!!(e.err||e.Err||e.failed),r=Y(()=>t.tools.some(n)),i=Y(()=>`${t.tools.length} tool call${t.tools.length===1?``:`s`}`);return(t,n)=>(L(),q(V(lm),{"default-open":r.value},{default:I(()=>[A(V(fm),null,{default:I(()=>[A(V(mm),{status:r.value?`error`:void 0},{default:I(()=>[A(V(dm),null,{default:I(()=>[A(V(xte))]),_:1}),A(V(hm),{class:`truncate`},{default:I(()=>[H(B(i.value),1)]),_:1})]),_:1},8,[`status`])]),_:1}),A(V(um),null,{default:I(()=>[R(`div`,Wte,[(L(!0),j(U,null,M(e.tools,(t,n)=>(L(),q(uw,{key:n,tool:t,streaming:e.streaming&&n===e.tools.length-1},null,8,[`tool`,`streaming`]))),128))])]),_:1})]),_:1},8,[`default-open`]))}}),Kte={key:0,class:`mb-2 flex flex-wrap gap-1.5`},qte={key:2,class:`whitespace-pre-wrap`},Jte=P({__name:`ChatBubble`,props:{text:{},tools:{default:()=>[]},media:{default:()=>[]},assistant:{type:Boolean,default:!1},streaming:{type:Boolean,default:!1}},setup(e){let t=e,n=Y(()=>{let e=Array.from(t.text),n=[],r=0,i=!1;for(let a of t.tools){let t=Math.min(Math.max(a.text_offset??0,r),e.length);t>r&&(n.push({text:e.slice(r,t).join(``)}),r=t,i=!1);let o=n[n.length-1];!a.path&&i&&o&&`tools`in o?o.tools.push(a):(n.push({tools:[a]}),i=!a.path)}return r<e.length&&n.push({text:e.slice(r).join(``)}),n});return(t,r)=>(L(),q(V(IC),{align:e.assistant?`start`:`end`},{default:I(()=>[A(V(LC),null,{default:I(()=>[A(V(nm),{variant:e.assistant?`muted`:`tinted`,class:`max-w-[min(78ch,92%)]`},{default:I(()=>[A(V(rm),{class:`[overflow-wrap:anywhere]`},{default:I(()=>[e.media.length?(L(),j(`div`,Kte,[(L(!0),j(U,null,M(e.media,(e,t)=>(L(),q(HC,{key:t,attachment:e},null,8,[`attachment`]))),128))])):F(``,!0),e.assistant?(L(!0),j(U,{key:1},M(n.value,(t,r)=>(L(),j(U,{key:r},[`text`in t?(L(),q(Lte,{key:0,text:t.text},null,8,[`text`])):(L(),q(V(am),{key:1,class:`my-2`},{default:I(()=>[t.tools.length>1?(L(),q(Gte,{key:0,tools:t.tools,streaming:e.streaming&&r===n.value.length-1},null,8,[`tools`,`streaming`])):(L(),q(uw,{key:1,tool:t.tools[0],streaming:e.streaming&&r===n.value.length-1},null,8,[`tool`,`streaming`]))]),_:2},1024))],64))),128)):(L(),j(`div`,qte,B(e.text),1)),K(t.$slots,`default`)]),_:3})]),_:3},8,[`variant`]),e.assistant&&!e.streaming&&e.text?(L(),q(V(RC),{key:0,class:`px-0 transition-opacity focus-within:opacity-100 [@media(hover:hover)]:opacity-0 [@media(hover:hover)]:group-hover/message:opacity-100`},{default:I(()=>[A(V(wm),{value:e.text},null,8,[`value`])]),_:1})):F(``,!0)]),_:3})]),_:3},8,[`align`]))}}),Yte={class:`text-sm`},Xte={key:0,class:`mt-1 text-fg-muted`},Zte={key:1,class:`mt-2 flex flex-wrap gap-2`},Qte=P({__name:`ChatChooseCard`,props:{choose:{}},setup(e){let t=Y(()=>sd.value.models??[]);return(e,n)=>(L(),j(`div`,Yte,[n[0]||=R(`p`,{class:`font-medium`},`Choose a model`,-1),t.value.length?(L(),j(`div`,Zte,[(L(!0),j(U,null,M(t.value,e=>(L(),q(V(X),{key:e,size:`sm`,variant:e===V(sd).active_model?`default`:`outline`,class:`font-mono`,onClick:t=>void V(Cd)(e)},{default:I(()=>[H(B(e),1)]),_:2},1032,[`variant`,`onClick`]))),128))])):(L(),j(`p`,Xte,`None configured.`))]))}}),$te={class:`text-sm`},ene={key:0},tne={class:`mt-1 space-y-0.5`},nne={class:`font-mono`},rne=[`href`],ine={key:0,class:`mt-3 flex gap-2`},ane={key:1,class:`mt-2 text-fg-muted`},one={key:2,class:`mt-2 text-fg-muted`},sne={key:3,class:`mt-2 text-ok`},cne={key:4,class:`mt-2 text-danger`},lne={key:5,class:`mt-2 text-xs text-fg-muted`},une=P({__name:`ChatUpdateCard`,props:{update:{}},setup(e){let t=e,n=Y(()=>t.update.available??[]),r=J(`idle`),i=J(``);async function a(){r.value=`installing`;try{let e=(await Z.updateInstall(t.update.snapshot)).result?.installed;i.value=e?Object.entries(e).map
Line truncated
|
||||
`).map(e=>e.trim()).find(Boolean)||``,i=r.length>RT?`${r.slice(0,RT).trimEnd()}…`:r;return{text:i,full:n,truncated:i!==n}}function lie(e){return String(e||`event`).replaceAll(`_`,` `).replace(/\b\w/g,e=>e.toUpperCase())}function BT(e){let t=Number(e);if(!Number.isFinite(t)||t<0)return``;if(t<1e3)return`under 1 s`;let n=t/1e3;if(n<60)return`${n.toFixed(+(n<10))} s`;let r=Math.round(n),i=Math.floor(r/60),a=r%60;if(i<60)return a===0?`${i} min`:`${i} min ${a} s`;let o=Math.floor(i/60),s=i-o*60;return s===0?`${o} h`:`${o} h ${s} min`}function VT(e){let t=Number(e);return!Number.isFinite(t)||t<=0?``:t.toLocaleString(`en-US`)}function HT(e){return typeof e==`string`?e:``}function UT(e={}){let t=e.data||{},n=e.stage||`unknown stage`,r=e.workflow?`${e.workflow} workflow`:``;if(e.kind===`stage_start`)return{title:`Started stage: ${n}`,detail:r};if(e.kind===`stage_finish`){let e=[r,BT(t.duration_ms)].filter(Boolean).join(` · `);return{title:t.interrupted?`Stage interrupted: ${n}`:t.skipped?`Skipped stage: ${n}`:t.error?`Stage failed: ${n}`:`Finished stage: ${n}`,detail:[e,HT(t.error),HT(t.when)].filter(Boolean).join(` · `)}}if(e.kind===`task_retried`){let n=Number(t.retry_count);return{title:Number.isFinite(n)&&n>0?`Retry ${n}`:`Retry requested`,detail:[HT(t.previous_stage)&&`after ${HT(t.previous_stage)}`,HT(t.previous_reason)].filter(Boolean).join(`: `)||e.detail||``}}if(e.kind===`agent_finish`){let r=VT(t.iterations),i=VT(t.tokens),a=Number(t.cached_tokens)||0,o=VT((Number(t.prompt_tokens)||0)-a),s=VT(t.completion_tokens),c=VT(t.cached_tokens),l=[r&&`${r} iterations`,i&&`${i} tokens`,o&&`${o} fresh prompt`,s&&`${s} completion`,c&&`${c} cached`,HT(t.model)].filter(Boolean);return{title:`Agent ${HT(t.status)||`finished`}: ${n}`,detail:l.join(` · `)||e.detail||``}}if(e.kind===`remediation_round`){let e=Number(t.of),n=HT(t.author);return{title:`Remediation ${HT(t.round)}${e>0?` of ${e}`:``}`,detail:[n&&`answers ${n}'s review`,t.review_id?`#${HT(t.review_id)}`:``].filter(Boolean).join(` `)}}if(e.kind===`review_approved`){let e=HT(t.pr_number);return{title:`Pull request approved`,detail:[HT(t.author),e&&`#${e}`].filter(Boolean).join(` · `)}}if(e.kind===`step_retried`)return{title:`Attempt ${HT(t.attempt)} of ${HT(t.of)} failed: ${e.stage||`step`}`,detail:HT(t.error),tone:`warn`};if(e.kind===`config_captured`)return{title:`Configuration captured`,detail:`The effective task-runtime configuration for this run.`};if(e.kind===`binding_started`){let e=HT(t.source),n=HT(t.capture_id),r=[{label:`binding ${HT(t.binding_name)||HT(t.binding_id)}`,to:`/events?tab=bindings`},...n?[{label:`captured event`,to:`/events?tab=inspector&capture=${encodeURIComponent(n)}`}]:[]];return t.unsigned===!0?{title:`Started by an unsigned event`,detail:e?`source ${e}`:``,tone:`warn`,links:r}:{title:`Started by an event`,detail:e?`source ${e}`:``,links:r}}if(e.kind===`changes_captured`){let e=t.totals??{},n=Number(e.files);return{title:`Change capture recorded`,detail:[Number.isFinite(n)&&n>0?`${n} file${n===1?``:`s`} changed`:``,t.captured_after?`captured after ${HT(t.captured_after)}`:``].filter(Boolean).join(` · `)}}return{title:lie(e.kind||e.type),detail:e.detail||``}}var WT=[`title`],GT=P({__name:`ActivityRow`,props:{event:{}},emits:[`open`],setup(e,{emit:t}){let n=LT();n.watchIdentities();let r=e,i=t,a=ET(),o=Y(()=>a.taskIDFor(r.event)),s=Y(()=>zT(r.event,n.identityName));function c(){o.value>0&&i(`open`,o.value)}return(t,n)=>(L(),q(V(NT),{class:z(o.value>0?`cursor-pointer`:``),role:o.value>0?`link`:void 0,tabindex:o.value>0?0:void 0,title:o.value>0?`Open task details`:void 0,onClick:c,onKeydown:[gt(pt(c,[`prevent`]),[`enter`]),gt(pt(c,[`prevent`]),[`space`])]},{default:I(()=>[A(V(MT),{class:`font-medium`},{default:I(()=>[H(B(V(UT)({...r.event,at:void 0,detail:void 0}).title),1)]),_:1}),A(V(MT),{class:`font-mono`},{default:I(()=>[H(B(o.value>0?`#${o.value}`:`–`),1)]),_:1}),A(V(MT),{class:`w-[55%] max-w-0`},{default:I(()=>[R(`span`,{class:`block truncate`,title:s.value.truncated?s.value.full:void 0},B(s.value.text),9,WT)]),_:1}),A(V(MT),null,{default:I(()=>[A(V(mw),{at:e.event.at},null,8,[`at`])]),_:1})]),_:1},8,[`class`,`role`,`tabindex`,`title`,`onKeydown`]))}}),KT=[{value:`all`,label:`All`},{value:`tasks`,label:`Tasks`},{value:`system`,label:`System`}];function qT(e){return(Number(e?.task_id)||0)>0}function JT(e,t){return t===`tasks`?qT(e):t!==`system`||!qT(e)}function YT(e,t){return e.filter(e=>JT(e,t))}function XT(e,t){return e>0?``:t===`all`?`Waiting for activity`:t===`tasks`?`No task events yet`:`No system events yet`}function ZT(e,t){return`${e}:${t??0}`}function QT(e){let t=[];for(let n of e){let e=n.kind||n.type||`event`,r=Number(n.task_id)||0,i=ZT(zT(n).text,r),a=t[t.length-1];a&&a.key===i?(a.count+=1,a.events.push(n)):t.push({key:i,label:e,taskID:r,count:1,representative:n,events:[n]})}return t}var $T={role:`region`,"aria-label":`Activity`,"aria-live":`polite`},eE={class:`max-h-[28rem] overflow-y-auto`},tE={class:`inline-fleLine truncated
|
||||
`,1)[0]??``;return t.length>80?`${t.slice(0,79)}…`:t}function gD(e){return(e?.merged||0)+(e?.completed||0)}function _D(e){return Object.entries(e?.inputs??{}).map(([e,t])=>({name:e,type:t.type,required:t.required===!0})).sort((e,t)=>e.name.localeCompare(t.name))}function vD(e,t){return e.filter(e=>e.required&&!(t[e.name]??``).trim()).map(e=>e.name)}function yD(e,t){switch(t){case`number`:{let t=e.trim();return t!==``&&!Number.isNaN(Number(t))?Number(t):e}case`bool`:return e===`true`||e!==`false`&&e;case`string`:return e;default:try{return JSON.parse(e)}catch{return e}}}function bD(e,t){let n={};for(let r of e){let e=t[r.name];e!==void 0&&e!==``&&(n[r.name]=yD(e,r.type))}return n}var xD=[`onKeydown`],SD={key:0,class:`text-sm text-danger`,role:`alert`},CD={key:1,class:`grid gap-1.5`},wD=[`for`],TD={key:0,class:`font-normal text-fg-subtle`},ED=[`id`],DD=[`value`],OD={key:0,class:`text-xs text-fg-subtle`},kD={key:2,class:`grid gap-1.5`},AD=[`id`],jD={class:`block truncate text-label font-medium`},MD={class:`block text-xs text-fg-subtle`},ND={key:0,class:`text-xs text-fg-subtle`},PD={key:3,class:`grid gap-3`},FD=[`for`],ID={class:`font-mono`},LD={key:0,class:`text-fg-subtle`},RD={class:`grid gap-1.5`},zD=[`for`],BD={class:`grid gap-1.5`},VD=[`for`],HD={key:4,class:`text-sm text-danger`,role:`alert`},UD={class:`flex items-center gap-2 border-t border-border pt-4`},WD={class:`mr-auto text-xs text-fg-subtle`},GD=P({__name:`NewTaskForm`,props:{workflow:{},draft:{},initialWorkflow:{},initialInstructions:{}},emits:[`started`,`cancel`],setup(e,{emit:t}){let n=e,r=t,i=we(),a=J([]),o=J([]),s=J([]),c=J(``);Be(async()=>{try{let[e,t]=await Promise.all([Z.workflows(),Z.repositories()]);a.value=(e?.definitions??[]).filter(e=>e.enabled),o.value=e?.workflows??[],s.value=(t??[]).map(e=>`${e.owner}/${e.name}`)}catch(e){c.value=String(e.message||e)}});let l=J(``),u=J(n.workflow??n.initialWorkflow??``),d=J(n.initialInstructions??``),f=J(hD(d.value)),p=J({});Ce(()=>{!u.value&&a.value[0]&&(u.value=a.value[0].id)});let m=Y(()=>a.value.find(e=>e.id===u.value)),h=Y(()=>_D(m.value)),g=Y(()=>vD(h.value,p.value)),_=Y(()=>m.value?.repository??`required`),v=Y(()=>_.value!==`optional`&&_.value!==`none`),y=e=>o.value.find(t=>t.workflow===e),b=J(!1),x=J(``),S=Y(()=>!(!l.value.trim()&&v.value||!u.value||!f.value.trim())&&g.value.length===0);async function C(){if(S.value&&!b.value){b.value=!0,x.value=``;try{let e=await Z.workRequest({repository:_.value===`none`?``:l.value.trim(),workflow:u.value,title:f.value.trim(),instructions:d.value,inputs:bD(h.value,p.value),...n.draft?{draft:n.draft}:{}});r(`started`,e.task_id)}catch(e){x.value=String(e.message||e)}finally{b.value=!1}}}return(e,t)=>(L(),j(`form`,{class:`grid gap-5`,onSubmit:pt(C,[`prevent`]),onKeydown:[gt(pt(C,[`meta`,`prevent`]),[`enter`]),gt(pt(C,[`ctrl`,`prevent`]),[`enter`])]},[c.value?(L(),j(`p`,SD,B(c.value),1)):F(``,!0),_.value===`none`?F(``,!0):(L(),j(`div`,CD,[R(`label`,{for:`${V(i)}-repo`,class:`text-label font-medium`},[t[5]||=H(`Repository`,-1),v.value?F(``,!0):(L(),j(`span`,TD,` (optional)`))],8,wD),A(V(Q),{id:`${V(i)}-repo`,modelValue:l.value,"onUpdate:modelValue":t[0]||=e=>l.value=e,class:`font-mono`,placeholder:`owner/repository`,list:`${V(i)}-repos`,required:v.value},null,8,[`id`,`modelValue`,`list`,`required`]),R(`datalist`,{id:`${V(i)}-repos`},[(L(!0),j(U,null,M(s.value,e=>(L(),j(`option`,{key:e,value:e},null,8,DD))),128))],8,ED),s.value.length?(L(),j(`p`,OD,[t[6]||=H(`Configured: `,-1),(L(!0),j(U,null,M(s.value,e=>(L(),q(V(X),{key:e,type:`button`,variant:`link`,size:`xs`,class:`h-auto px-1 font-mono text-fg-subtle`,onClick:t=>l.value=e},{default:I(()=>[H(B(e),1)]),_:2},1032,[`onClick`]))),128))])):F(``,!0)])),n.workflow?F(``,!0):(L(),j(`div`,kD,[R(`span`,{id:`${V(i)}-wf`,class:`text-label font-medium`},`Workflow`,8,AD),A(V(Ks),{modelValue:u.value,"onUpdate:modelValue":t[1]||=e=>u.value=e,"aria-labelledby":`${V(i)}-wf`,class:`grid grid-cols-1 gap-2 sm:grid-cols-3`,loop:``},{default:I(()=>[(L(!0),j(U,null,M(a.value,e=>(L(),q(V(Js),{key:e.id,value:e.id,class:`rounded-md border border-border bg-card px-3 py-2.5 text-left transition-colors hover:bg-secondary focus-visible:outline-2 focus-visible:outline-ring data-[state=checked]:border-primary data-[state=checked]:bg-secondary`},{default:I(()=>[R(`span`,jD,B(e.name||e.id),1),R(`span`,MD,[H(B(y(e.id)?.runs||0)+` runs`,1),y(e.id)?.runs?(L(),j(U,{key:0},[H(` · `+B(Math.round(V(gD)(y(e.id))/(y(e.id)?.runs||1)*100))+`% delivered`,1)],64)):F(``,!0)])]),_:2},1032,[`value`]))),128))]),_:1},8,[`modelValue`,`aria-labelledby`]),!a.value.length&&!c.value?(L(),j(`p`,ND,`No enabled workflows.`)):F(``,!0)])),h.value.length?(L(),j(`div`,PD,[(L(!0),j(U,null,M(h.value,e=>(L(),j(`div`,{key:e.name,class:`grid gap-1.5`},[R(`label`,{for:`${V(i)}-input-${e.name}`,class:`text-label font-medium`},[R(`span`,ID,B(e.name),1),e.required?(L(),j(`span`,LD,` · required`)):F(``,!0)],8,FD),A(V(Q),{id:`${V(i)}-input-${e.name}`,"model-value":p.value[e.name
Line truncated
|
||||
`)){let e=n.indexOf(`:`);if(e<=0)continue;let r=n.slice(0,e).trim();r&&(t[r]=n.slice(e+1).trim())}return t}function sO(e,t){if(!e.event_type)return{label:`Unidentified`,identified:!1};let n=t.find(t=>t.id===e.event_type);return{label:n?n.name:`Deleted type`,identified:!0}}function cO(e,t){if(!e)return`No event type`;let n=t.find(t=>t.id===e);return n?`${n.source} / ${n.name}`:`Deleted type`}function lO(e){let t=[...(e.headers||[]).map(e=>`${e.name} = ${e.value}`),...(e.payload||[]).map(e=>e.op===`present`?`${e.path} present`:`${e.path} = ${e.value??``}`)];return t.length?t.join(` · `):`any event`}function uO(e){return{headers:(e.headers||[]).filter(e=>e.name.trim()!==``).map(e=>({name:e.name.trim(),value:e.value})),payload:(e.payload||[]).filter(e=>e.path.trim()!==``).map(e=>e.op===`present`?{path:e.path.trim(),op:e.op}:{path:e.path.trim(),op:e.op,value:e.value??``})}}var dO=J([]),fO=J([]),pO=J(!0),mO=J(null),hO=J(!0),gO=J(null),_O=J(!1),vO=J(null);async function yO(){try{let e=await Z.eventTypes(aO().workspace);pO.value=e.enabled!==!1,dO.value=e.event_types||[],fO.value=e.proposals||[],mO.value=null}catch(e){mO.value=e.message||String(e)}finally{hO.value=!1}}function bO(e){return{headers:(e.headers||[]).map(e=>({...e})),payload:(e.payload||[]).map(e=>({...e}))}}function xO(e){vO.value=null,gO.value=e}function SO(e){let t=AO.value.find(t=>String(t.id)===e.sample_id);xO({mode:`proposal`,id:null,source:e.source,name:``,rule:bO(e.rule),headersText:``,body:t?.body||``,exampleHeaders:e.headers||{}})}function CO(e=``){xO({mode:`paste`,id:null,source:e,name:``,rule:{headers:[],payload:[]},headersText:``,body:``,exampleHeaders:{}})}function wO(e){xO({mode:`edit`,id:e.id,source:e.source,name:e.name,rule:bO(e.rule),headersText:``,body:``,exampleHeaders:{}})}function TO(){gO.value=null}async function EO(){let e=gO.value;if(e){_O.value=!0;try{if(e.mode===`edit`&&e.id)await Z.eventTypeUpdate(e.id,{name:e.name,rule:uO(e.rule)});else{let t=e.mode===`paste`?oO(e.headersText):e.exampleHeaders;await Z.eventTypeCreate({source:e.source,name:e.name,rule:e.mode===`paste`?void 0:uO(e.rule),example:{headers:t,body:e.body}})}gO.value=null,await yO()}catch(e){vO.value=e.message||String(e)}finally{_O.value=!1}}}var DO=J(null);async function OO(){let e=DO.value;if(DO.value=null,e)try{await Z.eventTypeDelete(e.id),await yO()}catch(e){mO.value=e.message||String(e)}}var kO=100,AO=J([]),jO=J(!0),MO=J(null),NO=J(!0),PO=J(null);async function FO(){try{let e=await Z.captures(kO);jO.value=e.enabled!==!1,AO.value=e.captures||[],MO.value=null}catch(e){MO.value=e.message||String(e)}finally{NO.value=!1}}function IO(e){let t=AO.value.find(t=>t.id===e);return t&&(PO.value=t),!!t}function LO(){AO.value.length&&(PO.value=AO.value[0])}function RO(){gw(`captures`,()=>{FO(),yO()})}var zO=P({__name:`Tabs`,props:{defaultValue:{},orientation:{},dir:{},activationMode:{},modelValue:{},unmountOnHide:{type:Boolean},asChild:{type:Boolean},as:{},class:{type:[Boolean,null,String,Object,Array]}},emits:[`update:modelValue`],setup(e,{emit:t}){let n=e,r=t,i=ct(n,`class`),a=w(i,r);return(e,t)=>(L(),q(V(Vc),G({"data-slot":`tabs`,"data-orientation":V(a).orientation||`horizontal`},V(a),{class:V(W)(`gap-2 group/tabs flex data-horizontal:flex-col`,n.class)}),{default:I(t=>[K(e.$slots,`default`,Je(be(t)))]),_:3},16,[`data-orientation`,`class`]))}}),BO=P({__name:`TabsContent`,props:{value:{},forceMount:{type:Boolean},asChild:{type:Boolean},as:{},class:{type:[Boolean,null,String,Object,Array]}},setup(e){let t=e,n=ct(t,`class`);return(e,r)=>(L(),q(V(Wc),G({"data-slot":`tabs-content`,class:V(W)(`text-sm flex-1 outline-none`,t.class)},V(n)),{default:I(()=>[K(e.$slots,`default`)]),_:3},16,[`class`]))}}),VO=P({__name:`TabsList`,props:{loop:{type:Boolean},asChild:{type:Boolean},as:{},class:{type:[Boolean,null,String,Object,Array]},variant:{default:`default`}},setup(e){let t=e,n=ct(t,`class`,`variant`);return(r,i)=>(L(),q(V(Gc),G({"data-slot":`tabs-list`,"data-variant":e.variant},V(n),{class:V(W)(V(UO)({variant:e.variant}),t.class)}),{default:I(()=>[K(r.$slots,`default`)]),_:3},16,[`data-variant`,`class`]))}}),HO=P({__name:`TabsTrigger`,props:{value:{},disabled:{type:Boolean},asChild:{type:Boolean},as:{},class:{type:[Boolean,null,String,Object,Array]}},setup(e){let t=e,n=ct(t,`class`),r=C(n);return(e,n)=>(L(),q(V(Kc),G({"data-slot":`tabs-trigger`,class:V(W)(`gap-1.5 rounded-md border border-transparent px-1.5 py-0.5 text-sm font-medium group-data-[variant=default]/tabs-list:data-active:shadow-sm group-data-[variant=line]/tabs-list:data-active:shadow-none [&_svg:not([class*=size-])]:size-4 has-data-[icon=inline-end]:pr-1 has-data-[icon=inline-start]:pl-1 relative inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center whitespace-nowrap text-foreground/60 transition-all group-data-vertical/tabs:w-full group-data-vertical/tabs:justify-start hover:text-foreground focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 focus-visible:outline-1 focus-visible:oLine truncated
|
||||
|
||||
+36
-16
@@ -31,21 +31,31 @@ const props = withDefaults(
|
||||
{ tools: () => [], media: () => [], assistant: false, streaming: false },
|
||||
);
|
||||
|
||||
// Consecutive calls fold into one counted line. A navigation chip is an
|
||||
// action for the operator, so it always stands alone and ends the run.
|
||||
const runs = computed(() => {
|
||||
const out: ToolCall[][] = [];
|
||||
// The reply in the order it happened: text up to each call's offset, then the
|
||||
// call. Consecutive calls at one point fold into one line; a navigation chip
|
||||
// is an action for the operator, so it always stands alone. A call recorded
|
||||
// without an offset sits at the start.
|
||||
type Segment = { text: string } | { tools: ToolCall[] };
|
||||
const segments = computed(() => {
|
||||
const chars = Array.from(props.text);
|
||||
const out: Segment[] = [];
|
||||
let at = 0;
|
||||
let open = false;
|
||||
for (const tool of props.tools) {
|
||||
if (tool.path) {
|
||||
out.push([tool]);
|
||||
const offset = Math.min(Math.max(tool.text_offset ?? 0, at), chars.length);
|
||||
if (offset > at) {
|
||||
out.push({ text: chars.slice(at, offset).join("") });
|
||||
at = offset;
|
||||
open = false;
|
||||
} else if (open) out[out.length - 1].push(tool);
|
||||
}
|
||||
const last = out[out.length - 1];
|
||||
if (!tool.path && open && last && "tools" in last) last.tools.push(tool);
|
||||
else {
|
||||
out.push([tool]);
|
||||
open = true;
|
||||
out.push({ tools: [tool] });
|
||||
open = !tool.path;
|
||||
}
|
||||
}
|
||||
if (at < chars.length) out.push({ text: chars.slice(at).join("") });
|
||||
return out;
|
||||
});
|
||||
</script>
|
||||
@@ -55,12 +65,6 @@ const runs = computed(() => {
|
||||
<MessageContent>
|
||||
<Bubble :variant="assistant ? 'muted' : 'tinted'" class="max-w-[min(78ch,92%)]">
|
||||
<BubbleContent class="[overflow-wrap:anywhere]">
|
||||
<Trace v-if="assistant && tools.length" class="mb-2">
|
||||
<template v-for="(run, i) in runs" :key="i">
|
||||
<ChatToolGroup v-if="run.length > 1" :tools="run" :streaming="streaming" />
|
||||
<ChatToolCall v-else :tool="run[0]" :streaming="streaming" />
|
||||
</template>
|
||||
</Trace>
|
||||
<div v-if="media.length" class="mb-2 flex flex-wrap gap-1.5">
|
||||
<ChatAttachment
|
||||
v-for="(attachment, i) in media"
|
||||
@@ -68,7 +72,23 @@ const runs = computed(() => {
|
||||
:attachment="attachment"
|
||||
/>
|
||||
</div>
|
||||
<ChatMarkdown v-if="assistant" :text="text" />
|
||||
<template v-if="assistant">
|
||||
<template v-for="(segment, i) in segments" :key="i">
|
||||
<ChatMarkdown v-if="'text' in segment" :text="segment.text" />
|
||||
<Trace v-else class="my-2">
|
||||
<ChatToolGroup
|
||||
v-if="segment.tools.length > 1"
|
||||
:tools="segment.tools"
|
||||
:streaming="streaming && i === segments.length - 1"
|
||||
/>
|
||||
<ChatToolCall
|
||||
v-else
|
||||
:tool="segment.tools[0]"
|
||||
:streaming="streaming && i === segments.length - 1"
|
||||
/>
|
||||
</Trace>
|
||||
</template>
|
||||
</template>
|
||||
<div v-else class="whitespace-pre-wrap">{{ text }}</div>
|
||||
<slot />
|
||||
</BubbleContent>
|
||||
|
||||
@@ -47,6 +47,8 @@ export interface ChatToolCall {
|
||||
text?: string;
|
||||
failed?: boolean;
|
||||
duration_ms?: number;
|
||||
/** Runes of reply text before the call: where in the reply it happened. */
|
||||
text_offset?: number;
|
||||
/** A dashboard_navigate result: the page to route to, instead of a tool line. */
|
||||
path?: string;
|
||||
label?: string;
|
||||
|
||||
Reference in new issue
Block a user