Skip to content

armgit / ax

Public Imported from GitHub
0

Agent Executor (AX) is Google's open agentic orchestration runtime

Go

Remove all mentions of task from the trace viewer (#141)

Jaana Dogan6faee4348a8a
diff --git a/cmd/ax/trace.go b/cmd/ax/trace.go
index 506238d..6991483 100644
--- a/cmd/ax/trace.go
+++ b/cmd/ax/trace.go
@@ -57,7 +57,7 @@ type ExecutionEvent struct {
Timestamp time.Time `json:"timestamp"`
}
-type TaskTrace struct {
+type ExecTrace struct {
ExecID string `json:"exec_id"`
AgentID string `json:"agent_id"`
Events []ExecutionEvent `json:"events"`
@@ -65,7 +65,7 @@ type TaskTrace struct {
type TraceData struct {
RootExecID string `json:"root_exec_id"`
- Tasks []TaskTrace `json:"tasks"`
+ Execs []ExecTrace `json:"execs"`
}
var (
@@ -94,7 +94,7 @@ func runTrace(cmd *cobra.Command, args []string) error {
return fmt.Errorf("error loading trace data: %w", err)
}
- if len(data.Tasks) == 0 {
+ if len(data.Execs) == 0 {
return fmt.Errorf("no trace data found for execution ID: %s", traceID)
}
@@ -118,7 +118,7 @@ func loadTraceData(rootExecID string) (*TraceData, error) {
data := &TraceData{
RootExecID: rootExecID,
- Tasks: buildTaskTraces(rootExecID, events),
+ Execs: buildExecTraces(rootExecID, events),
}
return data, nil
@@ -145,17 +145,17 @@ func fetchEventsFromDB(configPath string, rootExecID string) ([]*proto.Execution
return events, nil
}
-func buildTaskTraces(rootExecID string, events []*proto.ExecutionEvent) []TaskTrace {
- tasksMap := make(map[string][]ExecutionEvent)
+func buildExecTraces(rootExecID string, events []*proto.ExecutionEvent) []ExecTrace {
+ execsMap := make(map[string][]ExecutionEvent)
for _, protoEv := range events {
exID := protoEv.ExecId
ev := extractExecutionEvent(exID, protoEv)
- tasksMap[exID] = append(tasksMap[exID], ev)
+ execsMap[exID] = append(execsMap[exID], ev)
}
- var tasks []TaskTrace
- for execID, evs := range tasksMap {
+ var execs []ExecTrace
+ for execID, evs := range execsMap {
agentID := ""
for _, ev := range evs {
if ev.AgentID != "" {
@@ -163,25 +163,25 @@ func buildTaskTraces(rootExecID string, events []*proto.ExecutionEvent) []TaskTr
break
}
}
- tasks = append(tasks, TaskTrace{
+ execs = append(execs, ExecTrace{
ExecID: execID,
AgentID: agentID,
Events: evs,
})
}
- // Root task first, then sub-tasks sorted by name.
- sort.Slice(tasks, func(i, j int) bool {
- if tasks[i].ExecID == rootExecID {
+ // Root exec first, then sub-execs sorted by name.
+ sort.Slice(execs, func(i, j int) bool {
+ if execs[i].ExecID == rootExecID {
return true
}
- if tasks[j].ExecID == rootExecID {
+ if execs[j].ExecID == rootExecID {
return false
}
- return tasks[i].ExecID < tasks[j].ExecID
+ return execs[i].ExecID < execs[j].ExecID
})
- return tasks
+ return execs
}
func extractContents(protoContents []*proto.Content) []Content {
diff --git a/cmd/ax/trace_ui.go b/cmd/ax/trace_ui.go
index efad959..0b06315 100644
--- a/cmd/ax/trace_ui.go
+++ b/cmd/ax/trace_ui.go
@@ -94,7 +94,7 @@ body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',sans-serif;backgrou
.loading{display:flex;align-items:center;justify-content:center;height:120px;color:#6c7086}
.trace-hdr .label{font-size:11px;color:#6c7086;text-transform:uppercase;letter-spacing:.5px;margin-bottom:4px}
-.trace-hdr .tid{font-family:monospace;font-size:15px;font-weight:700;color:#1a1a2e}
+.trace-hdr .exec-id{font-family:monospace;font-size:15px;font-weight:700;color:#1a1a2e}
.timeline-card{background:#fff;border-radius:10px;padding:14px 18px;box-shadow:0 1px 4px rgba(0,0,0,.08);flex-shrink:0}
.card-title{font-size:10px;text-transform:uppercase;letter-spacing:.8px;color:#6c7086;margin-bottom:10px;font-weight:600}
@@ -112,19 +112,19 @@ body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',sans-serif;backgrou
.tl-bar.c5{background:#94e2d5}
.tl-bar.c6{background:#f9e2af}
-.task-card{background:#fff;border-radius:10px;box-shadow:0 1px 4px rgba(0,0,0,.08);overflow:hidden;flex-shrink:0}
-.task-card-hdr{padding:11px 16px;display:flex;align-items:center;gap:8px;cursor:pointer;user-select:none;background:#fafafa;border-bottom:1px solid #f0f0f0}
-.task-card-hdr:hover{background:#f4f4f8}
+.exec-card{background:#fff;border-radius:10px;box-shadow:0 1px 4px rgba(0,0,0,.08);overflow:hidden;flex-shrink:0}
+.exec-card-hdr{padding:11px 16px;display:flex;align-items:center;gap:8px;cursor:pointer;user-select:none;background:#fafafa;border-bottom:1px solid #f0f0f0}
+.exec-card-hdr:hover{background:#f4f4f8}
.expand-ico{color:#6c7086;font-size:11px;transition:transform .15s;flex-shrink:0}
-.task-card-hdr.collapsed .expand-ico{transform:rotate(-90deg)}
-.task-card-body.hidden{display:none}
-.task-name{font-family:monospace;font-size:13px;font-weight:700;color:#1e1e2e}
+.exec-card-hdr.collapsed .expand-ico{transform:rotate(-90deg)}
+.exec-card-body.hidden{display:none}
+.exec-name{font-family:monospace;font-size:13px;font-weight:700;color:#1e1e2e}
.agent-badge{font-size:12px;padding:2px 8px;border-radius:10px;background:#ede9fe;color:#6d28d9;font-family:monospace}
.state-badge{font-size:11px;padding:2px 8px;border-radius:10px;margin-left:auto;font-weight:600}
.state-badge.completed{background:#dcfce7;color:#166534}
.state-badge.pending{background:#fef3c7;color:#92400e}
.state-badge.failed{background:#fee2e2;color:#991b1b}
-.task-card-body{}
+.exec-card-body{}
.event{border-top:1px solid #f5f5f5}
.state-evt{padding:7px 18px;font-size:11px;color:#7c7ca0;font-style:italic;background:#fafafe;display:flex;align-items:center;gap:8px}
@@ -254,19 +254,19 @@ function getLastState(events){
function renderTrace(data){
// Build timeline
- const taskTimes=data.tasks.map(t=>{
- const ts=t.events.map(e=>new Date(e.timestamp).getTime());
+ const execTimes=data.execs.map(e=>{
+ const ts=e.events.map(ev=>new Date(ev.timestamp).getTime());
const start=ts.length?Math.min(...ts):null;
const end=ts.length?Math.max(...ts):null;
- return{execID:t.exec_id,start,end};
+ return{execID:e.exec_id,start,end};
});
- taskTimes.sort((a,b)=>{
+ execTimes.sort((a,b)=>{
if(a.start==null)return 1;
if(b.start==null)return -1;
return a.start-b.start;
});
let minT=null,maxT=null;
- taskTimes.forEach(({start,end})=>{
+ execTimes.forEach(({start,end})=>{
if(start!=null){
if(minT==null||start<minT)minT=start;
if(maxT==null||end>maxT)maxT=end;
@@ -274,10 +274,10 @@ function renderTrace(data){
});
const span=maxT-minT||1;
- let html='<div class="trace-hdr"><div class="label">Trace</div><div class="tid">'+esc(data.root_exec_id)+'</div></div>';
+ let html='<div class="trace-hdr"><div class="label">Trace</div><div class="exec-id">'+esc(data.root_exec_id)+'</div></div>';
html+='<div class="timeline-card"><div class="card-title">Timeline</div><div class="tl-rows">';
- taskTimes.forEach(({execID,start,end},i)=>{
+ execTimes.forEach(({execID,start,end},i)=>{
const shortName=execID===data.root_exec_id?'root':execID.slice(data.root_exec_id.length+1);
const left=start!=null?((start-minT)/span*100).toFixed(2):0;
const width=start!=null?Math.max((end-start)/span*100,0.4).toFixed(2):0;
@@ -291,22 +291,22 @@ function renderTrace(data){
});
html+='</div></div>';
- // Task sections
- data.tasks.forEach((task,i)=>{
- const shortName=task.exec_id===data.root_exec_id?'root':task.exec_id.slice(data.root_exec_id.length+1);
- const lastState=getLastState(task.events);
+ // Exec sections
+ data.execs.forEach((exec,i)=>{
+ const shortName=exec.exec_id===data.root_exec_id?'root':exec.exec_id.slice(data.root_exec_id.length+1);
+ const lastState=getLastState(exec.events);
const stateClass=lastState?lastState.toLowerCase().replace('state_',''):'';
const stateBadge=lastState?'<span class="state-badge '+esc(stateClass)+'">'+esc(lastState.replace('STATE_',''))+'</span>':'';
- html+='<div class="task-card" id="card-'+esc(task.exec_id)+'">'
- +'<div class="task-card-hdr collapsed" onclick="toggleCard(this)">'
+ html+='<div class="exec-card" id="card-'+esc(exec.exec_id)+'">'
+ +'<div class="exec-card-hdr collapsed" onclick="toggleCard(this)">'
+'<span class="expand-ico">▼</span>'
- +'<span class="task-name">'+esc(shortName)+'</span>'
- +'<span class="agent-badge">'+esc(task.agent_id||'—')+'</span>'
+ +'<span class="exec-name">'+esc(shortName)+'</span>'
+ +'<span class="agent-badge">'+esc(exec.agent_id||'—')+'</span>'
+stateBadge
+'</div>'
- +'<div class="task-card-body hidden">';
- task.events.forEach(ev=>{html+=renderEvent(ev);});
+ +'<div class="exec-card-body hidden">';
+ exec.events.forEach(ev=>{html+=renderEvent(ev);});
html+='</div></div>';
});
@@ -316,8 +316,8 @@ function renderTrace(data){
function scrollToCard(execID){
const el=document.getElementById('card-'+execID);
if(!el)return;
- const hdr=el.querySelector('.task-card-hdr');
- const body=el.querySelector('.task-card-body');
+ const hdr=el.querySelector('.exec-card-hdr');
+ const body=el.querySelector('.exec-card-body');
if(hdr&&hdr.classList.contains('collapsed')){
hdr.classList.remove('collapsed');
body.classList.remove('hidden');